diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 0cc1867dc0..bb7934903a 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.7.4" - const val openosrsVersion = "4.4.0" + const val openosrsVersion = "4.5.6" - const val rsversion = 194 + const val rsversion = 195 const val cacheversion = 165 const val lombokVersion = "1.18.20" diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 1273b569ec..94204b2383 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1738,13 +1738,6 @@ public interface Client extends GameEngine */ void setCompass(SpritePixels SpritePixels); - /** - * Sets whether inventory quantity is verbose. - * - * @param state verbose state - */ - void setItemQuantitiesVerbose(boolean state); - /** * Returns widget sprite cache, to be used with {@link Client#getSpriteOverrides()} * diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 20a6f71594..a6c9591db0 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -328,6 +328,13 @@ public abstract class RSClientMixin implements RSClient @Inject private static boolean hdMinimapEnabled; + @Inject + @Override + public String getBuildID() + { + return "OpenOSRS"; + } + @Inject @Override public Callbacks getCallbacks() @@ -1504,7 +1511,7 @@ public abstract class RSClientMixin implements RSClient @Inject @MethodHook("updateNpcs") - public static void updateNpcs(boolean var0, RSPacketBuffer var1) + public static void updateNpcs(boolean var0, RSPacketBuffer var1, boolean var2) { client.getCallbacks().updateNpcs(); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java index c6c50846f6..48f74e9d48 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java @@ -138,7 +138,7 @@ public abstract class ScriptVMMixin implements RSClient @Copy("runScript") @Replace("runScript") - static void copy$runScript(RSScriptEvent event, int maxExecutionTime) + static void copy$runScript(RSScriptEvent event, int maxExecutionTime, int var2) { Object[] arguments = event.getArguments(); assert arguments != null && arguments.length > 0; @@ -158,7 +158,7 @@ public abstract class ScriptVMMixin implements RSClient try { rootScriptEvent = event; - copy$runScript(event, maxExecutionTime); + copy$runScript(event, maxExecutionTime, var2); } finally { @@ -180,7 +180,7 @@ public abstract class ScriptVMMixin implements RSClient { assert isClientThread() : "runScriptEvent must be called on client thread"; assert currentScript == null : "scripts are not reentrant"; - runScript(event, 5000000); + runScript(event, 5000000, 0); boolean assertionsEnabled = false; assert assertionsEnabled = true; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/VerboseInventoryQuantitiesMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/VerboseInventoryQuantitiesMixin.java deleted file mode 100644 index 6c6a509212..0000000000 --- a/runelite-mixins/src/main/java/net/runelite/mixins/VerboseInventoryQuantitiesMixin.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2020, ImNoOSRS - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mixins; - -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.rs.api.RSClient; - -@Mixin(RSClient.class) -public abstract class VerboseInventoryQuantitiesMixin implements RSClient -{ - @Inject - private static boolean itemQuantitiesVerbose; - - @Inject - @Override - public void setItemQuantitiesVerbose(boolean state) - { - itemQuantitiesVerbose = state; - } - - @Copy("inventoryQuantityFormat") - @Replace("inventoryQuantityFormat") - public static String getInventoryQuantityFormat(int n) - { - if (itemQuantitiesVerbose) - { - return String.valueOf(n); - } - - return getInventoryQuantityFormat(n); - } -} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index bd9e22be6e..d6758ff330 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -790,7 +790,7 @@ public interface RSClient extends RSGameEngine, Client RSScriptEvent createScriptEvent(); @Import("runScript") - void runScript(RSScriptEvent ev, int ex); + void runScript(RSScriptEvent ev, int ex, int var2); @Import("hintArrowType") void setHintArrowTargetType(int value); diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 169429e859..360e08de6d 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,752 +4,723 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("ir") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("w") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lmg;" + descriptor = "Lok;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("f") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1957180243 + intValue = -2046500757 ) - static int field3171; - @ObfuscatedName("v") + static int field3278; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -108727695 + intValue = 317102403 ) @Export("groupCount") int groupCount; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("groupIds") int[] groupIds; - @ObfuscatedName("c") + @ObfuscatedName("r") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("y") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lma;" + descriptor = "Lon;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("h") + @ObfuscatedName("t") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("z") + @ObfuscatedName("v") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("e") + @ObfuscatedName("x") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("q") + @ObfuscatedName("z") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("l") + @ObfuscatedName("i") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lma;" + descriptor = "[Lon;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("b") + @ObfuscatedName("w") @Export("groups") Object[] groups; - @ObfuscatedName("a") + @ObfuscatedName("s") @Export("files") Object[][] files; - @ObfuscatedName("k") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1729948471 + intValue = 149296087 ) @Export("hash") public int hash; - @ObfuscatedName("i") + @ObfuscatedName("ay") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("x") + @ObfuscatedName("am") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); // L: 23 - field3171 = 0; + field3278 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { - this.releaseGroups = var1; + this.releaseGroups = var1; // L: 32 this.shallowFiles = var2; // L: 33 } // L: 34 - @ObfuscatedName("n") + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "968295804" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + } // L: 123 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1985410743" + ) + @Export("loadGroup") + void loadGroup(int var1) { + } // L: 209 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-13" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return this.groups[var1] != null ? 100 : 0; // L: 179 180 + } + + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1548060023" + garbageValue = "1343073787" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = GrandExchangeOfferOwnWorldComparator.method1380(var1, var1.length); // L: 37 - Buffer var2 = new Buffer(WorldMapDecorationType.decompressBytes(var1)); // L: 38 - int var3 = var2.readUnsignedByte(); // L: 39 - if (var3 >= 5 && var3 <= 7) { // L: 40 - if (var3 >= 6) { // L: 41 - var2.readInt(); // L: 42 + int var3 = var1.length; // L: 38 + int var2 = AbstractWorldMapData.method3102(var1, 0, var3); // L: 40 + this.hash = var2; // L: 42 + Buffer var4 = new Buffer(class238.decompressBytes(var1)); // L: 43 + int var5 = var4.readUnsignedByte(); // L: 44 + if (var5 >= 5 && var5 <= 7) { // L: 45 + if (var5 >= 6) { // L: 46 + var4.readInt(); // L: 47 } - int var4 = var2.readUnsignedByte(); // L: 45 - if (var3 >= 7) { // L: 46 - this.groupCount = var2.method5705(); + int var6 = var4.readUnsignedByte(); // L: 50 + if (var5 >= 7) { // L: 51 + this.groupCount = var4.method6596(); } else { - this.groupCount = var2.readUnsignedShort(); // L: 47 + this.groupCount = var4.readUnsignedShort(); // L: 52 } - int var5 = 0; // L: 48 - int var6 = -1; // L: 49 - this.groupIds = new int[this.groupCount]; // L: 50 - int var7; - if (var3 >= 7) { // L: 51 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52 - this.groupIds[var7] = var5 += var2.method5705(); // L: 53 - if (this.groupIds[var7] > var6) { // L: 54 - var6 = this.groupIds[var7]; - } - } - } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58 - this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59 - if (this.groupIds[var7] > var6) { // L: 60 - var6 = this.groupIds[var7]; - } - } - } - - this.groupCrcs = new int[var6 + 1]; // L: 63 - this.groupVersions = new int[var6 + 1]; // L: 64 - this.fileCounts = new int[var6 + 1]; // L: 65 - this.fileIds = new int[var6 + 1][]; // L: 66 - this.groups = new Object[var6 + 1]; // L: 67 - this.files = new Object[var6 + 1][]; // L: 68 - if (var4 != 0) { // L: 69 - this.groupNameHashes = new int[var6 + 1]; // L: 70 - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71 - this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); - } - - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72 - } - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74 - this.groupCrcs[this.groupIds[var7]] = var2.readInt(); - } - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75 - this.groupVersions[this.groupIds[var7]] = var2.readInt(); - } - - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76 - this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); - } - - int var8; + int var7 = 0; // L: 53 + int var8 = -1; // L: 54 + this.groupIds = new int[this.groupCount]; // L: 55 int var9; + if (var5 >= 7) { // L: 56 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57 + this.groupIds[var9] = var7 += var4.method6596(); // L: 58 + if (this.groupIds[var9] > var8) { // L: 59 + var8 = this.groupIds[var9]; + } + } + } else { + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63 + this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64 + if (this.groupIds[var9] > var8) { // L: 65 + var8 = this.groupIds[var9]; + } + } + } + + this.groupCrcs = new int[var8 + 1]; // L: 68 + this.groupVersions = new int[var8 + 1]; // L: 69 + this.fileCounts = new int[var8 + 1]; // L: 70 + this.fileIds = new int[var8 + 1][]; // L: 71 + this.groups = new Object[var8 + 1]; // L: 72 + this.files = new Object[var8 + 1][]; // L: 73 + if (var6 != 0) { // L: 74 + this.groupNameHashes = new int[var8 + 1]; // L: 75 + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76 + this.groupNameHashes[this.groupIds[var9]] = var4.readInt(); + } + + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77 + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79 + this.groupCrcs[this.groupIds[var9]] = var4.readInt(); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80 + this.groupVersions[this.groupIds[var9]] = var4.readInt(); + } + + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81 + this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort(); + } + int var10; int var11; int var12; - if (var3 >= 7) { // L: 77 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78 - var8 = this.groupIds[var7]; // L: 79 - var9 = this.fileCounts[var8]; // L: 80 - var5 = 0; // L: 81 - var10 = -1; // L: 82 - this.fileIds[var8] = new int[var9]; // L: 83 + int var13; + int var14; + if (var5 >= 7) { // L: 82 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83 + var10 = this.groupIds[var9]; // L: 84 + var11 = this.fileCounts[var10]; // L: 85 + var7 = 0; // L: 86 + var12 = -1; // L: 87 + this.fileIds[var10] = new int[var11]; // L: 88 - for (var11 = 0; var11 < var9; ++var11) { // L: 84 - var12 = this.fileIds[var8][var11] = var5 += var2.method5705(); // L: 85 - if (var12 > var10) { // L: 86 - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { // L: 89 + var14 = this.fileIds[var10][var13] = var7 += var4.method6596(); // L: 90 + if (var14 > var12) { // L: 91 + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; // L: 88 + this.files[var10] = new Object[var12 + 1]; // L: 93 } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 92 - var8 = this.groupIds[var7]; // L: 93 - var9 = this.fileCounts[var8]; // L: 94 - var5 = 0; // L: 95 - var10 = -1; // L: 96 - this.fileIds[var8] = new int[var9]; // L: 97 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 97 + var10 = this.groupIds[var9]; // L: 98 + var11 = this.fileCounts[var10]; // L: 99 + var7 = 0; // L: 100 + var12 = -1; // L: 101 + this.fileIds[var10] = new int[var11]; // L: 102 - for (var11 = 0; var11 < var9; ++var11) { // L: 98 - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); // L: 99 - if (var12 > var10) { // L: 100 - var10 = var12; + for (var13 = 0; var13 < var11; ++var13) { // L: 103 + var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104 + if (var14 > var12) { // L: 105 + var12 = var14; } } - this.files[var8] = new Object[var10 + 1]; // L: 102 + this.files[var10] = new Object[var12 + 1]; // L: 107 } } - if (var4 != 0) { // L: 105 - this.fileNameHashes = new int[var6 + 1][]; // L: 106 - this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107 + if (var6 != 0) { // L: 110 + this.fileNameHashes = new int[var8 + 1][]; // L: 111 + this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112 - for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 108 - var8 = this.groupIds[var7]; // L: 109 - var9 = this.fileCounts[var8]; // L: 110 - this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111 + for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 113 + var10 = this.groupIds[var9]; // L: 114 + var11 = this.fileCounts[var10]; // L: 115 + this.fileNameHashes[var10] = new int[this.files[var10].length]; // L: 116 - for (var10 = 0; var10 < var9; ++var10) { // L: 112 - this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); + for (var12 = 0; var12 < var11; ++var12) { // L: 117 + this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113 + this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118 } } } else { throw new RuntimeException(""); } - } // L: 116 + } // L: 121 - @ObfuscatedName("v") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "31242" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - } // L: 118 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIB)[B", - garbageValue = "53" + descriptor = "(III)[B", + garbageValue = "-1393912934" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { - return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121 + return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126 } - @ObfuscatedName("c") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II[II)[B", - garbageValue = "-1298768169" + garbageValue = "-1173620347" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125 - if (this.files[var1][var2] == null) { // L: 126 - boolean var4 = this.buildFiles(var1, var3); // L: 127 - if (!var4) { // L: 128 - this.loadGroup(var1); // L: 129 - var4 = this.buildFiles(var1, var3); // L: 130 - if (!var4) { // L: 131 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 130 + if (this.files[var1][var2] == null) { // L: 131 + boolean var4 = this.buildFiles(var1, var3); // L: 132 + if (!var4) { // L: 133 + this.loadGroup(var1); // L: 134 + var4 = this.buildFiles(var1, var3); // L: 135 + if (!var4) { // L: 136 return null; } } } - byte[] var5 = ChatChannel.method2405(this.files[var1][var2], false); // L: 134 + byte[] var5 = class0.method11(this.files[var1][var2], false); // L: 139 if (this.shallowFiles) { - this.files[var1][var2] = null; // L: 135 + this.files[var1][var2] = null; // L: 140 } - return var5; // L: 136 + return var5; // L: 141 } else { return null; } } - @ObfuscatedName("y") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-751573419" + garbageValue = "276699186" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140 - if (this.files[var1][var2] != null) { - return true; // L: 141 - } else if (this.groups[var1] != null) { // L: 142 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145 + if (this.files[var1][var2] != null) { // L: 146 + return true; + } else if (this.groups[var1] != null) { // L: 147 return true; } else { - this.loadGroup(var1); // L: 143 - return this.groups[var1] != null; // L: 144 + this.loadGroup(var1); // L: 148 + return this.groups[var1] != null; // L: 149 } } else { - return false; // L: 145 + return false; // L: 150 } } - @ObfuscatedName("h") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1147077273" + garbageValue = "1228320975" ) - public boolean method4366(int var1) { - if (this.files.length == 1) { // L: 149 + public boolean method4479(int var1) { + if (this.files.length == 1) { // L: 154 return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); // L: 150 + return this.tryLoadFile(var1, 0); // L: 155 } else { - throw new RuntimeException(); // L: 151 + throw new RuntimeException(); // L: 156 } } - @ObfuscatedName("z") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1620003564" + descriptor = "(IB)Z", + garbageValue = "1" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { // L: 155 + if (this.groups[var1] != null) { // L: 160 return true; } else { - this.loadGroup(var1); // L: 156 - return this.groups[var1] != null; // L: 157 + this.loadGroup(var1); // L: 161 + return this.groups[var1] != null; // L: 162 } } - @ObfuscatedName("e") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "71" + descriptor = "(I)Z", + garbageValue = "-101062425" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { - boolean var1 = true; // L: 162 + boolean var1 = true; // L: 167 - for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163 - int var3 = this.groupIds[var2]; // L: 164 - if (this.groups[var3] == null) { // L: 165 - this.loadGroup(var3); // L: 166 - if (this.groups[var3] == null) { // L: 167 + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 168 + int var3 = this.groupIds[var2]; // L: 169 + if (this.groups[var3] == null) { // L: 170 + this.loadGroup(var3); // L: 171 + if (this.groups[var3] == null) { // L: 172 var1 = false; } } } - return var1; // L: 170 + return var1; // L: 175 } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-693356446" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; // L: 174 175 - } - - @ObfuscatedName("l") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "1180778193" + garbageValue = "1457020494" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { // L: 179 + if (this.files.length == 1) { // L: 184 return this.takeFile(0, var1); } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); // L: 180 + return this.takeFile(var1, 0); // L: 185 } else { - throw new RuntimeException(); // L: 181 + throw new RuntimeException(); // L: 186 } } - @ObfuscatedName("s") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(III)[B", - garbageValue = "1199791629" + garbageValue = "2104278490" ) @Export("getFile") public byte[] getFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185 - if (this.files[var1][var2] == null) { // L: 186 - boolean var3 = this.buildFiles(var1, (int[])null); // L: 187 - if (!var3) { // L: 188 - this.loadGroup(var1); // L: 189 - var3 = this.buildFiles(var1, (int[])null); // L: 190 - if (!var3) { // L: 191 + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 190 + if (this.files[var1][var2] == null) { // L: 191 + boolean var3 = this.buildFiles(var1, (int[])null); // L: 192 + if (!var3) { // L: 193 + this.loadGroup(var1); // L: 194 + var3 = this.buildFiles(var1, (int[])null); // L: 195 + if (!var3) { // L: 196 return null; } } } - byte[] var4 = ChatChannel.method2405(this.files[var1][var2], false); // L: 194 - return var4; // L: 195 + byte[] var4 = class0.method11(this.files[var1][var2], false); // L: 199 + return var4; // L: 200 } else { return null; } } - @ObfuscatedName("b") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-1318442994" + garbageValue = "-1056264314" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { // L: 199 + if (this.files.length == 1) { // L: 204 return this.getFile(0, var1); } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); // L: 200 + return this.getFile(var1, 0); // L: 205 } else { - throw new RuntimeException(); // L: 201 + throw new RuntimeException(); // L: 206 } } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1209383303" - ) - @Export("loadGroup") - void loadGroup(int var1) { - } // L: 204 - - @ObfuscatedName("w") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "-325736688" + garbageValue = "-311698806" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215 } - @ObfuscatedName("k") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "2092353569" + garbageValue = "437573934" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { - return this.files[var1].length; // L: 214 + return this.files[var1].length; // L: 219 } - @ObfuscatedName("i") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-379085562" + garbageValue = "2103941717" ) @Export("getGroupCount") public int getGroupCount() { - return this.files.length; // L: 218 + return this.files.length; // L: 223 } - @ObfuscatedName("x") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1361507951" + descriptor = "(B)V", + garbageValue = "81" ) @Export("clearGroups") public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 + for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227 this.groups[var1] = null; } - } // L: 223 + } // L: 228 - @ObfuscatedName("g") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1115746573" + descriptor = "(IB)V", + garbageValue = "-8" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231 this.files[var1][var2] = null; } - } // L: 227 + } // L: 232 - @ObfuscatedName("u") + @ObfuscatedName("bb") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1436245650" + garbageValue = "131981223" ) @Export("clearFiles") public void clearFiles() { - for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230 - if (this.files[var1] != null) { // L: 231 - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232 + for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 235 + if (this.files[var1] != null) { // L: 236 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 237 this.files[var1][var2] = null; } } } - } // L: 235 + } // L: 240 - @ObfuscatedName("t") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I[II)Z", - garbageValue = "1632026762" + garbageValue = "2014436528" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { // L: 238 + if (this.groups[var1] == null) { // L: 243 return false; } else { - int var3 = this.fileCounts[var1]; // L: 239 - int[] var4 = this.fileIds[var1]; // L: 240 - Object[] var5 = this.files[var1]; // L: 241 - boolean var6 = true; // L: 242 + int var3 = this.fileCounts[var1]; // L: 244 + int[] var4 = this.fileIds[var1]; // L: 245 + Object[] var5 = this.files[var1]; // L: 246 + boolean var6 = true; // L: 247 - for (int var7 = 0; var7 < var3; ++var7) { // L: 243 - if (var5[var4[var7]] == null) { // L: 244 - var6 = false; // L: 245 + for (int var7 = 0; var7 < var3; ++var7) { // L: 248 + if (var5[var4[var7]] == null) { // L: 249 + var6 = false; // L: 250 break; } } - if (var6) { // L: 249 + if (var6) { // L: 254 return true; } else { - byte[] var18; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251 - var18 = ChatChannel.method2405(this.groups[var1], false); // L: 256 + byte[] var21; + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 256 + var21 = class0.method11(this.groups[var1], false); // L: 261 } else { - var18 = ChatChannel.method2405(this.groups[var1], true); // L: 252 - Buffer var8 = new Buffer(var18); // L: 253 - var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254 + var21 = class0.method11(this.groups[var1], true); // L: 257 + Buffer var8 = new Buffer(var21); // L: 258 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259 } - byte[] var20 = WorldMapDecorationType.decompressBytes(var18); // L: 259 - if (this.releaseGroups) { // L: 271 + byte[] var25 = class238.decompressBytes(var21); // L: 264 + if (this.releaseGroups) { // L: 282 this.groups[var1] = null; } - if (var3 > 1) { // L: 272 - int var9 = var20.length; // L: 273 - --var9; - int var10 = var20[var9] & 255; // L: 274 - var9 -= var10 * var3 * 4; // L: 275 - Buffer var11 = new Buffer(var20); // L: 276 - int[] var12 = new int[var3]; // L: 277 - var11.offset = var9; // L: 278 + int var10; + if (var3 > 1) { // L: 283 + int var22 = var25.length; // L: 284 + --var22; // L: 285 + var10 = var25[var22] & 255; + var22 -= var10 * var3 * 4; // L: 286 + Buffer var11 = new Buffer(var25); // L: 287 + int[] var12 = new int[var3]; // L: 288 + var11.offset = var22; // L: 289 int var14; int var15; - for (int var13 = 0; var13 < var10; ++var13) { // L: 279 - var14 = 0; // L: 280 + for (int var13 = 0; var13 < var10; ++var13) { // L: 290 + var14 = 0; // L: 291 - for (var15 = 0; var15 < var3; ++var15) { // L: 281 - var14 += var11.readInt(); // L: 282 - var12[var15] += var14; // L: 283 + for (var15 = 0; var15 < var3; ++var15) { // L: 292 + var14 += var11.readInt(); // L: 293 + var12[var15] += var14; // L: 294 } } - byte[][] var19 = new byte[var3][]; // L: 286 + byte[][] var23 = new byte[var3][]; // L: 297 - for (var14 = 0; var14 < var3; ++var14) { // L: 287 - var19[var14] = new byte[var12[var14]]; // L: 288 - var12[var14] = 0; // L: 289 + for (var14 = 0; var14 < var3; ++var14) { // L: 298 + var23[var14] = new byte[var12[var14]]; // L: 299 + var12[var14] = 0; // L: 300 } - var11.offset = var9; // L: 291 - var14 = 0; // L: 292 + var11.offset = var22; // L: 302 + var14 = 0; // L: 303 - for (var15 = 0; var15 < var10; ++var15) { // L: 293 - int var16 = 0; // L: 294 + int var17; + for (var15 = 0; var15 < var10; ++var15) { // L: 304 + int var24 = 0; // L: 305 - for (int var17 = 0; var17 < var3; ++var17) { // L: 295 - var16 += var11.readInt(); // L: 296 - System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 297 - var12[var17] += var16; // L: 298 - var14 += var16; // L: 299 + for (var17 = 0; var17 < var3; ++var17) { // L: 306 + var24 += var11.readInt(); // L: 307 + System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 308 + var12[var17] += var24; // L: 309 + var14 += var24; // L: 310 } } - for (var15 = 0; var15 < var3; ++var15) { // L: 302 - if (!this.shallowFiles) { // L: 303 - var5[var4[var15]] = class92.method2195(var19[var15], false); + for (var15 = 0; var15 < var3; ++var15) { // L: 313 + if (!this.shallowFiles) { // L: 314 + var17 = var4[var15]; // L: 316 + byte[] var19 = var23[var15]; // L: 318 + Object var18; + if (var19 == null) { // L: 320 + var18 = null; // L: 321 + } else if (var19.length > 136) { // L: 324 + DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 326 + var20.set(var19); // L: 327 + var18 = var20; // L: 328 + } else { + var18 = var19; // L: 333 + } + + var5[var17] = var18; // L: 335 } else { - var5[var4[var15]] = var19[var15]; // L: 304 + var5[var4[var15]] = var23[var15]; // L: 337 } } - } else if (!this.shallowFiles) { // L: 308 - var5[var4[0]] = class92.method2195(var20, false); + } else if (!this.shallowFiles) { // L: 341 + var10 = var4[0]; // L: 343 + Object var26; + if (var25 == null) { // L: 346 + var26 = null; // L: 347 + } else if (var25.length > 136) { // L: 350 + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 352 + var27.set(var25); // L: 353 + var26 = var27; // L: 354 + } else { + var26 = var25; // L: 359 + } + + var5[var10] = var26; // L: 361 } else { - var5[var4[0]] = var20; // L: 309 + var5[var4[0]] = var25; // L: 363 } - return true; // L: 311 + return true; // L: 365 } } } - @ObfuscatedName("p") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "380978131" + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "3" ) @Export("getGroupId") public int getGroupId(String var1) { - var1 = var1.toLowerCase(); // L: 315 - return this.groupNameHashTable.get(class225.hashString(var1)); // L: 316 + var1 = var1.toLowerCase(); // L: 369 + return this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 370 } - @ObfuscatedName("o") + @ObfuscatedName("ba") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)I", - garbageValue = "-1592351891" + garbageValue = "-2010211153" ) @Export("getFileId") public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); // L: 320 - return this.fileNameHashTables[var1].get(class225.hashString(var2)); // L: 321 + var2 = var2.toLowerCase(); // L: 374 + return this.fileNameHashTables[var1].get(UserComparator3.hashString(var2)); // L: 375 } - @ObfuscatedName("ay") + @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-360297059" + garbageValue = "-2083689356" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 325 - var2 = var2.toLowerCase(); // L: 326 - int var3 = this.groupNameHashTable.get(class225.hashString(var1)); // L: 327 - if (var3 < 0) { // L: 328 + var1 = var1.toLowerCase(); // L: 379 + var2 = var2.toLowerCase(); // L: 380 + int var3 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 381 + if (var3 < 0) { // L: 382 return false; } else { - int var4 = this.fileNameHashTables[var3].get(class225.hashString(var2)); // L: 329 - return var4 >= 0; // L: 330 + int var4 = this.fileNameHashTables[var3].get(UserComparator3.hashString(var2)); // L: 383 + return var4 >= 0; // L: 384 } } - @ObfuscatedName("am") + @ObfuscatedName("bo") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-981973425" + garbageValue = "-879022702" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 335 - var2 = var2.toLowerCase(); // L: 336 - int var3 = this.groupNameHashTable.get(class225.hashString(var1)); // L: 337 - int var4 = this.fileNameHashTables[var3].get(class225.hashString(var2)); // L: 338 - return this.takeFile(var3, var4); // L: 339 + var1 = var1.toLowerCase(); // L: 389 + var2 = var2.toLowerCase(); // L: 390 + int var3 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 391 + int var4 = this.fileNameHashTables[var3].get(UserComparator3.hashString(var2)); // L: 392 + return this.takeFile(var3, var4); // L: 393 } - @ObfuscatedName("ag") + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", - garbageValue = "1" + garbageValue = "58" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); // L: 343 - var2 = var2.toLowerCase(); // L: 344 - int var3 = this.groupNameHashTable.get(class225.hashString(var1)); // L: 345 - int var4 = this.fileNameHashTables[var3].get(class225.hashString(var2)); // L: 346 - return this.tryLoadFile(var3, var4); // L: 347 + var1 = var1.toLowerCase(); // L: 397 + var2 = var2.toLowerCase(); // L: 398 + int var3 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 399 + int var4 = this.fileNameHashTables[var3].get(UserComparator3.hashString(var2)); // L: 400 + return this.tryLoadFile(var3, var4); // L: 401 } - @ObfuscatedName("ae") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "-101" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "-1457252962" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); // L: 351 - int var2 = this.groupNameHashTable.get(class225.hashString(var1)); // L: 352 - return this.tryLoadGroup(var2); // L: 353 + var1 = var1.toLowerCase(); // L: 405 + int var2 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 406 + return this.tryLoadGroup(var2); // L: 407 } - @ObfuscatedName("ac") + @ObfuscatedName("bw") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "208562973" + garbageValue = "-1800448858" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); // L: 357 - int var2 = this.groupNameHashTable.get(class225.hashString(var1)); // L: 358 - if (var2 >= 0) { // L: 359 - this.loadRegionFromGroup(var2); // L: 360 + var1 = var1.toLowerCase(); // L: 411 + int var2 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 412 + if (var2 >= 0) { // L: 413 + this.loadRegionFromGroup(var2); // L: 414 } - } // L: 361 + } // L: 415 - @ObfuscatedName("aq") + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)I", - garbageValue = "40" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-266550628" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); // L: 364 - int var2 = this.groupNameHashTable.get(class225.hashString(var1)); // L: 365 - return this.groupLoadPercent(var2); // L: 366 + var1 = var1.toLowerCase(); // L: 418 + int var2 = this.groupNameHashTable.get(UserComparator3.hashString(var1)); // L: 419 + return this.groupLoadPercent(var2); // L: 420 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1365583869" - ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Ljl;", - garbageValue = "-4" - ) - @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 - } - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(IIIILlm;Lht;I)V", - garbageValue = "-1045650328" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { - if (var4 != null) { // L: 11414 - int var6 = Client.camAngleY & 2047; // L: 11415 - int var7 = var3 * var3 + var2 * var2; // L: 11416 - if (var7 <= 6400) { // L: 11417 - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11418 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11419 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11420 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11421 - if (var7 > 2500) { - var4.method6350(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: 11422 - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11423 - } - - } - } - } // L: 11424 } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index 4f8e232962..6d13ddf35d 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,25 +3,47 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hd") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { AbstractByteArrayCopier() { } // L: 4 - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1361682252" + garbageValue = "-1722490231" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "262833794" + garbageValue = "1564375073" ) @Export("set") - abstract void set(byte[] var1); + public abstract void set(byte[] var1); + + @ObfuscatedName("ie") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-1232233436" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 9004 + if (Client.menuOptionsCount < 500) { // L: 9005 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 9006 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9007 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9008 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9009 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9010 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9011 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9012 + ++Client.menuOptionsCount; // L: 9013 + } + + } + } // L: 9015 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index a9edb8ec50..5c5b911db6 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,76 +4,76 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kx") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Low;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("pixels") byte[][] pixels; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("advances") int[] advances; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("widths") int[] widths; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("heights") int[] heights; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("topBearings") int[] topBearings; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("ascent") public int ascent; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("kerning") byte[] kerning; @@ -91,15 +91,9 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_lines = new String[100]; // L: 33 } - AbstractFont(byte[] var1) { + AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; - this.readMetrics(var1); // L: 53 - } // L: 54 - - AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { - this.pixels = new byte[256][]; // L: 12 - this.ascent = 0; // L: 18 this.leftBearings = var2; // L: 36 this.topBearings = var3; // L: 37 this.widths = var4; // L: 38 @@ -123,15 +117,21 @@ public abstract class AbstractFont extends Rasterizer2D { this.maxDescent = var9 - this.ascent; // L: 49 } // L: 50 - @ObfuscatedName("n") + AbstractFont(byte[] var1) { + this.pixels = new byte[256][]; // L: 12 + this.ascent = 0; // L: 18 + this.readMetrics(var1); // L: 53 + } // L: 54 + + @ObfuscatedName("f") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("readMetrics") void readMetrics(byte[] var1) { this.advances = new int[256]; // L: 57 @@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (var13 != 32 && var13 != 160) { // L: 89 for (var8 = 0; var8 < 256; ++var8) { // L: 90 if (var8 != 32 && var8 != 160) { // L: 91 - this.kerning[var8 + (var13 << 8)] = (byte)method5543(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 + this.kerning[var8 + (var13 << 8)] = (byte)method5369(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } // L: 97 - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { // L: 122 var1 = ' '; } - return this.advances[LoginPacket.charToByteCp1252(var1) & 255]; // L: 123 + return this.advances[Messages.charToByteCp1252(var1) & 255]; // L: 123 } - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { // L: 127 @@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var7.equals("gt")) { // L: 141 if (var7.startsWith("img=")) { // L: 142 try { - int var8 = class217.parseInt(var7.substring(4)); // L: 144 + int var8 = class69.method1168(var7.substring(4)); // L: 144 var4 += AbstractFont_modIconSprites[var8].width; // L: 145 var3 = -1; // L: 146 } catch (Exception var10) { // L: 148 @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { // L: 154 - var4 += this.advances[(char)(LoginPacket.charToByteCp1252(var6) & 255)]; // L: 155 + var4 += this.advances[(char)(Messages.charToByteCp1252(var6) & 255)]; // L: 155 if (this.kerning != null && var3 != -1) { // L: 156 var4 += this.kerning[var6 + (var3 << 8)]; } @@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { // L: 164 @@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D { var11 = '>'; // L: 203 } else if (var16.startsWith("img=")) { // L: 205 try { - int var17 = class217.parseInt(var16.substring(4)); // L: 207 + int var17 = class69.method1168(var16.substring(4)); // L: 207 var4 += AbstractFont_modIconSprites[var17].width; // L: 208 var11 = 0; // L: 209 } catch (Exception var20) { // L: 211 @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 @@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; // L: 254 } - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 } - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 279 @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 282 - @ObfuscatedName("g") + @ObfuscatedName("t") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 285 @@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 289 - @ObfuscatedName("u") + @ObfuscatedName("v") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 292 @@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 295 - @ObfuscatedName("t") + @ObfuscatedName("x") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { // L: 298 @@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 301 - @ObfuscatedName("p") + @ObfuscatedName("z") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { // L: 304 @@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("i") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 339 @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 344 - @ObfuscatedName("ay") + @ObfuscatedName("a") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 347 @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 356 - @ObfuscatedName("am") + @ObfuscatedName("w") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { // L: 359 @@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 366 - @ObfuscatedName("ag") + @ObfuscatedName("s") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { // L: 369 @@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } // L: 380 - @ObfuscatedName("ae") + @ObfuscatedName("y") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; // L: 383 @@ -586,101 +586,91 @@ public abstract class AbstractFont extends Rasterizer2D { @Export("decodeTag") void decodeTag(String var1) { try { - int var2; - String var3; if (var1.startsWith("col=")) { // L: 394 - var3 = var1.substring(4); // L: 396 - var2 = LoginScreenAnimation.parseIntCustomRadix(var3, 16, true); // L: 398 - AbstractFont_color = var2; // L: 400 - } else if (var1.equals("/col")) { // L: 402 + AbstractFont_color = ItemLayer.method3273(var1.substring(4), 16); + } else if (var1.equals("/col")) { // L: 395 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { // L: 403 - var3 = var1.substring(4); // L: 405 - var2 = LoginScreenAnimation.parseIntCustomRadix(var3, 16, true); // L: 407 - AbstractFont_strike = var2; // L: 409 - } else if (var1.equals("str")) { // L: 411 + } else if (var1.startsWith("str=")) { // L: 396 + AbstractFont_strike = ItemLayer.method3273(var1.substring(4), 16); + } else if (var1.equals("str")) { // L: 397 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { // L: 412 + } else if (var1.equals("/str")) { // L: 398 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { // L: 413 - var3 = var1.substring(2); // L: 415 - var2 = LoginScreenAnimation.parseIntCustomRadix(var3, 16, true); // L: 417 - AbstractFont_underline = var2; // L: 419 - } else if (var1.equals("u")) { // L: 421 + } else if (var1.startsWith("u=")) { // L: 399 + AbstractFont_underline = ItemLayer.method3273(var1.substring(2), 16); + } else if (var1.equals("u")) { // L: 400 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { // L: 422 + } else if (var1.equals("/u")) { // L: 401 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { // L: 423 - var3 = var1.substring(5); // L: 425 - var2 = LoginScreenAnimation.parseIntCustomRadix(var3, 16, true); // L: 427 - AbstractFont_shadow = var2; // L: 429 - } else if (var1.equals("shad")) { // L: 431 + } else if (var1.startsWith("shad=")) { // L: 402 + AbstractFont_shadow = ItemLayer.method3273(var1.substring(5), 16); + } else if (var1.equals("shad")) { // L: 403 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { // L: 432 + } else if (var1.equals("/shad")) { // L: 404 AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { - this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 433 + } else if (var1.equals("br")) { // L: 405 + this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var5) { // L: 435 + } catch (Exception var3) { // L: 407 } - } // L: 436 + } // L: 408 - @ObfuscatedName("aq") + @ObfuscatedName("ay") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; // L: 439 - boolean var4 = false; // L: 440 + int var3 = 0; // L: 411 + boolean var4 = false; // L: 412 - for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 441 - char var6 = var1.charAt(var5); // L: 442 - if (var6 == '<') { // L: 443 + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 413 + char var6 = var1.charAt(var5); // L: 414 + if (var6 == '<') { // L: 415 var4 = true; - } else if (var6 == '>') { // L: 444 + } else if (var6 == '>') { // L: 416 var4 = false; - } else if (!var4 && var6 == ' ') { // L: 445 + } else if (!var4 && var6 == ' ') { // L: 417 ++var3; } } - if (var3 > 0) { // L: 447 + if (var3 > 0) { // L: 419 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } // L: 448 + } // L: 420 - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; // L: 451 - int var4 = -1; // L: 452 - int var5 = -1; // L: 453 + var3 -= this.ascent; // L: 423 + int var4 = -1; // L: 424 + int var5 = -1; // L: 425 - for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 454 - if (var1.charAt(var6) != 0) { // L: 455 - char var7 = (char)(LoginPacket.charToByteCp1252(var1.charAt(var6)) & 255); // L: 456 - if (var7 == '<') { // L: 457 - var4 = var6; // L: 458 + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426 + if (var1.charAt(var6) != 0) { // L: 427 + char var7 = (char)(Messages.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 + if (var7 == '<') { // L: 429 + var4 = var6; // L: 430 } else { int var9; - if (var7 == '>' && var4 != -1) { // L: 461 - String var8 = var1.substring(var4 + 1, var6); // L: 462 - var4 = -1; // L: 463 - if (var8.equals("lt")) { // L: 464 + if (var7 == '>' && var4 != -1) { // L: 433 + String var8 = var1.substring(var4 + 1, var6); // L: 434 + var4 = -1; // L: 435 + if (var8.equals("lt")) { // L: 436 var7 = '<'; } else { - if (!var8.equals("gt")) { // L: 465 - if (var8.startsWith("img=")) { // L: 466 + if (!var8.equals("gt")) { // L: 437 + if (var8.startsWith("img=")) { // L: 438 try { - var9 = class217.parseInt(var8.substring(4)); // L: 468 - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 469 - var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 470 - var2 += var10.width; // L: 471 - var5 = -1; // L: 472 - } catch (Exception var14) { // L: 474 + var9 = class69.method1168(var8.substring(4)); // L: 440 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 441 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 442 + var2 += var10.width; // L: 443 + var5 = -1; // L: 444 + } catch (Exception var14) { // L: 446 } } else { - this.decodeTag(var8); // L: 478 + this.decodeTag(var8); // L: 450 } continue; } @@ -689,103 +679,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { // L: 482 + if (var7 == 160) { // L: 454 var7 = ' '; } - if (var4 == -1) { // L: 483 - if (this.kerning != null && var5 != -1) { // L: 484 + if (var4 == -1) { // L: 455 + if (this.kerning != null && var5 != -1) { // L: 456 var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; // L: 485 - var9 = this.heights[var7]; // L: 486 - if (var7 != ' ') { // L: 487 - if (AbstractFont_alpha == 256) { // L: 488 - if (AbstractFont_shadow != -1) { // L: 489 + int var12 = this.widths[var7]; // L: 457 + var9 = this.heights[var7]; // L: 458 + if (var7 != ' ') { // L: 459 + if (AbstractFont_alpha == 256) { // L: 460 + if (AbstractFont_shadow != -1) { // L: 461 AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 490 + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 462 } else { - if (AbstractFont_shadow != -1) { // L: 493 + if (AbstractFont_shadow != -1) { // L: 465 AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 494 + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 466 } - } else if (AbstractFont_justificationTotal > 0) { // L: 498 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 499 - var2 += AbstractFont_justificationCurrent >> 8; // L: 500 - AbstractFont_justificationCurrent &= 255; // L: 501 + } else if (AbstractFont_justificationTotal > 0) { // L: 470 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 471 + var2 += AbstractFont_justificationCurrent >> 8; // L: 472 + AbstractFont_justificationCurrent &= 255; // L: 473 } - int var13 = this.advances[var7]; // L: 504 - if (AbstractFont_strike != -1) { // L: 505 + int var13 = this.advances[var7]; // L: 476 + if (AbstractFont_strike != -1) { // L: 477 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 506 + if (AbstractFont_underline != -1) { // L: 478 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; // L: 507 - var5 = var7; // L: 508 + var2 += var13; // L: 479 + var5 = var7; // L: 480 } } } } - } // L: 511 + } // L: 483 - @ObfuscatedName("ak") + @ObfuscatedName("ag") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; // L: 514 - int var6 = -1; // L: 515 - int var7 = -1; // L: 516 - int var8 = 0; // L: 517 + var3 -= this.ascent; // L: 486 + int var6 = -1; // L: 487 + int var7 = -1; // L: 488 + int var8 = 0; // L: 489 - for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 518 - if (var1.charAt(var9) != 0) { // L: 519 - char var10 = (char)(LoginPacket.charToByteCp1252(var1.charAt(var9)) & 255); // L: 520 - if (var10 == '<') { // L: 521 - var6 = var9; // L: 522 + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490 + if (var1.charAt(var9) != 0) { // L: 491 + char var10 = (char)(Messages.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 + if (var10 == '<') { // L: 493 + var6 = var9; // L: 494 } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { // L: 525 - String var11 = var1.substring(var6 + 1, var9); // L: 526 - var6 = -1; // L: 527 - if (var11.equals("lt")) { // L: 528 + if (var10 == '>' && var6 != -1) { // L: 497 + String var11 = var1.substring(var6 + 1, var9); // L: 498 + var6 = -1; // L: 499 + if (var11.equals("lt")) { // L: 500 var10 = '<'; } else { - if (!var11.equals("gt")) { // L: 529 - if (var11.startsWith("img=")) { // L: 530 + if (!var11.equals("gt")) { // L: 501 + if (var11.startsWith("img=")) { // L: 502 try { - if (var4 != null) { // L: 533 + if (var4 != null) { // L: 505 var12 = var4[var8]; } else { - var12 = 0; // L: 534 + var12 = 0; // L: 506 } - if (var5 != null) { // L: 536 + if (var5 != null) { // L: 508 var13 = var5[var8]; } else { - var13 = 0; // L: 537 + var13 = 0; // L: 509 } - ++var8; // L: 538 - var14 = class217.parseInt(var11.substring(4)); // L: 539 - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 540 - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 541 - var2 += var15.width; // L: 542 - var7 = -1; // L: 543 - } catch (Exception var19) { // L: 545 + ++var8; // L: 510 + var14 = class69.method1168(var11.substring(4)); // L: 511 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 512 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 513 + var2 += var15.width; // L: 514 + var7 = -1; // L: 515 + } catch (Exception var19) { // L: 517 } } else { - this.decodeTag(var11); // L: 549 + this.decodeTag(var11); // L: 521 } continue; } @@ -794,70 +784,70 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { // L: 553 + if (var10 == 160) { // L: 525 var10 = ' '; } - if (var6 == -1) { // L: 554 - if (this.kerning != null && var7 != -1) { // L: 555 + if (var6 == -1) { // L: 526 + if (this.kerning != null && var7 != -1) { // L: 527 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; // L: 556 - var12 = this.heights[var10]; // L: 557 - if (var4 != null) { // L: 559 + int var17 = this.widths[var10]; // L: 528 + var12 = this.heights[var10]; // L: 529 + if (var4 != null) { // L: 531 var13 = var4[var8]; } else { - var13 = 0; // L: 560 + var13 = 0; // L: 532 } - if (var5 != null) { // L: 562 + if (var5 != null) { // L: 534 var14 = var5[var8]; } else { - var14 = 0; // L: 563 + var14 = 0; // L: 535 } - ++var8; // L: 564 - if (var10 != ' ') { // L: 565 - if (AbstractFont_alpha == 256) { // L: 566 - if (AbstractFont_shadow != -1) { // L: 567 + ++var8; // L: 536 + if (var10 != ' ') { // L: 537 + if (AbstractFont_alpha == 256) { // L: 538 + if (AbstractFont_shadow != -1) { // L: 539 AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 568 + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 540 } else { - if (AbstractFont_shadow != -1) { // L: 571 + if (AbstractFont_shadow != -1) { // L: 543 AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 572 + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 544 } - } else if (AbstractFont_justificationTotal > 0) { // L: 576 - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 577 - var2 += AbstractFont_justificationCurrent >> 8; // L: 578 - AbstractFont_justificationCurrent &= 255; // L: 579 + } else if (AbstractFont_justificationTotal > 0) { // L: 548 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 549 + var2 += AbstractFont_justificationCurrent >> 8; // L: 550 + AbstractFont_justificationCurrent &= 255; // L: 551 } - int var18 = this.advances[var10]; // L: 582 - if (AbstractFont_strike != -1) { // L: 583 + int var18 = this.advances[var10]; // L: 554 + if (AbstractFont_strike != -1) { // L: 555 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { // L: 584 + if (AbstractFont_underline != -1) { // L: 556 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; // L: 585 - var7 = var10; // L: 586 + var2 += var18; // L: 557 + var7 = var10; // L: 558 } } } } - } // L: 589 + } // L: 561 - @ObfuscatedName("l") - static int method5543(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("n") + static int method5369(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { int var7 = var2[var5]; // L: 100 int var8 = var7 + var4[var5]; // L: 101 int var9 = var2[var6]; // L: 102 @@ -892,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; // L: 118 } - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); // L: 262 @@ -921,157 +911,157 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); // L: 275 } - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 595 - int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 596 - int var8 = 0; // L: 597 - int var9 = 0; // L: 598 + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 567 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568 + int var8 = 0; // L: 569 + int var9 = 0; // L: 570 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 599 - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 600 - var4 -= var10; // L: 601 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 602 - var9 += var3 * var10; // L: 603 - var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 604 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 571 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 572 + var4 -= var10; // L: 573 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 574 + var9 += var3 * var10; // L: 575 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 576 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 606 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 578 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 607 - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 608 - var3 -= var10; // L: 609 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 610 - var9 += var10; // L: 611 - var6 += var10; // L: 612 - var8 += var10; // L: 613 - var7 += var10; // L: 614 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 579 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 580 + var3 -= var10; // L: 581 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 582 + var9 += var10; // L: 583 + var6 += var10; // L: 584 + var8 += var10; // L: 585 + var7 += var10; // L: 586 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 616 - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 617 - var3 -= var10; // L: 618 - var8 += var10; // L: 619 - var7 += var10; // L: 620 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 588 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 589 + var3 -= var10; // L: 590 + var8 += var10; // L: 591 + var7 += var10; // L: 592 } - if (var3 > 0 && var4 > 0) { // L: 622 - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 623 + if (var3 > 0 && var4 > 0) { // L: 594 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 595 } - } // L: 624 + } // L: 596 - @ObfuscatedName("ar") + @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); // L: 627 - var5 = -(var5 & 3); // L: 628 + int var9 = -(var5 >> 2); // L: 599 + var5 = -(var5 & 3); // L: 600 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 629 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 601 int var11; - for (var11 = var9; var11 < 0; ++var11) { // L: 630 - if (var1[var3++] != 0) { // L: 631 + for (var11 = var9; var11 < 0; ++var11) { // L: 602 + if (var1[var3++] != 0) { // L: 603 var0[var4++] = var2; } else { - ++var4; // L: 632 + ++var4; // L: 604 } - if (var1[var3++] != 0) { // L: 633 + if (var1[var3++] != 0) { // L: 605 var0[var4++] = var2; } else { - ++var4; // L: 634 + ++var4; // L: 606 } - if (var1[var3++] != 0) { // L: 635 + if (var1[var3++] != 0) { // L: 607 var0[var4++] = var2; } else { - ++var4; // L: 636 + ++var4; // L: 608 } - if (var1[var3++] != 0) { // L: 637 + if (var1[var3++] != 0) { // L: 609 var0[var4++] = var2; } else { - ++var4; // L: 638 + ++var4; // L: 610 } } - for (var11 = var5; var11 < 0; ++var11) { // L: 640 - if (var1[var3++] != 0) { // L: 641 + for (var11 = var5; var11 < 0; ++var11) { // L: 612 + if (var1[var3++] != 0) { // L: 613 var0[var4++] = var2; } else { - ++var4; // L: 642 + ++var4; // L: 614 } } - var4 += var7; // L: 644 - var3 += var8; // L: 645 + var4 += var7; // L: 616 + var3 += var8; // L: 617 } - } // L: 647 + } // L: 619 - @ObfuscatedName("al") + @ObfuscatedName("aj") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 650 - int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 651 - int var9 = 0; // L: 652 - int var10 = 0; // L: 653 + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 622 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623 + int var9 = 0; // L: 624 + int var10 = 0; // L: 625 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 654 - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 655 - var4 -= var11; // L: 656 - var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 657 - var10 += var3 * var11; // L: 658 - var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 659 + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 626 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 627 + var4 -= var11; // L: 628 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 629 + var10 += var3 * var11; // L: 630 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 631 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 661 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 633 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 662 - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 663 - var3 -= var11; // L: 664 - var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 665 - var10 += var11; // L: 666 - var7 += var11; // L: 667 - var9 += var11; // L: 668 - var8 += var11; // L: 669 + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 634 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 635 + var3 -= var11; // L: 636 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 637 + var10 += var11; // L: 638 + var7 += var11; // L: 639 + var9 += var11; // L: 640 + var8 += var11; // L: 641 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 671 - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 672 - var3 -= var11; // L: 673 - var9 += var11; // L: 674 - var8 += var11; // L: 675 + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 643 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 644 + var3 -= var11; // L: 645 + var9 += var11; // L: 646 + var8 += var11; // L: 647 } - if (var3 > 0 && var4 > 0) { // L: 677 - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 678 + if (var3 > 0 && var4 > 0) { // L: 649 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 650 } - } // L: 679 + } // L: 651 - @ObfuscatedName("aa") + @ObfuscatedName("aw") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 682 - var9 = 256 - var9; // L: 683 + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 654 + var9 = 256 - var9; // L: 655 - for (int var10 = -var6; var10 < 0; ++var10) { // L: 684 - for (int var11 = -var5; var11 < 0; ++var11) { // L: 685 - if (var1[var3++] != 0) { // L: 686 - int var12 = var0[var4]; // L: 687 - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 688 + for (int var10 = -var6; var10 < 0; ++var10) { // L: 656 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 657 + if (var1[var3++] != 0) { // L: 658 + int var12 = var0[var4]; // L: 659 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 660 } else { - ++var4; // L: 690 + ++var4; // L: 662 } } - var4 += var7; // L: 692 - var3 += var8; // L: 693 + var4 += var7; // L: 664 + var3 += var8; // L: 665 } - } // L: 695 + } // L: 667 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index fa760ca3ba..a0e66c1d9e 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("oe") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("pixels") public int[] pixels; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1159583033 + intValue = 256731231 ) @Export("width") public int width; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1839293839 + intValue = 1327457593 ) @Export("height") public int height; @@ -26,18 +26,18 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } // L: 8 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2060006654" + garbageValue = "2076883796" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1656973228" + descriptor = "(IIIIB)V", + garbageValue = "-60" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); @@ -45,10 +45,161 @@ public abstract class AbstractRasterProvider { @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1592611264" + garbageValue = "-2104011211" ) @Export("apply") public final void apply() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 } // L: 12 + + @ObfuscatedName("gx") + @ObfuscatedSignature( + descriptor = "(IIIIIB)V", + garbageValue = "1" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = WorldMapArea.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5189 + int var7; + int var8; + int var9; + int var10; + int var13; + int var14; + if (0L != var5) { // L: 5190 + var7 = WorldMapArea.scene.getObjectFlags(var0, var1, var2, var5); // L: 5191 + var8 = var7 >> 6 & 3; // L: 5192 + var9 = var7 & 31; // L: 5193 + var10 = var3; // L: 5194 + boolean var11 = 0L != var5 && !class10.method137(var5); // L: 5197 + if (var11) { // L: 5199 + var10 = var4; + } + + int[] var12 = class19.sceneMinimapSprite.pixels; // L: 5200 + var13 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5201 + var14 = WorldMapSection1.Entity_unpackID(var5); // L: 5202 + ObjectComposition var15 = class19.getObjectDefinition(var14); // L: 5203 + if (var15.mapSceneId != -1) { // L: 5204 + IndexedSprite var16 = class18.mapSceneSprites[var15.mapSceneId]; // L: 5205 + if (var16 != null) { // L: 5206 + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5207 + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5208 + var16.drawAt(var17 + var1 * 4 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5209 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5213 + if (var8 == 0) { // L: 5214 + var12[var13] = var10; // L: 5215 + var12[var13 + 512] = var10; // L: 5216 + var12[var13 + 1024] = var10; // L: 5217 + var12[var13 + 1536] = var10; // L: 5218 + } else if (var8 == 1) { // L: 5220 + var12[var13] = var10; // L: 5221 + var12[var13 + 1] = var10; // L: 5222 + var12[var13 + 2] = var10; // L: 5223 + var12[var13 + 3] = var10; // L: 5224 + } else if (var8 == 2) { // L: 5226 + var12[var13 + 3] = var10; // L: 5227 + var12[var13 + 512 + 3] = var10; // L: 5228 + var12[var13 + 1024 + 3] = var10; // L: 5229 + var12[var13 + 1536 + 3] = var10; // L: 5230 + } else if (var8 == 3) { // L: 5232 + var12[var13 + 1536] = var10; // L: 5233 + var12[var13 + 1536 + 1] = var10; // L: 5234 + var12[var13 + 1536 + 2] = var10; // L: 5235 + var12[var13 + 1536 + 3] = var10; // L: 5236 + } + } + + if (var9 == 3) { // L: 5239 + if (var8 == 0) { // L: 5240 + var12[var13] = var10; + } else if (var8 == 1) { // L: 5241 + var12[var13 + 3] = var10; + } else if (var8 == 2) { // L: 5242 + var12[var13 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5243 + var12[var13 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5245 + if (var8 == 3) { // L: 5246 + var12[var13] = var10; // L: 5247 + var12[var13 + 512] = var10; // L: 5248 + var12[var13 + 1024] = var10; // L: 5249 + var12[var13 + 1536] = var10; // L: 5250 + } else if (var8 == 0) { // L: 5252 + var12[var13] = var10; // L: 5253 + var12[var13 + 1] = var10; // L: 5254 + var12[var13 + 2] = var10; // L: 5255 + var12[var13 + 3] = var10; // L: 5256 + } else if (var8 == 1) { // L: 5258 + var12[var13 + 3] = var10; // L: 5259 + var12[var13 + 512 + 3] = var10; // L: 5260 + var12[var13 + 1024 + 3] = var10; // L: 5261 + var12[var13 + 1536 + 3] = var10; // L: 5262 + } else if (var8 == 2) { // L: 5264 + var12[var13 + 1536] = var10; // L: 5265 + var12[var13 + 1536 + 1] = var10; // L: 5266 + var12[var13 + 1536 + 2] = var10; // L: 5267 + var12[var13 + 1536 + 3] = var10; // L: 5268 + } + } + } + } + + var5 = WorldMapArea.scene.getGameObjectTag(var0, var1, var2); // L: 5273 + if (var5 != 0L) { // L: 5274 + var7 = WorldMapArea.scene.getObjectFlags(var0, var1, var2, var5); // L: 5275 + var8 = var7 >> 6 & 3; // L: 5276 + var9 = var7 & 31; // L: 5277 + var10 = WorldMapSection1.Entity_unpackID(var5); // L: 5278 + ObjectComposition var19 = class19.getObjectDefinition(var10); // L: 5279 + if (var19.mapSceneId != -1) { // L: 5280 + IndexedSprite var26 = class18.mapSceneSprites[var19.mapSceneId]; // L: 5281 + if (var26 != null) { // L: 5282 + var13 = (var19.sizeX * 4 - var26.subWidth) / 2; // L: 5283 + var14 = (var19.sizeY * 4 - var26.subHeight) / 2; // L: 5284 + var26.drawAt(var1 * 4 + var13 + 48, var14 + (104 - var2 - var19.sizeY) * 4 + 48); // L: 5285 + } + } else if (var9 == 9) { // L: 5288 + int var20 = 15658734; // L: 5289 + boolean var27 = 0L != var5 && !class10.method137(var5); // L: 5292 + if (var27) { // L: 5294 + var20 = 15597568; + } + + int[] var21 = class19.sceneMinimapSprite.pixels; // L: 5295 + int var22 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5296 + if (var8 != 0 && var8 != 2) { // L: 5297 + var21[var22] = var20; // L: 5304 + var21[var22 + 1 + 512] = var20; // L: 5305 + var21[var22 + 1024 + 2] = var20; // L: 5306 + var21[var22 + 1536 + 3] = var20; // L: 5307 + } else { + var21[var22 + 1536] = var20; // L: 5298 + var21[var22 + 1 + 1024] = var20; // L: 5299 + var21[var22 + 512 + 2] = var20; // L: 5300 + var21[var22 + 3] = var20; // L: 5301 + } + } + } + + var5 = WorldMapArea.scene.getFloorDecorationTag(var0, var1, var2); // L: 5311 + if (var5 != 0L) { // L: 5312 + var7 = WorldMapSection1.Entity_unpackID(var5); // L: 5313 + ObjectComposition var23 = class19.getObjectDefinition(var7); // L: 5314 + if (var23.mapSceneId != -1) { // L: 5315 + IndexedSprite var24 = class18.mapSceneSprites[var23.mapSceneId]; // L: 5316 + if (var24 != null) { // L: 5317 + var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5318 + int var25 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5319 + var24.drawAt(var10 + var1 * 4 + 48, var25 + (104 - var2 - var23.sizeY) * 4 + 48); // L: 5320 + } + } + } + + } // L: 5324 } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index c00c4b519b..d56433ae14 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,111 +4,82 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("li") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } // L: 7 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "136255387" + garbageValue = "-1705512918" ) @Export("close") public abstract void close(); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-29" + garbageValue = "-75" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-65" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1621767276" + garbageValue = "1604537239" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "-127" + garbageValue = "121" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1032488862" + garbageValue = "199608149" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("v") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIII)V", - garbageValue = "-632113899" + descriptor = "(II)V", + garbageValue = "-1917773732" ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { // L: 13 - int var4 = (var3 + var2) / 2; // L: 14 - int var5 = var2; // L: 15 - String var6 = var0[var4]; // L: 16 - var0[var4] = var0[var3]; // L: 17 - var0[var3] = var6; // L: 18 - short var7 = var1[var4]; // L: 19 - var1[var4] = var1[var3]; // L: 20 - var1[var3] = var7; // L: 21 + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 4271 + if (class15.loadInterface(var0)) { // L: 4272 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4273 - for (int var8 = var2; var8 < var3; ++var8) { // L: 22 - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 23 - String var9 = var0[var8]; // L: 24 - var0[var8] = var0[var5]; // L: 25 - var0[var5] = var9; // L: 26 - short var10 = var1[var8]; // L: 27 - var1[var8] = var1[var5]; // L: 28 - var1[var5++] = var10; // L: 29 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4274 + Widget var3 = var1[var2]; // L: 4275 + if (var3.onLoad != null) { // L: 4276 + ScriptEvent var4 = new ScriptEvent(); // L: 4277 + var4.widget = var3; // L: 4278 + var4.args = var3.onLoad; // L: 4279 + FaceNormal.runScript(var4, 5000000, 0); // L: 4280 + } } + } - - var0[var3] = var0[var5]; // L: 33 - var0[var5] = var6; // L: 34 - var1[var3] = var1[var5]; // L: 35 - var1[var5] = var7; // L: 36 - sortItemsByName(var0, var1, var2, var5 - 1); // L: 37 - sortItemsByName(var0, var1, var5 + 1, var3); // L: 38 } - - } // L: 40 - - @ObfuscatedName("fd") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field899) { // L: 3385 - ScriptEvent.method1272(); // L: 3386 - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && WorldMapSectionType.clientPreferences.musicVolume != 0 && !Client.field899) { // L: 3388 - GrandExchangeOfferOwnWorldComparator.method1376(2, UrlRequester.archive6, var0, 0, WorldMapSectionType.clientPreferences.musicVolume, false); // L: 3389 - } - - Client.currentTrackGroupId = var0; // L: 3391 - } // L: 3392 + } // L: 4283 } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 5d18a4ebe9..237bc6e77d 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dn") +@ObfuscatedName("bc") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 1fa1d7b241..c4c88999ed 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,30 +1,30 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jh") +@ObfuscatedName("ll") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("lf") - @ObfuscatedGetter( - intValue = -1144052371 + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "Lmf;" ) - @Export("menuY") - static int menuY; - @ObfuscatedName("v") + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("o") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } // L: 8 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;I)V", - garbageValue = "1135766594" + garbageValue = "-1553050282" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -36,10 +36,10 @@ public abstract class AbstractUserComparator implements Comparator { } // L: 17 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljn;Ljn;B)I", - garbageValue = "0" + descriptor = "(Llt;Llt;I)I", + garbageValue = "833589834" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -50,26 +50,43 @@ public abstract class AbstractUserComparator implements Comparator { return super.equals(var1); // L: 25 } - @ObfuscatedName("n") + @ObfuscatedName("f") + static double method5714(double var0) { + return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9 + } + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)Lis;", - garbageValue = "1543064609" + descriptor = "(ILcc;ZI)I", + garbageValue = "1686681071" ) - @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; + static int method5710(int var0, Script var1, boolean var2) { + Widget var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1375 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1376 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var3)); // L: 1377 + return 1; // L: 1378 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1380 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1387 + if (var3.dataText == null) { // L: 1388 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1389 + } + + return 1; // L: 1390 + } else { + return 2; // L: 1392 + } } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 - var1 = new SpotAnimationDefinition(); // L: 35 - var1.id = var0; // L: 36 - if (var2 != null) { // L: 37 - var1.decode(new Buffer(var2)); + int var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1381 + --var4; // L: 1382 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1383 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1384 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 + return 1; // L: 1385 } } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 7422505fa7..e9ba2899f0 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,222 +1,217 @@ -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.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ac") +@ObfuscatedName("ee") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("n") + @ObfuscatedName("dx") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive9") + static Archive archive9; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 285974329 + intValue = -20064217 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 998722377 + intValue = -2014332989 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("d") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -226026385 + intValue = -1125941169 ) @Export("regionX") int regionX; - @ObfuscatedName("c") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2108441199 + intValue = -2054969583 ) @Export("regionY") int regionY; - @ObfuscatedName("y") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -351352557 + intValue = -682605071 ) @Export("minPlane") int minPlane; - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 754636665 + intValue = -518585079 ) @Export("planes") int planes; - @ObfuscatedName("z") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1785019245 + intValue = 1136601731 ) @Export("groupId") int groupId; - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1849711777 + intValue = -1951051003 ) @Export("fileId") int fileId; - @ObfuscatedName("q") + @ObfuscatedName("d") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("l") + @ObfuscatedName("c") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("s") - byte[][][] field193; - @ObfuscatedName("b") - byte[][][] field204; - @ObfuscatedName("a") + @ObfuscatedName("j") + byte[][][] field1690; + @ObfuscatedName("r") + byte[][][] field1700; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[[[[Lax;" + descriptor = "[[[[Lej;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("w") - boolean field203; - @ObfuscatedName("k") - boolean field207; + @ObfuscatedName("t") + boolean field1702; + @ObfuscatedName("v") + boolean field1703; AbstractWorldMapData() { this.groupId = -1; // L: 14 this.fileId = -1; // L: 15 new LinkedList(); - this.field203 = false; // L: 26 - this.field207 = false; // L: 27 + this.field1702 = false; // L: 26 + this.field1703 = false; // L: 27 } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "36" + descriptor = "(Lnu;I)V", + garbageValue = "-930076916" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("e") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "16711935" + garbageValue = "811477602" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field203 && this.field207; // L: 32 + return this.field1702 && this.field1703; // L: 32 } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lig;B)V", - garbageValue = "116" + descriptor = "(Lir;I)V", + garbageValue = "-458727625" ) @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.field203 = true; - this.field207 = true; + if (!this.isFullyLoaded()) { // L: 36 + byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 + if (var2 != null) { // L: 38 + this.readGeography(new Buffer(var2)); // L: 39 + this.field1702 = true; // L: 40 + this.field1703 = true; // L: 41 } } } // L: 43 - @ObfuscatedName("l") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-59" + descriptor = "(S)V", + garbageValue = "-31474" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field193 = null; - this.field204 = null; + this.field1690 = null; // L: 48 + this.field1700 = null; this.decorations = null; - this.field203 = false; // L: 51 - this.field207 = false; - } + this.field1702 = false; // L: 51 + this.field1703 = false; // L: 52 + } // L: 53 - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IILkx;I)V", - garbageValue = "-1493570847" + descriptor = "(IILnu;B)V", + garbageValue = "5" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); // L: 56 - if (var4 != 0) { - if ((var4 & 1) != 0) { - this.method327(var1, var2, var3, var4); + if (var4 != 0) { // L: 57 + if ((var4 & 1) != 0) { // L: 60 + this.method3072(var1, var2, var3, var4); // L: 61 } else { - this.method328(var1, var2, var3, var4); + this.method3073(var1, var2, var3, var4); // L: 64 } } - } + } // L: 58 66 - @ObfuscatedName("b") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IILkx;IB)V", - garbageValue = "20" + descriptor = "(IILnu;II)V", + garbageValue = "-100897215" ) - void method327(int var1, int var2, Buffer var3, int var4) { - boolean var5 = (var4 & 2) != 0; + void method3072(int var1, int var2, Buffer var3, int var4) { + boolean var5 = (var4 & 2) != 0; // L: 69 if (var5) { // L: 70 - this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71 } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); - } + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 + } // L: 74 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(IILkx;II)V", - garbageValue = "78729378" + descriptor = "(IILnu;II)V", + garbageValue = "-740435920" ) - void method328(int var1, int var2, Buffer var3, int var4) { - int var5 = ((var4 & 24) >> 3) + 1; - boolean var6 = (var4 & 2) != 0; - boolean var7 = (var4 & 4) != 0; + void method3073(int var1, int var2, Buffer var3, int var4) { + int var5 = ((var4 & 24) >> 3) + 1; // L: 77 + boolean var6 = (var4 & 2) != 0; // L: 78 + boolean var7 = (var4 & 4) != 0; // L: 79 this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 int var8; int var9; int var11; - if (var6) { + 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.field193[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 - this.field204[var9][var1][var2] = (byte)(var11 & 3); // L: 89 + 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.field1690[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field1700[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } - if (var7) { - for (var8 = 0; var8 < var5; ++var8) { + if (var7) { // L: 93 + for (var8 = 0; var8 < var5; ++var8) { // L: 94 var9 = var3.readUnsignedByte(); // L: 95 - if (var9 != 0) { - WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; + 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.method5833(); // L: 101 - int var13 = var3.readUnsignedByte(); - var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); + for (var11 = 0; var11 < var9; ++var11) { // L: 100 + int var12 = var3.method6597(); // L: 101 + int var13 = var3.readUnsignedByte(); // L: 102 + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } } } @@ -227,306 +222,145 @@ public abstract class AbstractWorldMapData { @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-75109979" + garbageValue = "-928216914" ) @Export("getRegionX") int getRegionX() { - return this.regionX; + return this.regionX; // L: 112 } - @ObfuscatedName("k") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2014407853" + descriptor = "(B)I", + garbageValue = "-56" ) @Export("getRegionY") int getRegionY() { return this.regionY; // L: 116 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1967773856" + descriptor = "(B)[Lgl;", + garbageValue = "-43" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - PlatformInfo.addChatMessage(var0, var1, var2, (String)null); // L: 19 - } // L: 20 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1751033687" - ) - public static int method342() { - return ViewportMouse.ViewportMouse_entityCount; // L: 44 + public static class203[] method3099() { + return new class203[]{class203.field2335, class203.field2327, class203.field2333, class203.field2329, class203.field2330, class203.field2331, class203.field2332, class203.field2339, class203.field2334, class203.field2328}; } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkd;I)V", - garbageValue = "352611015" + descriptor = "(II)I", + garbageValue = "1081768663" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 35 - if (var1 != null) { // L: 36 - int var2 = var0.offset; // L: 37 - var0.writeInt(var1.id); // L: 38 + public static int method3079(int var0) { + return var0 >> 17 & 7; // L: 17 + } - for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39 - if (var1.creationErrors[var3] != 0) { // L: 40 - var0.writeByte(var1.creationErrors[var3]); // L: 41 - } else { - try { - int var4 = var1.operations[var3]; // L: 45 - Field var5; - int var6; - if (var4 == 0) { // L: 46 - var5 = var1.fields[var3]; // L: 47 - var6 = Reflection.getInt(var5, (Object)null); // L: 48 - var0.writeByte(0); // L: 49 - var0.writeInt(var6); // L: 50 - } else if (var4 == 1) { // L: 52 - var5 = var1.fields[var3]; // L: 53 - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54 - var0.writeByte(0); // L: 55 - } else if (var4 == 2) { // L: 57 - var5 = var1.fields[var3]; // L: 58 - var6 = var5.getModifiers(); // L: 59 - var0.writeByte(0); // L: 60 - var0.writeInt(var6); // L: 61 - } - - Method var25; - if (var4 != 3) { // L: 63 - if (var4 == 4) { // L: 83 - var25 = var1.methods[var3]; // L: 84 - var6 = var25.getModifiers(); // L: 85 - var0.writeByte(0); // L: 86 - var0.writeInt(var6); // L: 87 - } - } else { - var25 = var1.methods[var3]; // L: 64 - byte[][] var10 = var1.arguments[var3]; // L: 65 - Object[] var7 = new Object[var10.length]; // L: 66 - - for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67 - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68 - var7[var8] = var9.readObject(); // L: 69 - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71 - if (var11 == null) { // L: 72 - var0.writeByte(0); - } else if (var11 instanceof Number) { // L: 73 - var0.writeByte(1); // L: 74 - var0.writeLong(((Number)var11).longValue()); // L: 75 - } else if (var11 instanceof String) { // L: 77 - var0.writeByte(2); // L: 78 - var0.writeStringCp1252NullTerminated((String)var11); // L: 79 - } else { - var0.writeByte(4); // L: 81 - } - } - } catch (ClassNotFoundException var13) { // L: 90 - var0.writeByte(-10); // L: 91 - } catch (InvalidClassException var14) { // L: 93 - var0.writeByte(-11); // L: 94 - } catch (StreamCorruptedException var15) { // L: 96 - var0.writeByte(-12); // L: 97 - } catch (OptionalDataException var16) { // L: 99 - var0.writeByte(-13); // L: 100 - } catch (IllegalAccessException var17) { // L: 102 - var0.writeByte(-14); // L: 103 - } catch (IllegalArgumentException var18) { // L: 105 - var0.writeByte(-15); // L: 106 - } catch (InvocationTargetException var19) { // L: 108 - var0.writeByte(-16); // L: 109 - } catch (SecurityException var20) { // L: 111 - var0.writeByte(-17); // L: 112 - } catch (IOException var21) { // L: 114 - var0.writeByte(-18); // L: 115 - } catch (NullPointerException var22) { // L: 117 - var0.writeByte(-19); // L: 118 - } catch (Exception var23) { // L: 120 - var0.writeByte(-20); // L: 121 - } catch (Throwable var24) { // L: 123 - var0.writeByte(-21); // L: 124 - } - } - } - - var0.writeCrc(var2); // L: 127 - var1.remove(); // L: 128 - } - } // L: 129 - - @ObfuscatedName("e") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1250443961" + descriptor = "([BIII)I", + garbageValue = "-779732662" ) - static int method350(int var0, Script var1, boolean var2) { - boolean var3 = true; // L: 775 - Widget var4; - if (var0 >= 2000) { // L: 777 - var0 -= 1000; // L: 778 - var4 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 779 - var3 = false; // L: 780 - } else { - var4 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 782 + public static int method3102(byte[] var0, int var1, int var2) { + int var3 = -1; // L: 45 + + for (int var4 = var1; var4 < var2; ++var4) { // L: 46 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 } - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { // L: 783 - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 784 - if (var11 >= 0 && var11 <= 9) { // L: 785 - var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 789 - return 1; // L: 790 - } else { - --Interpreter.Interpreter_stringStackSize; // L: 786 - return 1; // L: 787 - } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 792 - Interpreter.Interpreter_intStackSize -= 2; // L: 793 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 794 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 795 - var4.parent = ArchiveLoader.getWidgetChild(var11, var6); // L: 796 - return 1; // L: 797 - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 799 - var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 800 - return 1; // L: 801 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 803 - var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 804 - return 1; // L: 805 - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 807 - var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 808 - return 1; // L: 809 - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 811 - var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 812 - return 1; // L: 813 - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 815 - var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 816 - return 1; // L: 817 - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 819 - var4.actions = null; // L: 820 - return 1; // L: 821 - } else if (var0 == 1308) { // L: 823 - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 824 - return 1; // L: 825 - } else if (var0 == 1309) { // L: 827 - --Interpreter.Interpreter_intStackSize; // L: 828 - return 1; // L: 829 - } else { + var3 = ~var3; // L: 49 + return var3; // L: 50 + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "(Lcs;IIII)V", + garbageValue = "1966691326" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (Varcs.localPlayer != var0) { // L: 9319 + if (Client.menuOptionsCount < 400) { // L: 9320 + String var4; int var7; - byte[] var8; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 831 - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 861 - Interpreter.Interpreter_intStackSize -= 2; // L: 862 - var5 = 10; // L: 863 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 864 - byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 865 - TaskHandler.Widget_setKey(var4, var5, var8, var9); // L: 866 - return 1; // L: 867 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 869 - Interpreter.Interpreter_intStackSize -= 3; // L: 870 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 871 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 872 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 873 - if (var11 >= 0 && var11 <= 9) { // L: 874 - WorldMapRegion.Widget_setKeyRate(var4, var11, var6, var7); // L: 877 - return 1; // L: 878 - } else { - throw new RuntimeException(); // L: 875 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 880 - var5 = 10; // L: 881 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 882 - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 883 - WorldMapRegion.Widget_setKeyRate(var4, var5, var6, var7); // L: 884 - return 1; // L: 885 - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 887 - --Interpreter.Interpreter_intStackSize; // L: 888 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 889 - if (var11 >= 0 && var11 <= 9) { // L: 890 - WorldMapIcon_0.Widget_setKeyIgnoreHeld(var4, var11); // L: 893 - return 1; // L: 894 - } else { - throw new RuntimeException(); // L: 891 - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 896 - var5 = 10; // L: 897 - WorldMapIcon_0.Widget_setKeyIgnoreHeld(var4, var5); // L: 898 - return 1; // L: 899 + if (var0.skillLevel == 0) { // L: 9322 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9323 + var7 = var0.combatLevel; // L: 9325 + int var8 = Varcs.localPlayer.combatLevel; // L: 9326 + int var9 = var8 - var7; // L: 9328 + String var6; + if (var9 < -9) { // L: 9329 + var6 = DefaultsGroup.colorStartTag(16711680); // L: 9330 + } else if (var9 < -6) { // L: 9333 + var6 = DefaultsGroup.colorStartTag(16723968); // L: 9334 + } else if (var9 < -3) { // L: 9337 + var6 = DefaultsGroup.colorStartTag(16740352); // L: 9338 + } else if (var9 < 0) { // L: 9341 + var6 = DefaultsGroup.colorStartTag(16756736); // L: 9342 + } else if (var9 > 9) { // L: 9345 + var6 = DefaultsGroup.colorStartTag(65280); // L: 9346 + } else if (var9 > 6) { // L: 9349 + var6 = DefaultsGroup.colorStartTag(4259584); // L: 9350 + } else if (var9 > 3) { // L: 9353 + var6 = DefaultsGroup.colorStartTag(8453888); // L: 9354 + } else if (var9 > 0) { // L: 9357 + var6 = DefaultsGroup.colorStartTag(12648192); // L: 9358 } else { - return 2; // L: 901 + var6 = DefaultsGroup.colorStartTag(16776960); // L: 9361 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9363 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9365 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 9366 + SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9367 + } else if (Client.isSpellSelected) { // L: 9370 + if ((UserComparator10.selectedSpellFlags & 8) == 8) { // L: 9371 + SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9372 } } else { - byte[] var10 = null; // L: 832 - var8 = null; // L: 833 - if (var3) { // L: 834 - Interpreter.Interpreter_intStackSize -= 10; // L: 835 + for (var10 = 7; var10 >= 0; --var10) { // L: 9377 + if (Client.playerMenuActions[var10] != null) { // L: 9378 + short var11 = 0; // L: 9379 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9380 + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 9381 + continue; + } - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 837 838 - } + if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Varcs.localPlayer.combatLevel) { // L: 9382 + var11 = 2000; // L: 9383 + } - if (var7 > 0) { // L: 840 - var10 = new byte[var7 / 2]; // L: 841 - var8 = new byte[var7 / 2]; // L: 842 - - for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 843 - var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; // L: 844 - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; // L: 845 + if (Varcs.localPlayer.team != 0 && var0.team != 0) { // L: 9385 + if (var0.team == Varcs.localPlayer.team) { // L: 9386 + var11 = 2000; + } else { + var11 = 0; // L: 9387 + } + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 9390 + var11 = 2000; } + + boolean var12 = false; // L: 9391 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9392 + SpriteMask.insertMenuItemNoShift(Client.playerMenuActions[var10], DefaultsGroup.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9393 } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 850 - var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 851 - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 852 - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 854 - if (var7 >= 0 && var7 <= 9) { // L: 855 - TaskHandler.Widget_setKey(var4, var7, var10, var8); // L: 858 - return 1; // L: 859 - } else { - throw new RuntimeException(); // L: 856 - } - } - } - } - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1407692443" - ) - static void method352() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9015 - if (AbstractWorldMapIcon.method685(Client.menuOpcodes[var0])) { // L: 9016 - if (var0 < Client.menuOptionsCount - 1) { // L: 9017 - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9018 - Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9019 - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9020 - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9021 - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9022 - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9023 - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9024 - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9025 } } - --var0; // L: 9028 - --Client.menuOptionsCount; // L: 9029 + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9398 + if (Client.menuOpcodes[var10] == 23) { // L: 9399 + Client.menuTargets[var10] = DefaultsGroup.colorStartTag(16777215) + var4; // L: 9400 + break; + } + } + } } - - class41.method650(); // L: 9032 - } // L: 9033 + } // L: 9404 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index a6a1fd5758..38c98e60bb 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -3,80 +3,79 @@ 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("aj") +@ObfuscatedName("fg") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhk;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhk;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -945361989 + intValue = 288833025 ) @Export("screenX") int screenX; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1326787305 + intValue = 1238552841 ) @Export("screenY") int screenY; @ObfuscatedSignature( - descriptor = "(Lhd;Lhd;)V" + descriptor = "(Lhk;Lhk;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; // L: 13 this.coord2 = var2; // L: 14 } // L: 15 - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "7" + garbageValue = "-52" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)Laa;", - garbageValue = "31041" + descriptor = "(I)Lfi;", + garbageValue = "634413820" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-413607837" + garbageValue = "-1975622360" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1875187157" + garbageValue = "-1420825097" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "8" + garbageValue = "-68" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -87,62 +86,60 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "716812015" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; // L: 33 } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "-24" + garbageValue = "117" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { // L: 37 return false; } else { - WorldMapElement var3 = InvDefinition.WorldMapElement_get(this.getElement()); // L: 38 + WorldMapElement var3 = ByteArrayPool.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) { // L: 44 - return false; - } - break; - case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { // L: 49 + if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 49 break; } return false; + case 1: + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 + return false; + } + break; case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 54 + if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 54 return false; } } switch(var3.verticalAlignment.value) { // L: 58 case 0: - if (var2 > this.screenY - var5 && var2 <= this.screenY) { // L: 66 - break; + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 71 + return false; } - - return false; + break; case 1: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 71 - break; + if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 66 + return false; } - - return false; + break; case 2: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 61 + if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 61 return false; } } @@ -151,15 +148,15 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("u") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "1453906321" + garbageValue = "-1156651084" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { WorldMapLabel var3 = this.getLabel(); // L: 79 - if (var3 == null) { + 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 @@ -168,1106 +165,31 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("l") + @ObfuscatedName("ii") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "2147435814" + descriptor = "(I)V", + garbageValue = "519921718" ) - public static int method710(int var0) { - return class25.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 80 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1537886729" - ) - static int method713(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1013 - if (var0 == ScriptOpcodes.CC_GETX) { // L: 1014 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1015 - return 1; // L: 1016 - } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1018 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1019 - return 1; // L: 1020 - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1022 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1023 - return 1; // L: 1024 - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1026 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1027 - return 1; // L: 1028 - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1030 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1031 - return 1; // L: 1032 - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1034 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1035 - return 1; // L: 1036 - } else { - return 2; // L: 1038 - } - } - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-83873281" - ) - static final int method712() { - if (WorldMapSectionType.clientPreferences.roofsHidden) { // L: 4348 - return class90.Client_plane; - } else { - int var0 = 3; // L: 4349 - if (KeyHandler.cameraPitch < 310) { // L: 4350 - label167: { - int var1; - int var2; - if (Client.oculusOrbState == 1) { // L: 4353 - var1 = HealthBarUpdate.oculusOrbFocalPointX >> 7; // L: 4354 - var2 = ApproximateRouteStrategy.oculusOrbFocalPointY >> 7; // L: 4355 - } else { - var1 = UserComparator9.localPlayer.x >> 7; // L: 4358 - var2 = UserComparator9.localPlayer.y >> 7; // L: 4359 - } - - int var3 = SecureRandomFuture.cameraX >> 7; // L: 4361 - int var4 = ObjectSound.cameraZ >> 7; // L: 4362 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4363 - if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4364 - if ((Tiles.Tiles_renderFlags[class90.Client_plane][var3][var4] & 4) != 0) { // L: 4365 - var0 = class90.Client_plane; - } - - int var5; - if (var1 > var3) { // L: 4367 - var5 = var1 - var3; - } else { - var5 = var3 - var1; // L: 4368 - } - - int var6; - if (var2 > var4) { // L: 4370 - var6 = var2 - var4; - } else { - var6 = var4 - var2; // L: 4371 - } - - int var7; - int var8; - if (var5 > var6) { // L: 4372 - var7 = var6 * 65536 / var5; // L: 4373 - var8 = 32768; // L: 4374 - - while (true) { - if (var1 == var3) { // L: 4375 - break label167; - } - - if (var3 < var1) { - ++var3; // L: 4376 - } else if (var3 > var1) { // L: 4377 - --var3; - } - - if ((Tiles.Tiles_renderFlags[class90.Client_plane][var3][var4] & 4) != 0) { // L: 4378 - var0 = class90.Client_plane; - } - - var8 += var7; // L: 4379 - if (var8 >= 65536) { // L: 4380 - var8 -= 65536; // L: 4381 - if (var4 < var2) { // L: 4382 - ++var4; - } else if (var4 > var2) { // L: 4383 - --var4; - } - - if ((Tiles.Tiles_renderFlags[class90.Client_plane][var3][var4] & 4) != 0) { // L: 4384 - var0 = class90.Client_plane; - } - } - } - } else { - if (var6 > 0) { // L: 4388 - var7 = var5 * 65536 / var6; // L: 4389 - var8 = 32768; // L: 4390 - - while (var4 != var2) { // L: 4391 - if (var4 < var2) { // L: 4392 - ++var4; - } else if (var4 > var2) { // L: 4393 - --var4; - } - - if ((Tiles.Tiles_renderFlags[class90.Client_plane][var3][var4] & 4) != 0) { // L: 4394 - var0 = class90.Client_plane; - } - - var8 += var7; // L: 4395 - if (var8 >= 65536) { // L: 4396 - var8 -= 65536; // L: 4397 - if (var3 < var1) { // L: 4398 - ++var3; - } else if (var3 > var1) { // L: 4399 - --var3; - } - - if ((Tiles.Tiles_renderFlags[class90.Client_plane][var3][var4] & 4) != 0) { // L: 4400 - var0 = class90.Client_plane; - } - } - } - } - break label167; - } - } - - return class90.Client_plane; - } - - return class90.Client_plane; - } - } - - if (UserComparator9.localPlayer.x >= 0 && UserComparator9.localPlayer.y >= 0 && UserComparator9.localPlayer.x < 13312 && UserComparator9.localPlayer.y < 13312) { // L: 4405 - if ((Tiles.Tiles_renderFlags[class90.Client_plane][UserComparator9.localPlayer.x >> 7][UserComparator9.localPlayer.y >> 7] & 4) != 0) { // L: 4406 - var0 = class90.Client_plane; - } - - return var0; // L: 4407 - } else { - return class90.Client_plane; - } - } - } - - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "58" - ) - @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: 8016 - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { // L: 8017 - Client.mouseCrossX = var6; // L: 8621 - Client.mouseCrossY = var7; // L: 8622 - Client.mouseCrossColor = 2; // L: 8623 - Client.mouseCrossState = 0; // L: 8624 - Client.destinationX = var0; // L: 8625 - Client.destinationY = var1; // L: 8626 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); // L: 8628 - var8.packetBuffer.writeShortLE(KeyHandler.selectedItemId); // L: 8629 - var8.packetBuffer.method5725(var3); // L: 8630 - var8.packetBuffer.method5725(class195.selectedItemSlot); // L: 8631 - var8.packetBuffer.writeShortLE(NetCache.baseY + var1); // L: 8632 - var8.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8633 - var8.packetBuffer.writeIntME(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8634 - var8.packetBuffer.method5876(ClientPacket.selectedItemWidget); // L: 8635 - Client.packetWriter.addNode(var8); // L: 8636 - } else if (var2 == 2) { - Client.mouseCrossX = var6; // L: 8252 - Client.mouseCrossY = var7; // L: 8253 - Client.mouseCrossColor = 2; // L: 8254 - Client.mouseCrossState = 0; // L: 8255 - Client.destinationX = var0; // L: 8256 - Client.destinationY = var1; // L: 8257 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2309, Client.packetWriter.isaacCipher); // L: 8259 - var8.packetBuffer.method5883(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8260 - var8.packetBuffer.method5781(MidiPcmStream.selectedSpellWidget); // L: 8261 - var8.packetBuffer.writeIntME(var3); // L: 8262 - var8.packetBuffer.writeShort(NetCache.baseY + var1); // L: 8263 - var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); // L: 8264 - var8.packetBuffer.writeShortLE(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8265 - Client.packetWriter.addNode(var8); // L: 8266 - } else if (var2 == 3) { - Client.mouseCrossX = var6; // L: 8269 - Client.mouseCrossY = var7; // L: 8270 - Client.mouseCrossColor = 2; // L: 8271 - Client.mouseCrossState = 0; // L: 8272 - Client.destinationX = var0; // L: 8273 - Client.destinationY = var1; // L: 8274 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2323, Client.packetWriter.isaacCipher); // L: 8276 - var8.packetBuffer.method5725(NetCache.baseY + var1); // L: 8277 - var8.packetBuffer.method5725(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8278 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8279 - var8.packetBuffer.writeShort(var3); // L: 8280 - Client.packetWriter.addNode(var8); // L: 8281 - } else if (var2 == 4) { - Client.mouseCrossX = var6; // L: 8222 - Client.mouseCrossY = var7; // L: 8223 - Client.mouseCrossColor = 2; // L: 8224 - Client.mouseCrossState = 0; // L: 8225 - Client.destinationX = var0; // L: 8226 - Client.destinationY = var1; // L: 8227 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2307, Client.packetWriter.isaacCipher); // L: 8229 - var8.packetBuffer.method5725(NetCache.baseY + var1); // L: 8230 - var8.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8231 - var8.packetBuffer.writeShortLE(var3); // L: 8232 - var8.packetBuffer.writeShort(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8233 - Client.packetWriter.addNode(var8); // L: 8234 - } else if (var2 == 5) { - Client.mouseCrossX = var6; // L: 8549 - Client.mouseCrossY = var7; // L: 8550 - Client.mouseCrossColor = 2; // L: 8551 - Client.mouseCrossState = 0; // L: 8552 - Client.destinationX = var0; // L: 8553 - Client.destinationY = var1; // L: 8554 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 8556 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8557 - var8.packetBuffer.writeShortLE(var3); // L: 8558 - var8.packetBuffer.writeShortLE(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8559 - var8.packetBuffer.writeIntME(NetCache.baseY + var1); // L: 8560 - Client.packetWriter.addNode(var8); // L: 8561 - } else if (var2 == 6) { - Client.mouseCrossX = var6; // L: 8358 - Client.mouseCrossY = var7; // L: 8359 - Client.mouseCrossColor = 2; // L: 8360 - Client.mouseCrossState = 0; // L: 8361 - Client.destinationX = var0; // L: 8362 - Client.destinationY = var1; // L: 8363 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8365 - var8.packetBuffer.writeIntME(NetCache.baseY + var1); // L: 8366 - var8.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8367 - var8.packetBuffer.writeIntME(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8368 - var8.packetBuffer.writeIntME(var3); // L: 8369 - Client.packetWriter.addNode(var8); // L: 8370 - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; // L: 8058 - if (var13 != null) { // L: 8059 - Client.mouseCrossX = var6; // L: 8060 - Client.mouseCrossY = var7; // L: 8061 - Client.mouseCrossColor = 2; // L: 8062 - Client.mouseCrossState = 0; // L: 8063 - Client.destinationX = var0; // L: 8064 - Client.destinationY = var1; // L: 8065 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); // L: 8067 - var9.packetBuffer.method5781(ClientPacket.selectedItemWidget); // L: 8068 - var9.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8069 - var9.packetBuffer.writeShort(KeyHandler.selectedItemId); // L: 8070 - var9.packetBuffer.method5725(var3); // L: 8071 - var9.packetBuffer.writeShort(class195.selectedItemSlot); // L: 8072 - Client.packetWriter.addNode(var9); // L: 8073 - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; // L: 8077 - if (var13 != null) { // L: 8078 - Client.mouseCrossX = var6; // L: 8079 - Client.mouseCrossY = var7; // L: 8080 - Client.mouseCrossColor = 2; // L: 8081 - Client.mouseCrossState = 0; // L: 8082 - Client.destinationX = var0; // L: 8083 - Client.destinationY = var1; // L: 8084 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); // L: 8086 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8087 - var9.packetBuffer.writeIntME(var3); // L: 8088 - var9.packetBuffer.writeInt(MidiPcmStream.selectedSpellWidget); // L: 8089 - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8090 - Client.packetWriter.addNode(var9); // L: 8091 - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; // L: 8309 - if (var13 != null) { // L: 8310 - Client.mouseCrossX = var6; // L: 8311 - Client.mouseCrossY = var7; // L: 8312 - Client.mouseCrossColor = 2; // L: 8313 - Client.mouseCrossState = 0; // L: 8314 - Client.destinationX = var0; // L: 8315 - Client.destinationY = var1; // L: 8316 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); // L: 8318 - var9.packetBuffer.method5883(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8319 - var9.packetBuffer.method5725(var3); // L: 8320 - Client.packetWriter.addNode(var9); // L: 8321 - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; // L: 8179 - if (var13 != null) { // L: 8180 - Client.mouseCrossX = var6; // L: 8181 - Client.mouseCrossY = var7; // L: 8182 - Client.mouseCrossColor = 2; // L: 8183 - Client.mouseCrossState = 0; // L: 8184 - Client.destinationX = var0; // L: 8185 - Client.destinationY = var1; // L: 8186 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); // L: 8188 - var9.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8189 - var9.packetBuffer.writeShort(var3); // L: 8190 - Client.packetWriter.addNode(var9); // L: 8191 - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; // L: 8699 - if (var13 != null) { // L: 8700 - Client.mouseCrossX = var6; // L: 8701 - Client.mouseCrossY = var7; // L: 8702 - Client.mouseCrossColor = 2; // L: 8703 - Client.mouseCrossState = 0; // L: 8704 - Client.destinationX = var0; // L: 8705 - Client.destinationY = var1; // L: 8706 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); // L: 8708 - var9.packetBuffer.method5725(var3); // L: 8709 - var9.packetBuffer.method5883(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8710 - Client.packetWriter.addNode(var9); // L: 8711 - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; // L: 8342 - if (var13 != null) { // L: 8343 - Client.mouseCrossX = var6; // L: 8344 - Client.mouseCrossY = var7; // L: 8345 - Client.mouseCrossColor = 2; // L: 8346 - Client.mouseCrossState = 0; // L: 8347 - Client.destinationX = var0; // L: 8348 - Client.destinationY = var1; // L: 8349 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); // L: 8351 - var9.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8352 - var9.packetBuffer.method5725(var3); // L: 8353 - Client.packetWriter.addNode(var9); // L: 8354 - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; // L: 8533 - if (var13 != null) { // L: 8534 - Client.mouseCrossX = var6; // L: 8535 - Client.mouseCrossY = var7; // L: 8536 - Client.mouseCrossColor = 2; // L: 8537 - Client.mouseCrossState = 0; // L: 8538 - Client.destinationX = var0; // L: 8539 - Client.destinationY = var1; // L: 8540 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2312, Client.packetWriter.isaacCipher); // L: 8542 - var9.packetBuffer.writeIntME(var3); // L: 8543 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8544 - Client.packetWriter.addNode(var9); // L: 8545 - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; // L: 8469 - if (var15 != null) { // L: 8470 - Client.mouseCrossX = var6; // L: 8471 - Client.mouseCrossY = var7; // L: 8472 - Client.mouseCrossColor = 2; // L: 8473 - Client.mouseCrossState = 0; // L: 8474 - Client.destinationX = var0; // L: 8475 - Client.destinationY = var1; // L: 8476 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); // L: 8478 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8479 - var9.packetBuffer.method5876(ClientPacket.selectedItemWidget); // L: 8480 - var9.packetBuffer.method5725(class195.selectedItemSlot); // L: 8481 - var9.packetBuffer.writeShortLE(var3); // L: 8482 - var9.packetBuffer.writeShortLE(KeyHandler.selectedItemId); // L: 8483 - Client.packetWriter.addNode(var9); // L: 8484 - } - } else if (var2 == 15) { - var15 = Client.players[var3]; // L: 8161 - if (var15 != null) { // L: 8162 - Client.mouseCrossX = var6; // L: 8163 - Client.mouseCrossY = var7; // L: 8164 - Client.mouseCrossColor = 2; // L: 8165 - Client.mouseCrossState = 0; // L: 8166 - Client.destinationX = var0; // L: 8167 - Client.destinationY = var1; // L: 8168 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); // L: 8170 - var9.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8171 - var9.packetBuffer.writeIntME(var3); // L: 8172 - var9.packetBuffer.writeIntME(Client.selectedSpellChildIndex); // L: 8173 - var9.packetBuffer.method5876(MidiPcmStream.selectedSpellWidget); // L: 8174 - Client.packetWriter.addNode(var9); // L: 8175 - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; // L: 8116 - Client.mouseCrossY = var7; // L: 8117 - Client.mouseCrossColor = 2; // L: 8118 - Client.mouseCrossState = 0; // L: 8119 - Client.destinationX = var0; // L: 8120 - Client.destinationY = var1; // L: 8121 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); // L: 8123 - var8.packetBuffer.writeShortLE(var3); // L: 8124 - var8.packetBuffer.writeShort(KeyHandler.selectedItemId); // L: 8125 - var8.packetBuffer.writeShort(NetCache.baseY + var1); // L: 8126 - var8.packetBuffer.writeIntME(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8127 - var8.packetBuffer.method5883(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8128 - var8.packetBuffer.writeShort(class195.selectedItemSlot); // L: 8129 - var8.packetBuffer.method5876(ClientPacket.selectedItemWidget); // L: 8130 - Client.packetWriter.addNode(var8); // L: 8131 - } else if (var2 == 17) { - Client.mouseCrossX = var6; // L: 8325 - Client.mouseCrossY = var7; // L: 8326 - Client.mouseCrossColor = 2; // L: 8327 - Client.mouseCrossState = 0; // L: 8328 - Client.destinationX = var0; // L: 8329 - Client.destinationY = var1; // L: 8330 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); // L: 8332 - var8.packetBuffer.method5725(Client.selectedSpellChildIndex); // L: 8333 - var8.packetBuffer.method5736(MidiPcmStream.selectedSpellWidget); // L: 8334 - var8.packetBuffer.writeShortLE(var3); // L: 8335 - var8.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8336 - var8.packetBuffer.writeShort(NetCache.baseY + var1); // L: 8337 - var8.packetBuffer.writeShort(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8338 - Client.packetWriter.addNode(var8); // L: 8339 - } else if (var2 == 18) { - Client.mouseCrossX = var6; // L: 8684 - Client.mouseCrossY = var7; // L: 8685 - Client.mouseCrossColor = 2; // L: 8686 - Client.mouseCrossState = 0; // L: 8687 - Client.destinationX = var0; // L: 8688 - Client.destinationY = var1; // L: 8689 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); // L: 8691 - var8.packetBuffer.writeIntME(NetCache.baseY + var1); // L: 8692 - var8.packetBuffer.method5725(var3); // L: 8693 - var8.packetBuffer.writeShort(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8694 - var8.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8695 - Client.packetWriter.addNode(var8); // L: 8696 - } else if (var2 == 19) { - Client.mouseCrossX = var6; // L: 8387 - Client.mouseCrossY = var7; // L: 8388 - Client.mouseCrossColor = 2; // L: 8389 - Client.mouseCrossState = 0; // L: 8390 - Client.destinationX = var0; // L: 8391 - Client.destinationY = var1; // L: 8392 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); // L: 8394 - var8.packetBuffer.writeShortLE(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8395 - var8.packetBuffer.method5725(var3); // L: 8396 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8397 - var8.packetBuffer.writeShort(NetCache.baseY + var1); // L: 8398 - Client.packetWriter.addNode(var8); // L: 8399 - } else if (var2 == 20) { - Client.mouseCrossX = var6; // L: 8237 - Client.mouseCrossY = var7; // L: 8238 - Client.mouseCrossColor = 2; // L: 8239 - Client.mouseCrossState = 0; // L: 8240 - Client.destinationX = var0; // L: 8241 - Client.destinationY = var1; // L: 8242 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); // L: 8244 - var8.packetBuffer.writeShort(var3); // L: 8245 - var8.packetBuffer.writeShortLE(NetCache.baseY + var1); // L: 8246 - var8.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8247 - var8.packetBuffer.writeShortLE(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8248 - Client.packetWriter.addNode(var8); // L: 8249 - } else if (var2 == 21) { - Client.mouseCrossX = var6; // L: 8284 - Client.mouseCrossY = var7; // L: 8285 - Client.mouseCrossColor = 2; // L: 8286 - Client.mouseCrossState = 0; // L: 8287 - Client.destinationX = var0; // L: 8288 - Client.destinationY = var1; // L: 8289 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); // L: 8291 - var8.packetBuffer.writeShort(NetCache.baseY + var1); // L: 8292 - var8.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8293 - var8.packetBuffer.writeIntME(var3); // L: 8294 - var8.packetBuffer.method5725(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8295 - Client.packetWriter.addNode(var8); // L: 8296 - } else if (var2 == 22) { - Client.mouseCrossX = var6; // L: 8488 - Client.mouseCrossY = var7; // L: 8489 - Client.mouseCrossColor = 2; // L: 8490 - Client.mouseCrossState = 0; // L: 8491 - Client.destinationX = var0; // L: 8492 - Client.destinationY = var1; // L: 8493 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 8495 - var8.packetBuffer.writeShort(NetCache.baseY + var1); // L: 8496 - var8.packetBuffer.writeIntME(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8497 - var8.packetBuffer.writeShort(var3); // L: 8498 - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8499 - Client.packetWriter.addNode(var8); // L: 8500 - } else if (var2 == 23) { - if (Client.isMenuOpen) { // L: 8567 - MilliClock.scene.setViewportWalking(); // L: 8568 - } else { - MilliClock.scene.menuOpen(class90.Client_plane, var0, var1, true); // L: 8571 - } - } else { - PacketBufferNode var11; - Widget var16; - if (var2 == 24) { - var16 = class237.getWidget(var1); // L: 8758 - boolean var12 = true; // L: 8759 - if (var16.contentType > 0) { // L: 8760 - var12 = WorldMapLabelSize.method254(var16); - } - - if (var12) { // L: 8761 - var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); // L: 8763 - var11.packetBuffer.writeInt(var1); // L: 8764 - Client.packetWriter.addNode(var11); // L: 8765 - } - } else { - if (var2 == 25) { - var16 = ArchiveLoader.getWidgetChild(var1, var0); // L: 8148 - if (var16 != null) { // L: 8149 - WorldMapSection2.Widget_runOnTargetLeave(); // L: 8150 - ArchiveDisk.selectSpell(var1, var0, MusicPatch.Widget_unpackTargetMask(class60.getWidgetFlags(var16)), var16.itemId); // L: 8151 - Client.isItemSelected = 0; // L: 8152 - Client.selectedSpellActionName = Player.Widget_getSpellActionName(var16); // L: 8153 - if (Client.selectedSpellActionName == null) { // L: 8154 - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { // L: 8155 - Client.selectedSpellName = var16.dataText + FileSystem.colorStartTag(16777215); - } else { - Client.selectedSpellName = FileSystem.colorStartTag(65280) + var16.spellName + FileSystem.colorStartTag(16777215); // L: 8156 - } - } - - return; // L: 8158 - } - - if (var2 == 26) { - ModeWhere.method3878(); // L: 8564 - } else { - int var10; - Widget var14; - if (var2 == 28) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); // L: 8587 - var8.packetBuffer.writeInt(var1); // L: 8588 - Client.packetWriter.addNode(var8); // L: 8589 - var14 = class237.getWidget(var1); // L: 8590 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8591 - var10 = var14.cs1Instructions[0][1]; // L: 8592 - Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8593 - changeGameOptions(var10); // L: 8594 - } - } else if (var2 == 29) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); // L: 8797 - var8.packetBuffer.writeInt(var1); // L: 8798 - Client.packetWriter.addNode(var8); // L: 8799 - var14 = class237.getWidget(var1); // L: 8800 - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8801 - var10 = var14.cs1Instructions[0][1]; // L: 8802 - if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8803 - Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8804 - changeGameOptions(var10); // L: 8805 - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { // L: 8666 - class25.resumePauseWidget(var1, var0); // L: 8667 - Client.meslayerContinueWidget = ArchiveLoader.getWidgetChild(var1, var0); // L: 8668 - IsaacCipher.invalidateWidget(Client.meslayerContinueWidget); // L: 8669 - } - } else if (var2 == 31) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2330, Client.packetWriter.isaacCipher); // L: 8374 - var8.packetBuffer.method5781(ClientPacket.selectedItemWidget); // L: 8375 - var8.packetBuffer.writeShortLE(var0); // L: 8376 - var8.packetBuffer.writeShortLE(var3); // L: 8377 - var8.packetBuffer.writeIntME(KeyHandler.selectedItemId); // L: 8378 - var8.packetBuffer.writeShort(class195.selectedItemSlot); // L: 8379 - var8.packetBuffer.method5876(var1); // L: 8380 - Client.packetWriter.addNode(var8); // L: 8381 - Client.field770 = 0; // L: 8382 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8383 - Client.field931 = var0; // L: 8384 - } else if (var2 == 32) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); // L: 8441 - var8.packetBuffer.writeShortLE(var3); // L: 8442 - var8.packetBuffer.writeIntME(var0); // L: 8443 - var8.packetBuffer.method5876(MidiPcmStream.selectedSpellWidget); // L: 8444 - var8.packetBuffer.method5736(var1); // L: 8445 - var8.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); // L: 8446 - Client.packetWriter.addNode(var8); // L: 8447 - Client.field770 = 0; // L: 8448 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8449 - Client.field931 = var0; // L: 8450 - } else if (var2 == 33) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8656 - var8.packetBuffer.method5781(var1); // L: 8657 - var8.packetBuffer.writeShort(var3); // L: 8658 - var8.packetBuffer.writeShortLE(var0); // L: 8659 - Client.packetWriter.addNode(var8); // L: 8660 - Client.field770 = 0; // L: 8661 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8662 - Client.field931 = var0; // L: 8663 - } else if (var2 == 34) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); // L: 8403 - var8.packetBuffer.writeIntME(var3); // L: 8404 - var8.packetBuffer.writeIntME(var0); // L: 8405 - var8.packetBuffer.method5781(var1); // L: 8406 - Client.packetWriter.addNode(var8); // L: 8407 - Client.field770 = 0; // L: 8408 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8409 - Client.field931 = var0; // L: 8410 - } else if (var2 == 35) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2316, Client.packetWriter.isaacCipher); // L: 8019 - var8.packetBuffer.writeIntME(var0); // L: 8020 - var8.packetBuffer.writeInt(var1); // L: 8021 - var8.packetBuffer.writeShortLE(var3); // L: 8022 - Client.packetWriter.addNode(var8); // L: 8023 - Client.field770 = 0; // L: 8024 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8025 - Client.field931 = var0; // L: 8026 - } else if (var2 == 36) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); // L: 8770 - var8.packetBuffer.writeIntME(var0); // L: 8771 - var8.packetBuffer.method5725(var3); // L: 8772 - var8.packetBuffer.method5876(var1); // L: 8773 - Client.packetWriter.addNode(var8); // L: 8774 - Client.field770 = 0; // L: 8775 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8776 - Client.field931 = var0; // L: 8777 - } else if (var2 == 37) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); // L: 8430 - var8.packetBuffer.method5736(var1); // L: 8431 - var8.packetBuffer.writeShort(var3); // L: 8432 - var8.packetBuffer.writeIntME(var0); // L: 8433 - Client.packetWriter.addNode(var8); // L: 8434 - Client.field770 = 0; // L: 8435 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8436 - Client.field931 = var0; // L: 8437 - } else { - if (var2 == 38) { - WorldMapSection2.Widget_runOnTargetLeave(); // L: 8609 - var16 = class237.getWidget(var1); // L: 8610 - Client.isItemSelected = 1; // L: 8611 - class195.selectedItemSlot = var0; // L: 8612 - ClientPacket.selectedItemWidget = var1; // L: 8613 - KeyHandler.selectedItemId = var3; // L: 8614 - IsaacCipher.invalidateWidget(var16); // L: 8615 - Client.selectedItemName = FileSystem.colorStartTag(16748608) + class281.ItemDefinition_get(var3).name + FileSystem.colorStartTag(16777215); // L: 8616 - if (Client.selectedItemName == null) { // L: 8617 - Client.selectedItemName = "null"; - } - - return; // L: 8618 - } - - if (var2 == 39) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); // L: 8599 - var8.packetBuffer.writeShortLE(var3); // L: 8600 - var8.packetBuffer.writeShortLE(var0); // L: 8601 - var8.packetBuffer.method5876(var1); // L: 8602 - Client.packetWriter.addNode(var8); // L: 8603 - Client.field770 = 0; // L: 8604 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8605 - Client.field931 = var0; // L: 8606 - } else if (var2 == 40) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); // L: 8576 - var8.packetBuffer.writeInt(var1); // L: 8577 - var8.packetBuffer.method5725(var3); // L: 8578 - var8.packetBuffer.method5725(var0); // L: 8579 - Client.packetWriter.addNode(var8); // L: 8580 - Client.field770 = 0; // L: 8581 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8582 - Client.field931 = var0; // L: 8583 - } else if (var2 == 41) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); // L: 8674 - var8.packetBuffer.method5876(var1); // L: 8675 - var8.packetBuffer.writeIntME(var0); // L: 8676 - var8.packetBuffer.writeShort(var3); // L: 8677 - Client.packetWriter.addNode(var8); // L: 8678 - Client.field770 = 0; // L: 8679 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8680 - Client.field931 = var0; // L: 8681 - } else if (var2 == 42) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 8212 - var8.packetBuffer.method5725(var0); // L: 8213 - var8.packetBuffer.writeShort(var3); // L: 8214 - var8.packetBuffer.method5736(var1); // L: 8215 - Client.packetWriter.addNode(var8); // L: 8216 - Client.field770 = 0; // L: 8217 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8218 - Client.field931 = var0; // L: 8219 - } else if (var2 == 43) { - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); // L: 8138 - var8.packetBuffer.writeShortLE(var0); // L: 8139 - var8.packetBuffer.method5736(var1); // L: 8140 - var8.packetBuffer.writeShort(var3); // L: 8141 - Client.packetWriter.addNode(var8); // L: 8142 - Client.field770 = 0; // L: 8143 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8144 - Client.field931 = var0; // L: 8145 - } else if (var2 == 44) { - var15 = Client.players[var3]; // L: 8042 - if (var15 != null) { // L: 8043 - Client.mouseCrossX = var6; // L: 8044 - Client.mouseCrossY = var7; // L: 8045 - Client.mouseCrossColor = 2; // L: 8046 - Client.mouseCrossState = 0; // L: 8047 - Client.destinationX = var0; // L: 8048 - Client.destinationY = var1; // L: 8049 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 8051 - var9.packetBuffer.writeShortLE(var3); // L: 8052 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8053 - Client.packetWriter.addNode(var9); // L: 8054 - } - } else if (var2 == 45) { - var15 = Client.players[var3]; // L: 8503 - if (var15 != null) { // L: 8504 - Client.mouseCrossX = var6; // L: 8505 - Client.mouseCrossY = var7; // L: 8506 - Client.mouseCrossColor = 2; // L: 8507 - Client.mouseCrossState = 0; // L: 8508 - Client.destinationX = var0; // L: 8509 - Client.destinationY = var1; // L: 8510 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); // L: 8512 - var9.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8513 - var9.packetBuffer.writeShortLE(var3); // L: 8514 - Client.packetWriter.addNode(var9); // L: 8515 - } - } else if (var2 == 46) { - var15 = Client.players[var3]; // L: 8453 - if (var15 != null) { // L: 8454 - Client.mouseCrossX = var6; // L: 8455 - Client.mouseCrossY = var7; // L: 8456 - Client.mouseCrossColor = 2; // L: 8457 - Client.mouseCrossState = 0; // L: 8458 - Client.destinationX = var0; // L: 8459 - Client.destinationY = var1; // L: 8460 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); // L: 8462 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8463 - var9.packetBuffer.method5725(var3); // L: 8464 - Client.packetWriter.addNode(var9); // L: 8465 - } - } else if (var2 == 47) { - var15 = Client.players[var3]; // L: 8195 - if (var15 != null) { // L: 8196 - Client.mouseCrossX = var6; // L: 8197 - Client.mouseCrossY = var7; // L: 8198 - Client.mouseCrossColor = 2; // L: 8199 - Client.mouseCrossState = 0; // L: 8200 - Client.destinationX = var0; // L: 8201 - Client.destinationY = var1; // L: 8202 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 8204 - var9.packetBuffer.writeShortLE(var3); // L: 8205 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8206 - Client.packetWriter.addNode(var9); // L: 8207 - } - } else if (var2 == 48) { - var15 = Client.players[var3]; // L: 8639 - if (var15 != null) { // L: 8640 - Client.mouseCrossX = var6; // L: 8641 - Client.mouseCrossY = var7; // L: 8642 - Client.mouseCrossColor = 2; // L: 8643 - Client.mouseCrossState = 0; // L: 8644 - Client.destinationX = var0; // L: 8645 - Client.destinationY = var1; // L: 8646 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); // L: 8648 - var9.packetBuffer.method5725(var3); // L: 8649 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8650 - Client.packetWriter.addNode(var9); // L: 8651 - } - } else if (var2 == 49) { - var15 = Client.players[var3]; // L: 8780 - if (var15 != null) { // L: 8781 - Client.mouseCrossX = var6; // L: 8782 - Client.mouseCrossY = var7; // L: 8783 - Client.mouseCrossColor = 2; // L: 8784 - Client.mouseCrossState = 0; // L: 8785 - Client.destinationX = var0; // L: 8786 - Client.destinationY = var1; // L: 8787 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 8789 - var9.packetBuffer.writeShort(var3); // L: 8790 - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8791 - Client.packetWriter.addNode(var9); // L: 8792 - } - } else if (var2 == 50) { - var15 = Client.players[var3]; // L: 8413 - if (var15 != null) { // L: 8414 - Client.mouseCrossX = var6; // L: 8415 - Client.mouseCrossY = var7; // L: 8416 - Client.mouseCrossColor = 2; // L: 8417 - Client.mouseCrossState = 0; // L: 8418 - Client.destinationX = var0; // L: 8419 - Client.destinationY = var1; // L: 8420 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); // L: 8422 - var9.packetBuffer.method5883(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8423 - var9.packetBuffer.writeIntME(var3); // L: 8424 - Client.packetWriter.addNode(var9); // L: 8425 - } - } else if (var2 == 51) { - var15 = Client.players[var3]; // L: 8715 - if (var15 != null) { // L: 8716 - 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 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); // L: 8724 - var9.packetBuffer.method5931(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8725 - var9.packetBuffer.writeShortLE(var3); // L: 8726 - Client.packetWriter.addNode(var9); // L: 8727 - } - } else { - label637: { - if (var2 != 57) { - if (var2 == 58) { - var16 = ArchiveLoader.getWidgetChild(var1, var0); // L: 8519 - if (var16 != null) { // L: 8520 - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); // L: 8522 - var9.packetBuffer.writeInt(MidiPcmStream.selectedSpellWidget); // L: 8523 - var9.packetBuffer.writeIntME(var16.itemId); // L: 8524 - var9.packetBuffer.method5725(Client.field821); // L: 8525 - var9.packetBuffer.writeIntME(var0); // L: 8526 - var9.packetBuffer.method5876(var1); // L: 8527 - var9.packetBuffer.writeShortLE(Client.selectedSpellChildIndex); // L: 8528 - Client.packetWriter.addNode(var9); // L: 8529 - } - break label637; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; // L: 8101 - Client.mouseCrossY = var7; // L: 8102 - Client.mouseCrossColor = 2; // L: 8103 - Client.mouseCrossState = 0; // L: 8104 - Client.destinationX = var0; // L: 8105 - Client.destinationY = var1; // L: 8106 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); // L: 8108 - var8.packetBuffer.writeShortLE(var0 + GrandExchangeOfferNameComparator.baseX); // L: 8109 - var8.packetBuffer.writeIntME(var3); // L: 8110 - var8.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8111 - var8.packetBuffer.method5725(NetCache.baseY + var1); // L: 8112 - Client.packetWriter.addNode(var8); // L: 8113 - break label637; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; // L: 8299 - Client.mouseCrossY = var7; // L: 8300 - Client.mouseCrossColor = 2; // L: 8301 - Client.mouseCrossState = 0; // L: 8302 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); // L: 8304 - var8.packetBuffer.writeIntME(var3); // L: 8305 - Client.packetWriter.addNode(var8); // L: 8306 - break label637; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; // L: 8731 - Client.mouseCrossY = var7; // L: 8732 - Client.mouseCrossColor = 2; // L: 8733 - Client.mouseCrossState = 0; // L: 8734 - var13 = Client.npcs[var3]; // L: 8735 - if (var13 != null) { // L: 8736 - NPCComposition var17 = var13.definition; // L: 8737 - if (var17.transforms != null) { // L: 8738 - var17 = var17.transform(); - } - - if (var17 != null) { // L: 8739 - var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); // L: 8741 - var11.packetBuffer.writeShort(var17.id); // L: 8742 - Client.packetWriter.addNode(var11); // L: 8743 - } - } - break label637; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; // L: 8748 - Client.mouseCrossY = var7; // L: 8749 - Client.mouseCrossColor = 2; // L: 8750 - Client.mouseCrossState = 0; // L: 8751 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); // L: 8753 - var8.packetBuffer.method5725(var3); // L: 8754 - Client.packetWriter.addNode(var8); // L: 8755 - break label637; - } - - if (var2 == 1005) { - var16 = class237.getWidget(var1); // L: 8029 - if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8030 - AbstractWorldMapData.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class281.ItemDefinition_get(var3).name); - } else { - var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); // L: 8033 - var9.packetBuffer.method5725(var3); // L: 8034 - Client.packetWriter.addNode(var9); // L: 8035 - } - - Client.field770 = 0; // L: 8037 - WorldMapSprite.field260 = class237.getWidget(var1); // L: 8038 - Client.field931 = var0; // L: 8039 - break label637; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1010 || var2 == 1012 || var2 == 1008 || var2 == 1011) { - SoundSystem.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8134 - } - break label637; - } - } - - var16 = ArchiveLoader.getWidgetChild(var1, var0); // L: 8095 - if (var16 != null) { // L: 8096 - ApproximateRouteStrategy.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8097 - } - } - } - } - } + static void method3186() { + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 9022 + if (RouteStrategy.method2653(Client.menuOpcodes[var0])) { // L: 9023 + if (var0 < Client.menuOptionsCount - 1) { // L: 9024 + for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 9025 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 9026 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 9027 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 9028 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 9029 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 9030 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 9031 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 9032 } } + + --var0; // L: 9035 + --Client.menuOptionsCount; // L: 9036 } } - if (Client.isItemSelected != 0) { // L: 8809 - Client.isItemSelected = 0; // L: 8810 - IsaacCipher.invalidateWidget(class237.getWidget(ClientPacket.selectedItemWidget)); // L: 8811 - } - - if (Client.isSpellSelected) { // L: 8813 - WorldMapSection2.Widget_runOnTargetLeave(); - } - - if (WorldMapSprite.field260 != null && Client.field770 == 0) { // L: 8814 - IsaacCipher.invalidateWidget(WorldMapSprite.field260); - } - - } // L: 8815 - - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "24" - ) - static boolean method685(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9036 - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "90" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class219.method4171(); // L: 11124 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11126 - if (var1.obj != null) { // L: 11127 - var1.set(); - } - } - - int var3 = class204.VarpDefinition_get(var0).type; // L: 11130 - if (var3 != 0) { // L: 11131 - int var2 = Varps.Varps_main[var0]; // L: 11132 - if (var3 == 1) { // L: 11133 - if (var2 == 1) { // L: 11134 - Decimator.method2707(0.9D); - } - - if (var2 == 2) { // L: 11135 - Decimator.method2707(0.8D); - } - - if (var2 == 3) { // L: 11136 - Decimator.method2707(0.7D); - } - - if (var2 == 4) { // L: 11137 - Decimator.method2707(0.6D); - } - } - - if (var3 == 3) { // L: 11139 - if (var2 == 0) { // L: 11140 - class194.method3820(255); - } - - if (var2 == 1) { // L: 11141 - class194.method3820(192); - } - - if (var2 == 2) { // L: 11142 - class194.method3820(128); - } - - if (var2 == 3) { // L: 11143 - class194.method3820(64); - } - - if (var2 == 4) { // L: 11144 - class194.method3820(0); - } - } - - if (var3 == 4) { // L: 11146 - if (var2 == 0) { // L: 11147 - class171.updateSoundEffectVolume(127); - } - - if (var2 == 1) { // L: 11148 - class171.updateSoundEffectVolume(96); - } - - if (var2 == 2) { // L: 11149 - class171.updateSoundEffectVolume(64); - } - - if (var2 == 3) { // L: 11150 - class171.updateSoundEffectVolume(32); - } - - if (var2 == 4) { // L: 11151 - class171.updateSoundEffectVolume(0); - } - } - - if (var3 == 5) { // L: 11153 - Client.leftClickOpensMenu = var2; - } - - if (var3 == 6) { // L: 11154 - Client.chatEffects = var2; - } - - if (var3 == 9) { // L: 11155 - Client.field829 = var2; - } - - if (var3 == 10) { // L: 11156 - if (var2 == 0) { // L: 11157 - WorldMapData_1.method810(127); - } - - if (var2 == 1) { // L: 11158 - WorldMapData_1.method810(96); - } - - if (var2 == 2) { // L: 11159 - WorldMapData_1.method810(64); - } - - if (var2 == 3) { // L: 11160 - WorldMapData_1.method810(32); - } - - if (var2 == 4) { // L: 11161 - WorldMapData_1.method810(0); - } - } - - if (var3 == 17) { // L: 11163 - Client.followerIndex = var2 & 65535; // L: 11164 - } - - if (var3 == 18) { // L: 11166 - Client.playerAttackOption = (AttackOption)InterfaceParent.findEnumerated(ApproximateRouteStrategy.method1310(), var2); // L: 11167 - if (Client.playerAttackOption == null) { // L: 11168 - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var3 == 19) { // L: 11170 - if (var2 == -1) { // L: 11171 - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; // L: 11172 - } - } - - if (var3 == 22) { // L: 11174 - Client.npcAttackOption = (AttackOption)InterfaceParent.findEnumerated(ApproximateRouteStrategy.method1310(), var2); // L: 11175 - if (Client.npcAttackOption == null) { // L: 11176 - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } // L: 11178 -} \ No newline at end of file + SpriteMask.method4172(Player.menuWidth / 2 + class16.menuX, FontName.menuY); // L: 9040 + } // L: 9042 +} diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index cd77cb5408..b53e28ec45 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,29 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("ni") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("bt") - static String field4100; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("file") RandomAccessFile file; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -2650488931214741245L + longValue = 4897243031854950465L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = 961611975907817877L + longValue = 8129143810943449499L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (var3 == -1L) { // L: 11 + if (-1L == var3) { // L: 11 var3 = Long.MAX_VALUE; } @@ -51,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); // L: 23 } // L: 24 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); // L: 27 this.offset = var1; // L: 28 } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1425903826" + garbageValue = "-206730487" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -70,65 +68,65 @@ public final class AccessFile { this.file.write(1); // L: 34 throw new EOFException(); // L: 35 } else { - this.file.write(var1, var2, var3); // L: 37 - this.offset += (long)var3; // L: 38 + this.file.write(var1, var2, var3); + this.offset += (long)var3; } - } // L: 39 + } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-64" + descriptor = "(I)V", + garbageValue = "1330619520" ) @Export("close") public final void close() throws IOException { - this.closeSync(false); // L: 42 - } // L: 43 + this.closeSync(false); + } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-49" + descriptor = "(ZI)V", + garbageValue = "-696399409" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { - if (this.file != null) { // L: 46 - if (var1) { // L: 47 + if (this.file != null) { + if (var1) { try { - this.file.getFD().sync(); // L: 49 - } catch (SyncFailedException var3) { // L: 51 + this.file.getFD().sync(); + } catch (SyncFailedException var3) { } } - this.file.close(); // L: 53 - this.file = null; // L: 54 + this.file.close(); + this.file = null; } - } // L: 56 + } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "29" + descriptor = "(I)J", + garbageValue = "1218940771" ) @Export("length") public final long length() throws IOException { - return this.file.length(); // L: 59 + return this.file.length(); } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "425130802" + descriptor = "([BIIB)I", + garbageValue = "120" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); // L: 63 + int var4 = this.file.read(var1, var2, var3); if (var4 > 0) { - this.offset += (long)var4; // L: 64 + this.offset += (long)var4; } - return var4; // L: 65 + return var4; } protected void finalize() throws Throwable { @@ -138,4 +136,73 @@ public final class AccessFile { } } // L: 73 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnk;B)V", + garbageValue = "54" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = Varcs.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 - ItemLayer.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - Tile.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + class26.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1352[var1] != null) { // L: 50 + var2.read(Players.field1352[var1]); + } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1350[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + 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.field1350[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-696757994" + ) + static final void method6382() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 3975 3976 3983 + if (var0.plane == class26.Client_plane && !var0.isFinished) { // L: 3977 + if (Client.cycle >= var0.cycleStart) { // L: 3978 + var0.advance(Client.field799); // L: 3979 + if (var0.isFinished) { // L: 3980 + var0.remove(); + } else { + WorldMapArea.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 3981 + } + } + } else { + var0.remove(); + } + } + + } // L: 3985 } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 5fe0db774c..d90cd487b1 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -1,330 +1,323 @@ -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("cv") +@ObfuscatedName("cd") @Implements("Actor") public abstract class Actor extends Renderable { - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "[Lly;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 136172069 + intValue = 1068128585 ) @Export("x") int x; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1402910771 + intValue = 1496580437 ) @Export("y") int y; - @ObfuscatedName("aq") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1011628117 + intValue = -1434789983 ) @Export("rotation") int rotation; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("isWalking") boolean isWalking; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -477017185 + intValue = -211651151 ) - int field1007; - @ObfuscatedName("ax") + int field1258; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1508823583 + intValue = 1629185903 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1984168657 + intValue = -1638489447 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 845088399 + intValue = -1105812335 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1336726555 + intValue = -1459534643 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1451963771 + intValue = -197807279 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 2000722135 + intValue = 1105024071 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 207993293 + intValue = 910987067 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1423094315 + intValue = -943524147 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1748919145 + intValue = -2019858221 ) @Export("runSequence") int runSequence; - @ObfuscatedName("aj") + @ObfuscatedName("au") @Export("overheadText") String overheadText; - @ObfuscatedName("an") + @ObfuscatedName("ab") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ai") - boolean field968; - @ObfuscatedName("ab") + @ObfuscatedName("aa") + boolean field1208; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -263246735 + intValue = 1791931697 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1742046101 + intValue = -1625309775 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -815377649 + intValue = 1793952127 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("av") + @ObfuscatedName("ah") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bj") + @ObfuscatedName("bh") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bn") + @ObfuscatedName("br") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bi") + @ObfuscatedName("bn") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bp") + @ObfuscatedName("bi") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("br") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljc;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1403434087 + intValue = 421944119 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("false0") boolean false0; - @ObfuscatedName("bc") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1507873993 + intValue = -877553659 ) - int field981; - @ObfuscatedName("bw") + int field1237; + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -203452431 + intValue = -1958333453 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bv") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1749828811 + intValue = 1237612855 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bt") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1321307133 + intValue = 950039177 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bl") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1530341969 + intValue = -1061585055 ) @Export("sequence") int sequence; - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1363131469 + intValue = -692137845 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 2014778209 + intValue = 830949033 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bg") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1060389691 + intValue = -1415641635 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bm") - @ObfuscatedGetter( - intValue = 1582636697 - ) - int field973; @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1271026177 + intValue = 334019467 + ) + int field1245; + @ObfuscatedName("bc") + @ObfuscatedGetter( + intValue = -946982677 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -416499547 + intValue = 1701654947 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1172946753 + intValue = 1718225643 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("by") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 1898700159 + intValue = 708623357 ) - int field993; - @ObfuscatedName("bb") + int field1249; + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -2097471137 + intValue = 375803761 ) - int field994; - @ObfuscatedName("bd") + int field1238; + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1384002081 + intValue = -1376238069 ) - int field992; - @ObfuscatedName("ba") + int field1240; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -2137511937 + intValue = -1384218543 ) - int field996; - @ObfuscatedName("bk") - @ObfuscatedGetter( - intValue = -2030426109 - ) - int field952; + int field1252; @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -593176361 + intValue = 1368903785 ) - int field998; - @ObfuscatedName("bo") + int field1253; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 798187101 + intValue = 1912998321 ) - int field999; - @ObfuscatedName("cv") + int field1239; + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 145719275 + intValue = -1793257471 ) - int field1000; - @ObfuscatedName("cd") + int field1255; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 423082639 + intValue = -836085199 ) - int field1001; - @ObfuscatedName("cq") + int field1268; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -724191925 + intValue = 1011086267 + ) + int field1213; + @ObfuscatedName("co") + @ObfuscatedGetter( + intValue = -966578099 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cb") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -250505211 + intValue = 890714575 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cf") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 373581305 + intValue = -1457707769 ) @Export("orientation") int orientation; - @ObfuscatedName("cp") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -1380674587 + intValue = -551796625 ) - int field957; - @ObfuscatedName("ck") + int field1261; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1991830867 + intValue = -1810654447 ) - int field1006; - @ObfuscatedName("cn") + int field1262; + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 1201240635 + intValue = -1223856599 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cj") + @ObfuscatedName("cc") @Export("pathX") int[] pathX; - @ObfuscatedName("cr") + @ObfuscatedName("cn") @Export("pathY") int[] pathY; @ObfuscatedName("ca") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cz") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 349923111 + intValue = -570005291 ) - int field989; - @ObfuscatedName("cs") + int field1267; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -1293926575 + intValue = -1192220791 ) - int field1012; + int field1224; Actor() { this.isWalking = false; // L: 13 - this.field1007 = 1; // L: 14 + this.field1258 = 1; // L: 14 this.idleSequence = -1; // L: 16 this.turnLeftSequence = -1; // L: 17 this.turnRightSequence = -1; // L: 18 @@ -334,7 +327,7 @@ public abstract class Actor extends Renderable { this.walkRightSequence = -1; // L: 22 this.runSequence = -1; // L: 23 this.overheadText = null; // L: 24 - this.field968 = false; // L: 26 + this.field1208 = false; // L: 26 this.overheadTextCyclesRemaining = 100; // L: 27 this.overheadTextColor = 0; // L: 28 this.overheadTextEffect = 0; // L: 29 @@ -347,54 +340,54 @@ public abstract class Actor extends Renderable { this.healthBars = new IterableNodeDeque(); // L: 37 this.targetIndex = -1; // L: 38 this.false0 = false; // L: 39 - this.field981 = -1; // L: 40 + this.field1237 = -1; // L: 40 this.movementSequence = -1; // L: 41 - this.movementFrame = 0; + this.movementFrame = 0; // L: 42 this.movementFrameCycle = 0; // L: 43 - this.sequence = -1; - this.sequenceFrame = 0; - this.sequenceFrameCycle = 0; - this.sequenceDelay = 0; - this.field973 = 0; // L: 48 + this.sequence = -1; // L: 44 + this.sequenceFrame = 0; // L: 45 + this.sequenceFrameCycle = 0; // L: 46 + this.sequenceDelay = 0; // L: 47 + this.field1245 = 0; // L: 48 this.spotAnimation = -1; // L: 49 this.spotAnimationFrame = 0; // L: 50 - this.spotAnimationFrameCycle = 0; + this.spotAnimationFrameCycle = 0; // L: 51 this.npcCycle = 0; // L: 61 this.defaultHeight = 200; // L: 62 - this.field957 = 0; // L: 64 - this.field1006 = 32; // L: 65 + this.field1261 = 0; // L: 64 + this.field1262 = 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.field989 = 0; // L: 70 - this.field1012 = 0; // L: 71 + this.field1267 = 0; // L: 70 + this.field1224 = 0; // L: 71 } // L: 73 - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-251916247" + descriptor = "(B)Z", + garbageValue = "-3" ) @Export("isVisible") boolean isVisible() { return false; // L: 81 } - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1387787360" - ) - final void method1848() { - this.pathLength = 0; // L: 76 - this.field1012 = 0; // L: 77 - } // L: 78 - @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "104" + descriptor = "(B)V", + garbageValue = "20" + ) + final void method2157() { + this.pathLength = 0; // L: 76 + this.field1224 = 0; // L: 77 + } // L: 78 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "-186188203" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -414,9 +407,9 @@ public abstract class Actor extends Renderable { int var10 = -1; // L: 92 int var11 = 0; // L: 93 if (var1 >= 0) { // L: 94 - HitSplatDefinition var12 = ScriptFrame.method1222(var1); // L: 95 - var10 = var12.field3375; // L: 96 - var11 = var12.field3364; // L: 97 + HitSplatDefinition var12 = StudioGame.method4391(var1); // L: 95 + var10 = var12.field3586; // L: 96 + var11 = var12.field3581; // L: 97 } int var14; @@ -472,10 +465,10 @@ public abstract class Actor extends Renderable { } } // L: 138 - @ObfuscatedName("av") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "0" + descriptor = "(IIIIIII)V", + garbageValue = "1980321202" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -503,7 +496,7 @@ public abstract class Actor extends Renderable { HealthBar var13; for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { // L: 159 ++var12; // L: 160 - if (var13.definition.field3312 == var8.field3312) { // L: 161 + if (var13.definition.field3445 == var8.field3445) { // L: 161 var13.put(var2 + var4, var5, var6, var3); // L: 162 return; // L: 163 } @@ -534,10 +527,10 @@ public abstract class Actor extends Renderable { } } // L: 177 - @ObfuscatedName("ao") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "24" + descriptor = "(II)V", + garbageValue = "-1124408084" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { @@ -567,60 +560,35 @@ public abstract class Actor extends Renderable { } // L: 200 - @ObfuscatedName("n") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "424984717" + garbageValue = "1120048289" ) - public static void method1867(boolean var0) { - if (class297.NetCache_socket != null) { // L: 42 - try { - Buffer var1 = new Buffer(4); // L: 44 - var1.writeByte(var0 ? 2 : 3); // L: 45 - var1.writeMedium(0); // L: 46 - class297.NetCache_socket.write(var1.array, 0, 4); // L: 47 - } catch (IOException var4) { - try { - class297.NetCache_socket.close(); // L: 51 - } catch (Exception var3) { // L: 53 - } - - ++NetCache.NetCache_ioExceptions; // L: 54 - class297.NetCache_socket = null; // L: 55 - } - + public static void method2173(boolean var0) { + if (var0 != class21.ItemDefinition_inMembersWorld) { // L: 582 + WorldMapLabelSize.method2678(); // L: 583 + class21.ItemDefinition_inMembersWorld = var0; // L: 584 } - } // L: 57 - @ObfuscatedName("fu") + } // L: 586 + + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1068788857" + descriptor = "(B)Lmr;", + garbageValue = "14" ) - static final void method1868() { - int[] var0 = Players.Players_indices; // L: 3449 + @Export("getWorldMap") + static WorldMap getWorldMap() { + return UserComparator4.worldMap; // L: 683 + } - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3450 - Player var4 = Client.players[var0[var1]]; // L: 3451 - if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3452 - --var4.overheadTextCyclesRemaining; // L: 3453 - if (var4.overheadTextCyclesRemaining == 0) { // L: 3454 - var4.overheadText = null; - } - } - } - - for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3457 - int var2 = Client.npcIndices[var1]; // L: 3458 - NPC var3 = Client.npcs[var2]; // L: 3459 - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3460 - --var3.overheadTextCyclesRemaining; // L: 3461 - if (var3.overheadTextCyclesRemaining == 0) { // L: 3462 - var3.overheadText = null; - } - } - } - - } // L: 3465 + @ObfuscatedName("ki") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "19847" + ) + static void method2174(int var0) { + Client.oculusOrbState = var0; // L: 11696 + } // L: 11697 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index e36cc5efe6..c3db516e53 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -3,51 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("ft") @Implements("Animation") public class Animation { - @ObfuscatedName("n") - static int[] field1655; - @ObfuscatedName("v") - static int[] field1650; - @ObfuscatedName("d") - static int[] field1651; - @ObfuscatedName("c") - static int[] field1652; - @ObfuscatedName("y") + @ObfuscatedName("f") + static int[] field1869; + @ObfuscatedName("o") + static int[] field1863; + @ObfuscatedName("u") + static int[] field1868; + @ObfuscatedName("p") + static int[] field1862; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lev;" + descriptor = "Lfa;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("transformCount") int transformCount; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("transformXs") int[] transformXs; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("transformYs") int[] transformYs; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("transformZs") int[] transformZs; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1655 = new int[500]; // L: 8 - field1650 = new int[500]; // L: 9 - field1651 = new int[500]; // L: 10 - field1652 = new int[500]; // L: 11 + field1869 = new int[500]; // L: 8 + field1863 = new int[500]; // L: 9 + field1868 = new int[500]; // L: 10 + field1862 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLev;)V" + descriptor = "([BLfa;)V" ) Animation(byte[] var1, Skeleton var2) { this.skeleton = null; // L: 12 @@ -69,38 +69,38 @@ public class Animation { if (this.skeleton.transformTypes[var8] != 0) { // L: 32 for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 if (this.skeleton.transformTypes[var10] == 0) { // L: 34 - field1655[var7] = var10; // L: 35 - field1650[var7] = 0; // L: 36 - field1651[var7] = 0; // L: 37 - field1652[var7] = 0; // L: 38 + field1869[var7] = var10; // L: 35 + field1863[var7] = 0; // L: 36 + field1868[var7] = 0; // L: 37 + field1862[var7] = 0; // L: 38 ++var7; // L: 39 break; } } } - field1655[var7] = var8; // L: 44 + field1869[var7] = var8; // L: 44 short var11 = 0; // L: 45 if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } if ((var9 & 1) != 0) { // L: 47 - field1650[var7] = var4.readShortSmart(); + field1863[var7] = var4.readShortSmart(); } else { - field1650[var7] = var11; // L: 48 + field1863[var7] = var11; // L: 48 } if ((var9 & 2) != 0) { // L: 49 - field1651[var7] = var4.readShortSmart(); + field1868[var7] = var4.readShortSmart(); } else { - field1651[var7] = var11; // L: 50 + field1868[var7] = var11; // L: 50 } if ((var9 & 4) != 0) { // L: 51 - field1652[var7] = var4.readShortSmart(); + field1862[var7] = var4.readShortSmart(); } else { - field1652[var7] = var11; // L: 52 + field1862[var7] = var11; // L: 52 } var6 = var8; // L: 53 @@ -121,10 +121,10 @@ public class Animation { this.transformZs = new int[var7]; // L: 65 for (var8 = 0; var8 < var7; ++var8) { // L: 66 - this.transformSkeletonLabels[var8] = field1655[var8]; // L: 67 - this.transformXs[var8] = field1650[var8]; // L: 68 - this.transformYs[var8] = field1651[var8]; // L: 69 - this.transformZs[var8] = field1652[var8]; // L: 70 + this.transformSkeletonLabels[var8] = field1869[var8]; // L: 67 + this.transformXs[var8] = field1863[var8]; // L: 68 + this.transformYs[var8] = field1868[var8]; // L: 69 + this.transformZs[var8] = field1862[var8]; // L: 70 } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 8c58520ebe..1fa4b60684 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -3,424 +3,85 @@ 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("ba") +@ObfuscatedName("bm") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("iv") - @ObfuscatedGetter( - intValue = -1513110219 + @ObfuscatedName("qv") + @ObfuscatedSignature( + descriptor = "Lbh;" ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("ls") + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("rf") @ObfuscatedGetter( - intValue = 318238525 + intValue = 1645607617 ) - @Export("menuX") - static int menuX; + static int field592; ApproximateRouteStrategy() { - } // L: 11728 + } // L: 11800 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIILfe;I)Z", - garbageValue = "1148121553" + descriptor = "(IIILel;I)Z", + garbageValue = "120127354" ) @Export("hasArrived") public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11731 + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11803 } - @ObfuscatedName("n") - @Export("sleepExact") - public static final void sleepExact(long var0) { - if (var0 > 0L) { // L: 9 - if (0L == var0 % 10L) { // L: 10 - long var2 = var0 - 1L; // L: 11 + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "56" + ) + public static void method1205() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94 + } // L: 95 - try { - Thread.sleep(var2); // L: 14 - } catch (InterruptedException var8) { // L: 16 - } - - try { - Thread.sleep(1L); // L: 20 - } catch (InterruptedException var7) { // L: 22 - } - } else { - try { - Thread.sleep(var0); // L: 27 - } catch (InterruptedException var6) { // L: 29 - } + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lhu;I[B[BI)V", + garbageValue = "-358433365" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2699 == null) { // L: 963 + if (var2 == null) { // L: 964 + return; // L: 970 } + var0.field2699 = new byte[11][]; // L: 965 + var0.field2747 = new byte[11][]; // L: 966 + var0.field2701 = new int[11]; // L: 967 + var0.field2692 = new int[11]; // L: 968 } - } // L: 31 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Lci;", - garbageValue = "-915685508" - ) - static AttackOption[] method1310() { - return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels}; // L: 11682 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Lly;", - garbageValue = "-1904582422" - ) - public static IndexedSprite method1304() { - IndexedSprite var0 = new IndexedSprite(); // L: 151 - var0.width = class336.SpriteBuffer_spriteWidth; // L: 152 - var0.height = class336.SpriteBuffer_spriteHeight; // L: 153 - var0.xOffset = class105.SpriteBuffer_xOffsets[0]; // L: 154 - var0.yOffset = class336.SpriteBuffer_yOffsets[0]; // L: 155 - var0.subWidth = class336.SpriteBuffer_spriteWidths[0]; // L: 156 - var0.subHeight = class225.SpriteBuffer_spriteHeights[0]; // L: 157 - var0.palette = HorizontalAlignment.SpriteBuffer_spritePalette; // L: 158 - var0.pixels = class2.SpriteBuffer_pixels[0]; // L: 159 - class105.SpriteBuffer_xOffsets = null; // L: 161 - class336.SpriteBuffer_yOffsets = null; // L: 162 - class336.SpriteBuffer_spriteWidths = null; // L: 163 - class225.SpriteBuffer_spriteHeights = null; // L: 164 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 165 - class2.SpriteBuffer_pixels = null; // L: 166 - return var0; // L: 168 - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "-109" - ) - static int method1313(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1737 - Interpreter.Interpreter_intStackSize -= 3; // L: 1738 - class58.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); // L: 1739 - return 1; // L: 1740 - } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1742 - AbstractSocket.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1743 - return 1; // L: 1744 - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1746 - Interpreter.Interpreter_intStackSize -= 2; // L: 1747 - NPC.method2180(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1748 - return 1; // L: 1749 + var0.field2699[var1] = var2; // L: 972 + if (var2 != null) { + var0.field2698 = true; // L: 973 } else { - int var3; - if (var0 == 3203) { // L: 1751 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); // L: 1752 - class194.method3820(Math.round(2.55F * (float)var3)); // L: 1753 - return 1; // L: 1754 - } else if (var0 == 3204) { // L: 1756 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.round((float)WorldMapSectionType.clientPreferences.musicVolume / 2.55F); // L: 1757 - return 1; // L: 1758 - } else if (var0 == 3205) { // L: 1760 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); // L: 1761 - class171.updateSoundEffectVolume(Math.round(1.27F * (float)var3)); // L: 1762 - return 1; // L: 1763 - } else if (var0 == 3206) { // L: 1765 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.round((float)WorldMapSectionType.clientPreferences.soundEffectsVolume / 1.27F); // L: 1766 - return 1; // L: 1767 - } else if (var0 == 3207) { // L: 1769 - var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); // L: 1770 - WorldMapData_1.method810(Math.round((float)var3 * 1.27F)); // L: 1771 - return 1; // L: 1772 - } else if (var0 == 3208) { // L: 1774 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Math.round((float)WorldMapSectionType.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1775 - return 1; // L: 1776 - } else { - return 2; // L: 1778 - } - } - } + var0.field2698 = false; // L: 975 - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "-107" - ) - static int method1315(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3281 - Interpreter.Interpreter_intStackSize -= 2; // L: 3282 - Client.field779 = (short)Canvas.method935(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); // L: 3283 - if (Client.field779 <= 0) { // L: 3284 - Client.field779 = 256; - } - - Client.field913 = (short)Canvas.method935(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3285 - if (Client.field913 <= 0) { // L: 3286 - Client.field913 = 256; - } - - return 1; // L: 3287 - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3289 - Interpreter.Interpreter_intStackSize -= 2; // L: 3290 - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3291 - if (Client.zoomHeight <= 0) { // L: 3292 - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3293 - if (Client.zoomWidth <= 0) { // L: 3294 - Client.zoomWidth = 320; - } - - return 1; // L: 3295 - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3297 - Interpreter.Interpreter_intStackSize -= 4; // L: 3298 - Client.field916 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3299 - if (Client.field916 <= 0) { // L: 3300 - Client.field916 = 1; - } - - Client.field690 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3301 - if (Client.field690 <= 0) { // L: 3302 - Client.field690 = 32767; - } else if (Client.field690 < Client.field916) { // L: 3303 - Client.field690 = Client.field916; - } - - Client.field918 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3304 - if (Client.field918 <= 0) { // L: 3305 - Client.field918 = 1; - } - - Client.field846 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3306 - if (Client.field846 <= 0) { // L: 3307 - Client.field846 = 32767; - } else if (Client.field846 < Client.field918) { // L: 3308 - Client.field846 = Client.field918; - } - - return 1; // L: 3309 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3311 - if (Client.viewportWidget != null) { // L: 3312 - MenuAction.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3313 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3314 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3315 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3318 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3319 - } - - return 1; // L: 3321 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3323 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3324 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3325 - return 1; // L: 3326 - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3328 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FileSystem.method3709(Client.field779); // L: 3329 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FileSystem.method3709(Client.field913); // L: 3330 - return 1; // L: 3331 - } else if (var0 == 6220) { // L: 3333 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3334 - return 1; // L: 3335 - } else if (var0 == 6221) { // L: 3337 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3338 - return 1; // L: 3339 - } else if (var0 == 6222) { // L: 3341 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; // L: 3342 - return 1; // L: 3343 - } else if (var0 == 6223) { // L: 3345 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class25.canvasHeight; // L: 3346 - return 1; // L: 3347 - } else { - return 2; // L: 3349 - } - } - - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1969316699" - ) - public static int method1314(String var0) { - return var0.length() + 2; // L: 130 - } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;B)V", - garbageValue = "45" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = ArchiveLoader.getWidgetChild(var1, var2); // L: 8898 - if (var5 != null) { // L: 8899 - if (var5.onOp != null) { // L: 8900 - ScriptEvent var6 = new ScriptEvent(); // L: 8901 - var6.widget = var5; // L: 8902 - var6.opIndex = var0; // L: 8903 - var6.targetName = var4; // L: 8904 - var6.args = var5.onOp; // L: 8905 - PacketWriter.runScriptEvent(var6); // L: 8906 - } - - boolean var8 = true; // L: 8908 - if (var5.contentType > 0) { // L: 8909 - var8 = WorldMapLabelSize.method254(var5); - } - - if (var8) { // L: 8910 - if (MidiPcmStream.method3972(class60.getWidgetFlags(var5), var0 - 1)) { // L: 8911 - PacketBufferNode var7; - if (var0 == 1) { // L: 8914 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); // L: 8916 - var7.packetBuffer.writeInt(var1); // L: 8917 - var7.packetBuffer.writeShort(var2); // L: 8918 - var7.packetBuffer.writeShort(var3); // L: 8919 - Client.packetWriter.addNode(var7); // L: 8920 - } - - if (var0 == 2) { // L: 8922 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); // L: 8924 - var7.packetBuffer.writeInt(var1); // L: 8925 - var7.packetBuffer.writeShort(var2); // L: 8926 - var7.packetBuffer.writeShort(var3); // L: 8927 - Client.packetWriter.addNode(var7); // L: 8928 - } - - if (var0 == 3) { // L: 8930 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); // L: 8932 - var7.packetBuffer.writeInt(var1); // L: 8933 - var7.packetBuffer.writeShort(var2); // L: 8934 - var7.packetBuffer.writeShort(var3); // L: 8935 - Client.packetWriter.addNode(var7); // L: 8936 - } - - if (var0 == 4) { // L: 8938 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); // L: 8940 - var7.packetBuffer.writeInt(var1); // L: 8941 - var7.packetBuffer.writeShort(var2); // L: 8942 - var7.packetBuffer.writeShort(var3); // L: 8943 - Client.packetWriter.addNode(var7); // L: 8944 - } - - if (var0 == 5) { // L: 8946 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); // L: 8948 - var7.packetBuffer.writeInt(var1); // L: 8949 - var7.packetBuffer.writeShort(var2); // L: 8950 - var7.packetBuffer.writeShort(var3); // L: 8951 - Client.packetWriter.addNode(var7); // L: 8952 - } - - if (var0 == 6) { // L: 8954 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); // L: 8956 - var7.packetBuffer.writeInt(var1); // L: 8957 - var7.packetBuffer.writeShort(var2); // L: 8958 - var7.packetBuffer.writeShort(var3); // L: 8959 - Client.packetWriter.addNode(var7); // L: 8960 - } - - if (var0 == 7) { // L: 8962 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); // L: 8964 - var7.packetBuffer.writeInt(var1); // L: 8965 - var7.packetBuffer.writeShort(var2); // L: 8966 - var7.packetBuffer.writeShort(var3); // L: 8967 - Client.packetWriter.addNode(var7); // L: 8968 - } - - if (var0 == 8) { // L: 8970 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2328, Client.packetWriter.isaacCipher); // L: 8972 - var7.packetBuffer.writeInt(var1); // L: 8973 - var7.packetBuffer.writeShort(var2); // L: 8974 - var7.packetBuffer.writeShort(var3); // L: 8975 - Client.packetWriter.addNode(var7); // L: 8976 - } - - if (var0 == 9) { // L: 8978 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); // L: 8980 - var7.packetBuffer.writeInt(var1); // L: 8981 - var7.packetBuffer.writeShort(var2); // L: 8982 - var7.packetBuffer.writeShort(var3); // L: 8983 - Client.packetWriter.addNode(var7); // L: 8984 - } - - if (var0 == 10) { // L: 8986 - var7 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); // L: 8988 - var7.packetBuffer.writeInt(var1); // L: 8989 - var7.packetBuffer.writeShort(var2); // L: 8990 - var7.packetBuffer.writeShort(var3); // L: 8991 - Client.packetWriter.addNode(var7); // L: 8992 - } - - } - } - } - } // L: 8912 8994 - - @ObfuscatedName("jt") - @ObfuscatedSignature( - descriptor = "([Lhz;II)V", - garbageValue = "-1753877400" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11032 - Widget var3 = var0[var2]; // L: 11033 - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !DevicePcmPlayerProvider.isComponentHidden(var3))) { // L: 11034 11035 11036 - int var5; - if (var3.type == 0) { // L: 11037 - if (!var3.isIf3 && DevicePcmPlayerProvider.isComponentHidden(var3) && var3 != Canvas.mousedOverWidgetIf1) { // L: 11038 - continue; - } - - drawModelComponents(var0, var3.id); // L: 11039 - if (var3.children != null) { // L: 11040 - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11041 - if (var4 != null) { // L: 11042 - var5 = var4.group; // L: 11043 - if (WorldMapCacheName.loadInterface(var5)) { // L: 11045 - drawModelComponents(DefaultsGroup.Widget_interfaceComponents[var5], -1); // L: 11046 - } - } - } - - if (var3.type == 6) { // L: 11050 - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11051 - boolean var7 = GrandExchangeOfferWorldComparator.runCs1(var3); // L: 11052 - if (var7) { // L: 11054 - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; // L: 11055 - } - - if (var5 != -1) { // L: 11056 - SequenceDefinition var6 = InterfaceParent.SequenceDefinition_get(var5); // L: 11057 - - for (var3.modelFrameCycle += Client.field808; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; IsaacCipher.invalidateWidget(var3)) { // L: 11058 11059 11066 - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11060 - ++var3.modelFrame; // L: 11061 - if (var3.modelFrame >= var6.frameIds.length) { // L: 11062 - var3.modelFrame -= var6.frameCount; // L: 11063 - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11064 - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field2649 != 0 && !var3.isIf3) { // L: 11070 - int var8 = var3.field2649 >> 16; // L: 11071 - var5 = var3.field2649 << 16 >> 16; // L: 11072 - var8 *= Client.field808; // L: 11073 - var5 *= Client.field808; // L: 11074 - var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11075 - var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11076 - IsaacCipher.invalidateWidget(var3); // L: 11077 - } + for (int var4 = 0; var4 < var0.field2699.length; ++var4) { // L: 976 + if (var0.field2699[var4] != null) { // L: 977 + var0.field2698 = true; // L: 978 + break; } } } - } // L: 11081 -} \ No newline at end of file + var0.field2747[var1] = var3; // L: 983 + } // L: 984 + + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-61" + ) + static boolean method1206() { + return (Client.drawPlayerNames & 2) != 0; // L: 4058 + } +} diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 65069a416d..9d3038ad78 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,449 +5,453 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("ig") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("ag") + @ObfuscatedName("h") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("m") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("r") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 985029217 + intValue = -1506133489 ) @Export("index") int index; - @ObfuscatedName("j") - volatile boolean field3192; - @ObfuscatedName("ay") - boolean field3196; - @ObfuscatedName("am") + @ObfuscatedName("e") + volatile boolean field3250; + @ObfuscatedName("k") + boolean field3251; + @ObfuscatedName("g") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ae") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1841826013 + intValue = -1275315877 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("ac") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 650586757 + intValue = -474512255 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("aq") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 292662723 + intValue = 1416389537 ) - int field3200; + int field3256; static { Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Llu;Llu;IZZZ)V" + descriptor = "(Llp;Llp;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); // L: 23 - this.field3192 = false; // L: 14 - this.field3196 = false; // L: 15 - this.field3200 = -1; // L: 20 + this.field3250 = false; // L: 14 + this.field3251 = false; // L: 15 + this.field3256 = -1; // L: 20 this.archiveDisk = var1; // L: 24 this.masterDisk = var2; // L: 25 this.index = var3; // L: 26 - this.field3196 = var6; // L: 27 - int var8 = this.index; // L: 29 - if (SoundSystem.NetCache_reference != null) { // L: 31 - SoundSystem.NetCache_reference.offset = var8 * 8 + 5; // L: 32 - int var9 = SoundSystem.NetCache_reference.readInt(); // L: 33 - int var10 = SoundSystem.NetCache_reference.readInt(); // L: 34 - this.loadIndex(var9, var10); // L: 35 - } else { - WorldMapSectionType.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 38 - NetCache.NetCache_archives[var8] = this; // L: 39 - } + this.field3251 = var6; // L: 27 + CollisionMap.method2622(this, this.index); // L: 28 + } // L: 29 - } // L: 41 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "31242" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - AttackOption.method2202(this.index, var1); // L: 66 - } // L: 67 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-693356446" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { // L: 256 - return 100; - } else if (this.validGroups[var1]) { // L: 257 - return 100; - } else { - int var3 = this.index; // L: 259 - long var4 = (long)((var3 << 16) + var1); // L: 261 - int var2; - if (SecureRandomCallable.NetCache_currentResponse != null && var4 == SecureRandomCallable.NetCache_currentResponse.key) { // L: 262 - var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - SecureRandomCallable.NetCache_currentResponse.padding) + 1; // L: 266 - } else { - var2 = 0; // L: 263 - } - - return var2; // L: 268 - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1209383303" - ) - @Export("loadGroup") - void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 70 - ArchiveDisk var2 = this.archiveDisk; // L: 71 - byte[] var4 = null; // L: 74 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 75 - for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 76 - if ((long)var1 == var6.key && var2 == var6.archiveDisk && var6.type == 0) { // L: 77 - var4 = var6.data; // L: 78 - break; // L: 79 - } - } - } - - if (var4 != null) { // L: 83 - this.load(var2, var1, var4, true); // L: 84 - } else { - byte[] var5 = var2.read(var1); // L: 87 - this.load(var2, var1, var5, true); // L: 88 - } - } else { - WorldMapSectionType.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 91 - } - - } // L: 92 - - @ObfuscatedName("co") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1775407691" + garbageValue = "-1118403482" ) - public boolean method4461() { - return this.field3192; // L: 44 + public boolean method4430() { + return this.field3250; // L: 32 } - @ObfuscatedName("cx") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "6696" + descriptor = "(I)I", + garbageValue = "-1911280804" ) @Export("percentage") public int percentage() { - if (this.field3192) { // L: 48 + if (this.field3250) { // L: 36 return 100; - } else if (super.groups != null) { // L: 49 + } else if (super.groups != null) { // L: 37 return 99; } else { - int var2 = this.index; // L: 51 - long var3 = (long)(var2 + 16711680); // L: 53 - int var1; - if (SecureRandomCallable.NetCache_currentResponse != null && var3 == SecureRandomCallable.NetCache_currentResponse.key) { // L: 54 - var1 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - SecureRandomCallable.NetCache_currentResponse.padding) + 1; // L: 58 - } else { - var1 = 0; // L: 55 + int var1 = class22.method328(255, this.index); // L: 38 + if (var1 >= 100) { // L: 39 + var1 = 99; } - int var5 = var1; // L: 60 - if (var1 >= 100) { // L: 61 - var5 = 99; - } - - return var5; // L: 62 + return var1; // L: 40 } } - @ObfuscatedName("cg") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "968295804" + ) + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + int var2 = this.index; // L: 44 + long var3 = (long)((var2 << 16) + var1); // L: 46 + NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 47 + if (var5 != null) { // L: 48 + NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 49 + } + + } // L: 51 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1985410743" + ) + @Export("loadGroup") + void loadGroup(int var1) { + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 54 + ArchiveDisk var2 = this.archiveDisk; // L: 55 + byte[] var4 = null; // L: 58 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 59 + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 60 + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 61 + var4 = var6.data; // L: 62 + break; // L: 63 + } + } + } + + if (var4 != null) { // L: 67 + this.load(var2, var1, var4, true); // L: 68 + } else { + byte[] var5 = var2.read(var1); // L: 71 + this.load(var2, var1, var5, true); // L: 72 + } + } else { + Canvas.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 75 + } + + } // L: 76 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "232168908" ) @Export("loadIndex") - public void loadIndex(int var1, int var2) { - this.indexCrc = var1; // L: 95 - this.indexVersion = var2; // L: 96 - if (this.masterDisk != null) { // L: 97 - int var3 = this.index; // L: 98 - ArchiveDisk var4 = this.masterDisk; // L: 99 - byte[] var6 = null; // L: 102 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 103 - for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 104 - if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 105 - var6 = var8.data; // L: 106 - break; // L: 107 + void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 79 + this.indexVersion = var2; // L: 80 + if (this.masterDisk != null) { // L: 81 + int var3 = this.index; // L: 82 + ArchiveDisk var4 = this.masterDisk; // L: 83 + byte[] var6 = null; // L: 86 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 87 + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 88 + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 89 + var6 = var8.data; // L: 90 + break; // L: 91 } } } - if (var6 != null) { // L: 111 - this.load(var4, var3, var6, true); // L: 112 + if (var6 != null) { // L: 95 + this.load(var4, var3, var6, true); // L: 96 } else { - byte[] var7 = var4.read(var3); // L: 115 - this.load(var4, var3, var7, true); // L: 116 + byte[] var7 = var4.read(var3); // L: 99 + this.load(var4, var3, var7, true); // L: 100 } } else { - WorldMapSectionType.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 119 + Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 103 } - } // L: 120 + } // L: 104 - @ObfuscatedName("ch") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I[BZZI)V", - garbageValue = "1626411173" + garbageValue = "-1098415366" ) @Export("write") - public void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { // L: 123 - if (this.field3192) { // L: 124 - throw new RuntimeException(); // L: 125 + void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 107 + if (this.field3250) { // L: 108 + throw new RuntimeException(); // L: 109 } - if (this.masterDisk != null) { // L: 127 - int var5 = this.index; // L: 128 - ArchiveDisk var6 = this.masterDisk; // L: 129 - ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 131 - var7.type = 0; // L: 132 - var7.key = (long)var5; // L: 133 - var7.data = var2; // L: 134 - var7.archiveDisk = var6; // L: 135 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 136 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 137 - } // L: 138 - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 140 - if (ArchiveDiskActionHandler.field3187 == 0) { // L: 141 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 142 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 143 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 144 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 145 - } - - ArchiveDiskActionHandler.field3187 = 600; // L: 147 - } + if (this.masterDisk != null) { // L: 111 + SoundSystem.method872(this.index, var2, this.masterDisk); } - this.decodeIndex(var2); // L: 152 - this.loadAllLocal(); // L: 153 + this.decodeIndex(var2); // L: 112 + this.loadAllLocal(); // L: 113 } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 156 - var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 157 - if (this.archiveDisk != null) { // L: 158 - ArchiveDisk var13 = this.archiveDisk; // L: 159 - ArchiveDiskAction var18 = new ArchiveDiskAction(); // L: 161 - var18.type = 0; // L: 162 - var18.key = (long)var1; // L: 163 - var18.data = var2; // L: 164 - var18.archiveDisk = var13; // L: 165 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 166 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var18); // L: 167 - } // L: 168 - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 170 - if (ArchiveDiskActionHandler.field3187 == 0) { // L: 171 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 172 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 173 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 174 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 175 - } - - ArchiveDiskActionHandler.field3187 = 600; // L: 177 - } - - this.validGroups[var1] = true; // L: 181 + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 116 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 117 + if (this.archiveDisk != null) { // L: 118 + SoundSystem.method872(var1, var2, this.archiveDisk); // L: 119 + this.validGroups[var1] = true; // L: 120 } - if (var4) { // L: 183 - super.groups[var1] = class92.method2195(var2, false); + if (var4) { // L: 122 + Object[] var5 = super.groups; // L: 123 + Object var7; + if (var2 == null) { // L: 127 + var7 = null; // L: 128 + } else if (var2.length > 136) { // L: 131 + DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 133 + var8.set(var2); // L: 134 + var7 = var8; // L: 135 + } else { + var7 = var2; // L: 140 + } + + var5[var1] = var7; // L: 142 } } - } // L: 185 + } // L: 145 - @ObfuscatedName("cl") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Llu;I[BZI)V", - garbageValue = "-2146867560" + descriptor = "(Llp;I[BZI)V", + garbageValue = "1126674323" ) @Export("load") public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.masterDisk) { // L: 188 - if (this.field3192) { // L: 189 - throw new RuntimeException(); // L: 190 + if (var1 == this.masterDisk) { // L: 148 + if (this.field3250) { // L: 149 + throw new RuntimeException(); // L: 150 } - if (var3 == null) { // L: 192 - WorldMapSectionType.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 193 - return; // L: 194 + if (var3 == null) { // L: 152 + Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 153 + return; // L: 154 } - Archive_crc.reset(); // L: 196 - Archive_crc.update(var3, 0, var3.length); // L: 197 - var5 = (int)Archive_crc.getValue(); // L: 198 - if (var5 != this.indexCrc) { // L: 199 - WorldMapSectionType.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 200 - return; // L: 201 + Archive_crc.reset(); // L: 156 + Archive_crc.update(var3, 0, var3.length); // L: 157 + var5 = (int)Archive_crc.getValue(); // L: 158 + if (var5 != this.indexCrc) { // L: 159 + Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 160 + return; // L: 161 } - Buffer var9 = new Buffer(WorldMapDecorationType.decompressBytes(var3)); // L: 203 - int var7 = var9.readUnsignedByte(); // L: 204 - if (var7 != 5 && var7 != 6) { // L: 205 - throw new RuntimeException(var7 + "," + this.index + "," + var2); + Buffer var11 = new Buffer(class238.decompressBytes(var3)); // L: 163 + int var12 = var11.readUnsignedByte(); // L: 164 + if (var12 != 5 && var12 != 6) { // L: 165 + throw new RuntimeException(var12 + "," + this.index + "," + var2); } - int var8 = 0; // L: 206 - if (var7 >= 6) { // L: 207 - var8 = var9.readInt(); + int var8 = 0; // L: 166 + if (var12 >= 6) { // L: 167 + var8 = var11.readInt(); } - if (var8 != this.indexVersion) { // L: 208 - WorldMapSectionType.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 209 - return; // L: 210 + if (var8 != this.indexVersion) { // L: 168 + Canvas.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 169 + return; // L: 170 } - this.decodeIndex(var3); // L: 212 - this.loadAllLocal(); // L: 213 + this.decodeIndex(var3); // L: 172 + this.loadAllLocal(); // L: 173 } else { - if (!var4 && var2 == this.field3200) { // L: 216 - this.field3192 = true; // L: 217 + if (!var4 && var2 == this.field3256) { // L: 176 + this.field3250 = true; // L: 177 } - if (var3 == null || var3.length <= 2) { // L: 219 - this.validGroups[var2] = false; // L: 220 - if (this.field3196 || var4) { // L: 221 - WorldMapSectionType.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (var3 == null || var3.length <= 2) { // L: 179 + this.validGroups[var2] = false; // L: 180 + if (this.field3251 || var4) { // L: 181 + Canvas.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; // L: 222 + return; // L: 182 } - Archive_crc.reset(); // L: 224 - Archive_crc.update(var3, 0, var3.length - 2); // L: 225 - var5 = (int)Archive_crc.getValue(); // L: 226 - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 227 - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 228 - this.validGroups[var2] = false; // L: 229 - if (this.field3196 || var4) { // L: 230 - WorldMapSectionType.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + Archive_crc.reset(); // L: 184 + Archive_crc.update(var3, 0, var3.length - 2); // L: 185 + var5 = (int)Archive_crc.getValue(); // L: 186 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 187 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 188 + this.validGroups[var2] = false; // L: 189 + if (this.field3251 || var4) { + Canvas.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); // L: 190 } - return; // L: 231 + return; // L: 191 } - this.validGroups[var2] = true; // L: 233 - if (var4) { // L: 234 - super.groups[var2] = class92.method2195(var3, false); + this.validGroups[var2] = true; // L: 193 + if (var4) { // L: 194 + Object[] var7 = super.groups; // L: 195 + Object var9; + if (var3 == null) { // L: 199 + var9 = null; // L: 200 + } else if (var3.length > 136) { // L: 203 + DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 205 + var10.set(var3); // L: 206 + var9 = var10; // L: 207 + } else { + var9 = var3; // L: 212 + } + + var7[var2] = var9; // L: 214 } } - } // L: 236 + } // L: 217 - @ObfuscatedName("cw") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1754503913" + garbageValue = "29991317" ) @Export("loadAllLocal") void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; // L: 239 + this.validGroups = new boolean[super.groups.length]; // L: 220 int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 240 + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 221 this.validGroups[var1] = false; } - if (this.archiveDisk == null) { // L: 241 - this.field3192 = true; // L: 242 + if (this.archiveDisk == null) { // L: 222 + this.field3250 = true; // L: 223 } else { - this.field3200 = -1; // L: 245 + this.field3256 = -1; // L: 226 - for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 246 - if (super.fileCounts[var1] > 0) { // L: 247 - Tiles.method1218(var1, this.archiveDisk, this); // L: 248 - this.field3200 = var1; // L: 249 + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 227 + if (super.fileCounts[var1] > 0) { // L: 228 + class5.method85(var1, this.archiveDisk, this); // L: 229 + this.field3256 = var1; // L: 230 } } - if (this.field3200 == -1) { // L: 252 - this.field3192 = true; + if (this.field3256 == -1) { // L: 233 + this.field3250 = true; } } - } // L: 243 253 + } // L: 224 234 - @ObfuscatedName("ct") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-321850782" + descriptor = "(IB)I", + garbageValue = "-13" ) - public boolean method4470(int var1) { - return this.validGroups[var1]; // L: 272 + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + if (super.groups[var1] != null) { // L: 237 + return 100; + } else if (this.validGroups[var1]) { // L: 238 + return 100; + } else { + int var3 = this.index; // L: 240 + long var4 = (long)((var3 << 16) + var1); // L: 242 + int var2; + if (class208.NetCache_currentResponse != null && class208.NetCache_currentResponse.key == var4) { // L: 243 + var2 = InterfaceParent.NetCache_responseArchiveBuffer.offset * 99 / (InterfaceParent.NetCache_responseArchiveBuffer.array.length - class208.NetCache_currentResponse.padding) + 1; // L: 247 + } else { + var2 = 0; // L: 244 + } + + return var2; // L: 249 + } } - @ObfuscatedName("dx") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "106266787" + descriptor = "(IB)Z", + garbageValue = "-8" ) - public boolean method4471(int var1) { - return this.getGroupFileIds(var1) != null; // L: 276 + public boolean method4458(int var1) { + return this.validGroups[var1]; // L: 253 } - @ObfuscatedName("do") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2024354781" + descriptor = "(II)Z", + garbageValue = "1999926301" + ) + public boolean method4440(int var1) { + return this.getGroupFileIds(var1) != null; // L: 257 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "99" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; // L: 280 - int var2 = 0; // L: 281 + int var1 = 0; // L: 261 + int var2 = 0; // L: 262 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 282 - if (super.fileCounts[var3] > 0) { // L: 283 - var1 += 100; // L: 284 - var2 += this.groupLoadPercent(var3); // L: 285 + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 263 + if (super.fileCounts[var3] > 0) { // L: 264 + var1 += 100; // L: 265 + var2 += this.groupLoadPercent(var3); // L: 266 } } - if (var1 == 0) { // L: 288 + if (var1 == 0) { // L: 269 return 100; } else { - var3 = var2 * 100 / var1; // L: 289 - return var3; // L: 290 + var3 = var2 * 100 / var1; // L: 270 + return var3; // L: 271 } } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "32" + ) + static final void method4471(int var0) { + if (class15.loadInterface(var0)) { // L: 11096 + class208.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 11097 + } + } // L: 11098 + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1450702687" + ) + static final void method4470() { + PacketBufferNode var0 = ObjectComposition.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 11289 + Client.packetWriter.addNode(var0); // L: 11290 + + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11291 + if (var1.type == 0 || var1.type == 3) { // L: 11292 + WorldMapData_1.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { // L: 11294 + class29.invalidateWidget(Client.meslayerContinueWidget); // L: 11295 + Client.meslayerContinueWidget = null; // L: 11296 + } + + } // L: 11298 } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index c795d418b0..0b2efaabd7 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lp") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lnx;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lnx;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1046439635 + intValue = -1194337577 ) @Export("archive") int archive; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 189362565 + intValue = -408389509 ) @Export("maxEntrySize") int maxEntrySize; @@ -42,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - descriptor = "(ILme;Lme;I)V" + descriptor = "(ILnx;Lnx;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; // L: 8 @@ -54,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; // L: 17 } // L: 18 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "-776815620" + garbageValue = "1172328957" ) @Export("read") public byte[] read(int var1) { @@ -81,8 +81,9 @@ public final class ArchiveDisk { } else { byte[] var5 = new byte[var3]; // L: 30 int var6 = 0; // L: 31 + int var7 = 0; // L: 32 - for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65 + while (var6 < var3) { // L: 33 if (var4 == 0) { // L: 34 var10000 = null; return (byte[])var10000; @@ -119,23 +120,25 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 + if (var9 == var1 && var7 == var10 && var12 == this.archive) { // L: 60 + if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { // L: 61 + int var14 = var13 + var8; // L: 62 + + for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; // L: 64 + ++var7; // L: 65 + continue; // L: 66 + } + var10000 = null; return (byte[])var10000; } - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 - var10000 = null; - return (byte[])var10000; - } - - int var14 = var8 + var13; // L: 62 - - for (int var15 = var13; var15 < var14; ++var15) { // L: 63 - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; // L: 64 + var10000 = null; + return (byte[])var10000; } byte[] var20 = var5; @@ -148,10 +151,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I[BIB)Z", - garbageValue = "119" + descriptor = "(I[BII)Z", + garbageValue = "-537526275" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -169,10 +172,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I[BIZI)Z", - garbageValue = "-559665246" + garbageValue = "2088199623" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -213,7 +216,7 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { // L: 111 - label169: { + label168: { int var9 = 0; // L: 112 int var10; if (var4) { // L: 113 @@ -224,7 +227,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 } catch (EOFException var17) { // L: 122 - break label169; // L: 123 + break label168; // L: 123 } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 @@ -235,7 +238,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 } catch (EOFException var16) { // L: 134 - break label169; // L: 135 + break label168; // L: 135 } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 @@ -333,27 +336,4 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; // L: 198 } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1245945625" - ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = ArchiveLoader.getWidgetChild(var0, var1); // L: 8861 - if (var4 != null && var4.onTargetEnter != null) { // L: 8862 - ScriptEvent var5 = new ScriptEvent(); // L: 8863 - var5.widget = var4; // L: 8864 - var5.args = var4.onTargetEnter; // L: 8865 - PacketWriter.runScriptEvent(var5); // L: 8866 - } - - Client.field821 = var3; // L: 8868 - Client.isSpellSelected = true; // L: 8869 - MidiPcmStream.selectedSpellWidget = var0; // L: 8870 - Client.selectedSpellChildIndex = var1; // L: 8871 - GrandExchangeOfferNameComparator.selectedSpellFlags = var2; // L: 8872 - IsaacCipher.invalidateWidget(var4); // L: 8873 - } // L: 8874 } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 71bda63c88..3b4ceaf1ba 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,27 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("if") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 543287365 + intValue = 21153019 ) @Export("type") int type; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("data") public byte[] data; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llp;" ) @Export("archiveDisk") public ArchiveDisk archiveDisk; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Lig;" ) @Export("archive") public Archive archive; @@ -32,12 +32,21 @@ public class ArchiveDiskAction extends Node { ArchiveDiskAction() { } // L: 12 - @ObfuscatedName("gx") + @ObfuscatedName("fv") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "126" + descriptor = "(IIII)V", + garbageValue = "-2035889570" ) - static boolean method4359() { - return (Client.drawPlayerNames & 8) != 0; // L: 4422 - } + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Login.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3082 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3083 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3084 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3085 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3086 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3087 + ++Client.soundEffectCount; // L: 3088 + } + + } // L: 3090 } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index ed21666552..b243ac97d5 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,37 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("ia") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("ArchiveDiskActionHandler_requestQueue") public static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("ArchiveDiskActionHandler_responseQueue") public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1788680015 + intValue = 458683291 ) - public static int field3187; - @ObfuscatedName("c") + public static int field3239; + @ObfuscatedName("p") @Export("ArchiveDiskActionHandler_lock") public static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("ArchiveDiskActionHandler_thread") static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("rightTitleSprite") + static SpritePixels rightTitleSprite; + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("headIconPrayerSprites") + static SpritePixels[] headIconPrayerSprites; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 - field3187 = 0; // L: 11 + field3239 = 0; // L: 11 ArchiveDiskActionHandler_lock = new Object(); } // L: 12 @@ -45,47 +57,47 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 43 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 44 - } // L: 45 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 57 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 58 + } // L: 59 - if (var1 != null) { // L: 46 - if (var1.type == 0) { // L: 47 - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 48 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 49 - var1.remove(); // L: 50 - } // L: 51 - } else if (var1.type == 1) { // L: 53 - var1.data = var1.archiveDisk.read((int)var1.key); // L: 54 - synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 55 - ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 56 - } // L: 57 + if (var1 != null) { // L: 60 + if (var1.type == 0) { // L: 61 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 62 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 63 + var1.remove(); // L: 64 + } // L: 65 + } else if (var1.type == 1) { // L: 67 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 68 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 69 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 70 + } // L: 71 } - synchronized(ArchiveDiskActionHandler_lock) { // L: 59 - if (field3187 <= 1) { // L: 60 - field3187 = 0; // L: 61 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 62 - return; // L: 63 + synchronized(ArchiveDiskActionHandler_lock) { // L: 73 + if (field3239 <= 1) { // L: 74 + field3239 = 0; // L: 75 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 76 + return; // L: 77 } - field3187 = 600; // L: 65 + field3239 = 600; // L: 79 } } else { - ApproximateRouteStrategy.sleepExact(100L); // L: 69 - synchronized(ArchiveDiskActionHandler_lock) { // L: 70 - if (field3187 <= 1) { // L: 71 - field3187 = 0; // L: 72 - ArchiveDiskActionHandler_lock.notifyAll(); // L: 73 - return; // L: 74 + GrandExchangeEvent.sleepExact(100L); // L: 83 + synchronized(ArchiveDiskActionHandler_lock) { // L: 84 + if (field3239 <= 1) { // L: 85 + field3239 = 0; // L: 86 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 87 + return; // L: 88 } - --field3187; // L: 76 + --field3239; // L: 90 } } } - } catch (Exception var13) { // L: 81 - SequenceDefinition.RunException_sendStackTrace((String)null, var13); // L: 82 + } catch (Exception var13) { // L: 95 + class223.RunException_sendStackTrace((String)null, var13); // L: 96 } - } // L: 84 + } // L: 98 } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index b9e44c599c..f22b1989fd 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -4,48 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("ck") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("pq") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("en") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("hn") - @ObfuscatedGetter( - intValue = -1907995143 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Lig;" ) @Export("archive") final Archive archive; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 265251349 + intValue = 1980734893 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 134465937 + intValue = -429442875 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Liy;Ljava/lang/String;)V" + descriptor = "(Lig;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; // L: 9 @@ -53,17 +35,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); // L: 13 } // L: 14 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "979008130" + garbageValue = "-2006264172" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; // L: 17 for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 - if (!this.archive.method4471(var1) || this.archive.method4470(var1)) { + if (!this.archive.method4440(var1) || this.archive.method4458(var1)) { ++this.loadedCount; // L: 19 } } @@ -71,35 +53,37 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; // L: 21 } - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)Lhz;", - garbageValue = "-326621995" + descriptor = "(I)Low;", + garbageValue = "-237450232" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = class237.getWidget(var0); // L: 205 - if (var1 == -1) { // L: 206 - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 207 208 - } + static IndexedSprite method2076() { + IndexedSprite var0 = new IndexedSprite(); // L: 203 + var0.width = class395.SpriteBuffer_spriteWidth; // L: 204 + var0.height = class395.SpriteBuffer_spriteHeight; // L: 205 + var0.xOffset = class0.SpriteBuffer_xOffsets[0]; // L: 206 + var0.yOffset = Interpreter.SpriteBuffer_yOffsets[0]; // L: 207 + var0.subWidth = class395.SpriteBuffer_spriteWidths[0]; // L: 208 + var0.subHeight = class157.SpriteBuffer_spriteHeights[0]; // L: 209 + var0.palette = Varps.SpriteBuffer_spritePalette; // L: 210 + var0.pixels = class223.SpriteBuffer_pixels[0]; // L: 211 + WorldMapDecorationType.method4370(); // L: 212 + return var0; // L: 213 } - @ObfuscatedName("l") + @ObfuscatedName("ke") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "2065603382" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-231921181" ) - static final int method1237(int var0, int var1) { - int var2 = class60.method972(var0 + 45365, 91923 + var1, 4) - 128 + (class60.method972(10294 + var0, var1 + 37821, 2) - 128 >> 1) + (class60.method972(var0, var1, 1) - 128 >> 2); // L: 514 - var2 = (int)(0.3D * (double)var2) + 35; // L: 515 - if (var2 < 10) { // L: 516 - var2 = 10; - } else if (var2 > 60) { // L: 517 - var2 = 60; + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 11522 + PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 11524 + var1.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var0)); // L: 11525 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11526 + Client.packetWriter.addNode(var1); // L: 11527 } - - return var2; // L: 518 - } + } // L: 11528 } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 5202f9c0d4..248a09f237 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -3,80 +3,292 @@ 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("ci") +@ObfuscatedName("dy") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldy;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldy;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldy;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldy;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lli;" - ) - static Bounds field1190; - @ObfuscatedName("y") + @ObfuscatedName("rs") @ObfuscatedGetter( - intValue = 1405127233 + intValue = -267672571 + ) + static int field1339; + @ObfuscatedName("ew") + @ObfuscatedGetter( + intValue = 834403033 + ) + @Export("worldPort") + static int worldPort; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 741396013 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; // L: 11686 - } // L: 11687 + this.id = var3; // L: 11758 + } // L: 11759 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 11690 + return this.id; // L: 11762 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "966870433" + ) + static int method2260(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 605 + Widget var3; + if (var0 >= 2000) { // L: 606 + var0 -= 1000; // L: 607 + var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 608 + var3 = class139.getWidget(var4); // L: 609 + } else { + var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 611 + } + + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 612 + class16.Interpreter_intStackSize -= 2; // L: 613 + var3.scrollX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 614 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 615 + var3.scrollX = var3.scrollWidth - var3.width; + } + + if (var3.scrollX < 0) { // L: 616 + var3.scrollX = 0; + } + + var3.scrollY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 617 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 618 + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { // L: 619 + var3.scrollY = 0; + } + + class29.invalidateWidget(var3); // L: 620 + return 1; // L: 621 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 623 + var3.color = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 624 + class29.invalidateWidget(var3); // L: 625 + return 1; // L: 626 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 628 + var3.fill = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 629 + class29.invalidateWidget(var3); // L: 630 + return 1; // L: 631 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 633 + var3.transparencyTop = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 634 + class29.invalidateWidget(var3); // L: 635 + return 1; // L: 636 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 638 + var3.lineWid = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 639 + class29.invalidateWidget(var3); // L: 640 + return 1; // L: 641 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 643 + var3.spriteId2 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 644 + class29.invalidateWidget(var3); // L: 645 + return 1; // L: 646 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 648 + var3.spriteAngle = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 649 + class29.invalidateWidget(var3); // L: 650 + return 1; // L: 651 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 653 + var3.spriteTiling = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 654 + class29.invalidateWidget(var3); // L: 655 + return 1; // L: 656 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 658 + var3.modelType = 1; // L: 659 + var3.modelId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 660 + class29.invalidateWidget(var3); // L: 661 + return 1; // L: 662 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 664 + class16.Interpreter_intStackSize -= 6; // L: 665 + var3.modelOffsetX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 666 + var3.modelOffsetY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 667 + var3.modelAngleX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 668 + var3.modelAngleY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 669 + var3.modelAngleZ = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 4]; // L: 670 + var3.modelZoom = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 5]; // L: 671 + class29.invalidateWidget(var3); // L: 672 + return 1; // L: 673 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 675 + var8 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 676 + if (var8 != var3.sequenceId) { // L: 677 + var3.sequenceId = var8; // L: 678 + var3.modelFrame = 0; // L: 679 + var3.modelFrameCycle = 0; // L: 680 + class29.invalidateWidget(var3); // L: 681 + } + + return 1; // L: 683 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 685 + var3.modelOrthog = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 686 + class29.invalidateWidget(var3); // L: 687 + return 1; // L: 688 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 690 + String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 691 + if (!var7.equals(var3.text)) { // L: 692 + var3.text = var7; // L: 693 + class29.invalidateWidget(var3); // L: 694 + } + + return 1; // L: 696 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 698 + var3.fontId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 699 + class29.invalidateWidget(var3); // L: 700 + return 1; // L: 701 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 703 + class16.Interpreter_intStackSize -= 3; // L: 704 + var3.textXAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 705 + var3.textYAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 706 + var3.textLineHeight = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 707 + class29.invalidateWidget(var3); // L: 708 + return 1; // L: 709 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 711 + var3.textShadowed = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 712 + class29.invalidateWidget(var3); // L: 713 + return 1; // L: 714 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 716 + var3.outline = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 717 + class29.invalidateWidget(var3); // L: 718 + return 1; // L: 719 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 721 + var3.spriteShadow = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 722 + class29.invalidateWidget(var3); // L: 723 + return 1; // L: 724 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 726 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 727 + class29.invalidateWidget(var3); // L: 728 + return 1; // L: 729 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 731 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 732 + class29.invalidateWidget(var3); // L: 733 + return 1; // L: 734 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 736 + class16.Interpreter_intStackSize -= 2; // L: 737 + var3.scrollWidth = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 738 + var3.scrollHeight = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 739 + class29.invalidateWidget(var3); // L: 740 + if (var4 != -1 && var3.type == 0) { // L: 741 + UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 742 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 744 + class43.resumePauseWidget(var3.id, var3.childIndex); // L: 745 + Client.meslayerContinueWidget = var3; // L: 746 + class29.invalidateWidget(var3); // L: 747 + return 1; // L: 748 + } else if (var0 == 1122) { // L: 750 + var3.spriteId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 751 + class29.invalidateWidget(var3); // L: 752 + return 1; // L: 753 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 755 + var3.color2 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 756 + class29.invalidateWidget(var3); // L: 757 + return 1; // L: 758 + } else if (var0 == 1124) { // L: 760 + var3.transparencyBot = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 761 + class29.invalidateWidget(var3); // L: 762 + return 1; // L: 763 + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 765 + var8 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 766 + FillMode var6 = (FillMode)UserComparator8.findEnumerated(class309.FillMode_values(), var8); // L: 767 + if (var6 != null) { // L: 768 + var3.fillMode = var6; // L: 769 + class29.invalidateWidget(var3); // L: 770 + } + + return 1; // L: 772 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 774 + var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 775 + var3.field2727 = var5; // L: 776 + return 1; // L: 777 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 779 + var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 780 + var3.modelTransparency = var5; // L: 781 + return 1; // L: 782 + } else if (var0 == 1128) { // L: 784 + class16.Interpreter_intStackSize -= 2; // L: 785 + return 1; // L: 786 + } else { + return 2; // L: 788 + } + } + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "-912001400" + ) + @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: 81 + if (var3) { // L: 82 + var5 |= 65536L; + } + + return var5; // L: 83 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIII)J", - garbageValue = "-265115329" + descriptor = "(II)Lfb;", + garbageValue = "1526631437" ) - static long method2203(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 - } + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 + if (var1 != null) { // L: 182 + return var1; + } else { + var1 = ItemLayer.loadFrames(GrandExchangeOfferOwnWorldComparator.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 + if (var1 != null) { // L: 184 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2128325059" - ) - static void method2202(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); // L: 95 - NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 96 - if (var4 != null) { // L: 97 - NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 98 + return var1; // L: 185 } - } // L: 99 + } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 62cdfe6238..f39200d9ef 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("bq") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("h") - static float[][] field1499; - @ObfuscatedName("z") + @ObfuscatedName("e") + static float[][] field516; + @ObfuscatedName("k") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("e") - static float field1505; - @ObfuscatedName("q") + @ObfuscatedName("g") + static float field526; + @ObfuscatedName("h") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("pairs") int[] pairs; - @ObfuscatedName("d") - int[][][] field1500; - @ObfuscatedName("c") - int[][][] field1501; - @ObfuscatedName("y") - int[] field1503; + @ObfuscatedName("u") + int[][][] field518; + @ObfuscatedName("p") + int[][][] field519; + @ObfuscatedName("b") + int[] field520; static { - field1499 = new float[2][8]; // L: 13 + field516 = new float[2][8]; // L: 13 coefficients = new int[2][8]; // L: 14 } AudioFilter() { this.pairs = new int[2]; // L: 8 - this.field1500 = new int[2][2][4]; // L: 10 - this.field1501 = new int[2][2][4]; // L: 11 - this.field1503 = new int[2]; // L: 12 + this.field518 = new int[2][2][4]; // L: 10 + this.field519 = new int[2][2][4]; // L: 11 + this.field520 = new int[2]; // L: 12 } // L: 21 - @ObfuscatedName("n") - float method2850(int var1, int var2, float var3) { - float var4 = (float)this.field1501[var1][0][var2] + var3 * (float)(this.field1501[var1][1][var2] - this.field1501[var1][0][var2]); // L: 24 + @ObfuscatedName("f") + float method1129(int var1, int var2, float var3) { + float var4 = (float)this.field519[var1][0][var2] + var3 * (float)(this.field519[var1][1][var2] - this.field519[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("d") - float method2852(int var1, int var2, float var3) { - float var4 = (float)this.field1500[var1][0][var2] + var3 * (float)(this.field1500[var1][1][var2] - this.field1500[var1][0][var2]); // L: 35 + @ObfuscatedName("u") + float method1134(int var1, int var2, float var3) { + float var4 = (float)this.field518[var1][0][var2] + var3 * (float)(this.field518[var1][1][var2] - this.field518[var1][0][var2]); // L: 35 var4 *= 1.2207031E-4F; // L: 36 return normalize(var4); // L: 37 } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { // L: 41 - var3 = (float)this.field1503[0] + (float)(this.field1503[1] - this.field1503[0]) * var2; // L: 42 + var3 = (float)this.field520[0] + (float)(this.field520[1] - this.field520[0]) * var2; // L: 42 var3 *= 0.0030517578F; // L: 43 - field1505 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 - forwardMultiplier = (int)(field1505 * 65536.0F); // L: 45 + field526 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field526 * 65536.0F); // L: 45 } if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method2850(var1, 0, var2); // L: 48 - field1499[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2852(var1, 0, var2)); // L: 49 - field1499[var1][1] = var3 * var3; // L: 50 + var3 = this.method1129(var1, 0, var2); // L: 48 + field516[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1134(var1, 0, var2)); // L: 49 + field516[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 - var3 = this.method2850(var1, var4, var2); // L: 52 - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2852(var1, var4, var2)); // L: 53 + var3 = this.method1129(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1134(var1, var4, var2)); // L: 53 float var6 = var3 * var3; // L: 54 - field1499[var1][var4 * 2 + 1] = field1499[var1][var4 * 2 - 1] * var6; // L: 55 - field1499[var1][var4 * 2] = field1499[var1][var4 * 2 - 1] * var5 + field1499[var1][var4 * 2 - 2] * var6; // L: 56 + field516[var1][var4 * 2 + 1] = field516[var1][var4 * 2 - 1] * var6; // L: 55 + field516[var1][var4 * 2] = field516[var1][var4 * 2 - 1] * var5 + field516[var1][var4 * 2 - 2] * var6; // L: 56 for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 - var10000 = field1499[var1]; - var10000[var7] += field1499[var1][var7 - 1] * var5 + field1499[var1][var7 - 2] * var6; + var10000 = field516[var1]; + var10000[var7] += field516[var1][var7 - 1] * var5 + field516[var1][var7 - 2] * var6; } - var10000 = field1499[var1]; // L: 58 - var10000[1] += field1499[var1][0] * var5 + var6; - var10000 = field1499[var1]; // L: 59 + var10000 = field516[var1]; // L: 58 + var10000[1] += field516[var1][0] * var5 + var6; + var10000 = field516[var1]; // L: 59 var10000[0] += var5; } if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1499[0]; - var10000[var4] *= field1505; + var10000 = field516[0]; + var10000[var4] *= field526; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 - coefficients[var1][var4] = (int)(field1499[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field516[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;Lds;)V" + descriptor = "(Lnu;Lbr;)V" ) - final void method2854(Buffer var1, SoundEnvelope var2) { + final void method1133(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.field1503[0] = var1.readUnsignedShort(); // L: 71 - this.field1503[1] = var1.readUnsignedShort(); // L: 72 + this.field520[0] = var1.readUnsignedShort(); // L: 71 + this.field520[1] = var1.readUnsignedShort(); // L: 72 int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { // L: 74 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 - this.field1500[var5][0][var6] = var1.readUnsignedShort(); // L: 76 - this.field1501[var5][0][var6] = var1.readUnsignedShort(); // L: 77 + this.field518[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field519[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } for (var5 = 0; var5 < 2; ++var5) { // L: 80 for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81 if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82 - this.field1500[var5][1][var6] = var1.readUnsignedShort(); // L: 83 - this.field1501[var5][1][var6] = var1.readUnsignedShort(); // L: 84 + this.field518[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field519[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field1500[var5][1][var6] = this.field1500[var5][0][var6]; // L: 87 - this.field1501[var5][1][var6] = this.field1501[var5][0][var6]; // L: 88 + this.field518[var5][1][var6] = this.field518[var5][0][var6]; // L: 87 + this.field519[var5][1][var6] = this.field519[var5][0][var6]; // L: 88 } } } - if (var7 != 0 || this.field1503[1] != this.field1503[0]) { // L: 92 + if (var7 != 0 || this.field520[1] != this.field520[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var4 = this.field1503; // L: 95 - this.field1503[1] = 0; // L: 96 + int[] var4 = this.field520; // L: 95 + this.field520[1] = 0; // L: 96 var4[0] = 0; // L: 97 } } // L: 99 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("normalize") static float normalize(float var0) { float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index cfbcf90880..566ffcc3ac 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("nf") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lnv;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { synchronized(BZip2Decompressor_state) { // L: 20 @@ -29,7 +29,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state.bsLive = 0; // L: 26 BZip2Decompressor_state.bsBuff = 0; // L: 27 BZip2Decompressor_state.nextBit_unused = 0; // L: 28 - BZip2Decompressor_state.field3760 = 0; // L: 29 + BZip2Decompressor_state.field4168 = 0; // L: 29 BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 var1 -= BZip2Decompressor_state.outputLength; // L: 31 BZip2Decompressor_state.inputArray = null; // L: 32 @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llx;)V" + descriptor = "(Lnv;)V" ) - static void method5984(BZip2State var0) { + static void method6819(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 = BZip2State.BZip2Decompressor_block; // L: 44 - int var7 = var0.field3776; // L: 45 + int[] var6 = Fonts.BZip2Decompressor_block; // L: 44 + int var7 = var0.field4175; // L: 45 byte[] var8 = var0.outputArray; // L: 46 int var9 = var0.next_out; // L: 47 int var10 = var0.outputLength; // L: 48 - int var12 = var0.field3769 + 1; // L: 50 + int var12 = var0.field4184 + 1; // L: 50 label70: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; // L: 73 } - int var13 = var0.field3760; // L: 133 - var0.field3760 += var10 - var10; // L: 134 - if (var0.field3760 < var13) { // L: 135 + int var13 = var0.field4168; // L: 133 + var0.field4168 += var10 - var10; // L: 134 + if (var0.field4168 < var13) { // L: 135 } var0.out_char = var2; // L: 136 var0.su_rNToGo = var3; // L: 137 var0.nblocks_used = var4; // L: 138 var0.su_ch2 = var5; // L: 139 - BZip2State.BZip2Decompressor_block = var6; // L: 140 - var0.field3776 = var7; // L: 141 + Fonts.BZip2Decompressor_block = var6; // L: 140 + var0.field4175 = var7; // L: 141 var0.outputArray = var8; // L: 142 var0.next_out = var9; // L: 143 var0.outputLength = var10; // L: 144 } // L: 145 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Llx;)V" + descriptor = "(Lnv;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; // L: 170 int[] var24 = null; // L: 171 int[] var25 = null; // L: 172 - var0.blockSize100k = -340542139; // L: 173 - if (BZip2State.BZip2Decompressor_block == null) { // L: 174 - BZip2State.BZip2Decompressor_block = new int[var0.blockSize100k * 1790264864]; + var0.blockSize100k = 40174603; // L: 173 + if (Fonts.BZip2Decompressor_block == null) { // L: 174 + Fonts.BZip2Decompressor_block = new int[var0.blockSize100k * 1281562592]; } boolean var26 = true; // L: 175 @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 - BZip2State.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + Fonts.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 ++var47; // L: 398 if (var45 == 0) { // L: 399 ++var43; // L: 400 @@ -489,7 +489,7 @@ public final class BZip2Decompressor { var10000 = var0.unzftab; // L: 332 for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 - BZip2State.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + Fonts.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 ++var47; // L: 335 } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { // L: 426 - var1 = (byte)(BZip2State.BZip2Decompressor_block[var36] & 255); // L: 427 - var10000 = BZip2State.BZip2Decompressor_block; // L: 428 + var1 = (byte)(Fonts.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = Fonts.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field3776 = BZip2State.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.field4175 = Fonts.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 var0.nblocks_used = 0; // L: 432 - var0.field3776 = BZip2State.BZip2Decompressor_block[var0.field3776]; // L: 433 - var0.su_ch2 = (byte)(var0.field3776 & 255); // L: 434 - var0.field3776 >>= 8; // L: 436 + var0.field4175 = Fonts.BZip2Decompressor_block[var0.field4175]; // L: 433 + var0.su_ch2 = (byte)(var0.field4175 & 255); // L: 434 + var0.field4175 >>= 8; // L: 436 ++var0.nblocks_used; // L: 437 - var0.field3769 = var47; // L: 438 - method5984(var0); // L: 439 - if (var0.field3769 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 + var0.field4184 = var47; // L: 438 + method6819(var0); // L: 439 + if (var0.field4184 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Llx;)B" + descriptor = "(Lnv;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Llx;)B" + descriptor = "(Lnv;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILlx;)I" + descriptor = "(ILnv;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; // L: 460 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Llx;)V" + descriptor = "(Lnv;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } // L: 479 - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; // L: 486 diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 48564bbcbe..0d5c77312d 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -3,167 +3,164 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lx") +@ObfuscatedName("nv") @Implements("BZip2State") public final class BZip2State { + @ObfuscatedName("f") + final int field4181; @ObfuscatedName("o") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("n") - final int field3779; - @ObfuscatedName("v") - final int field3761; - @ObfuscatedName("d") - final int field3759; - @ObfuscatedName("c") - final int field3758; - @ObfuscatedName("y") - final int field3782; - @ObfuscatedName("h") - final int field3762; - @ObfuscatedName("z") + final int field4157; + @ObfuscatedName("u") + final int field4158; + @ObfuscatedName("p") + final int field4159; + @ObfuscatedName("b") + final int field4160; + @ObfuscatedName("e") + final int field4161; + @ObfuscatedName("k") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1653811455 + intValue = -811439573 ) @Export("nextByte") int nextByte; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -392129599 + intValue = -214146315 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -588771909 + intValue = 1180520057 ) @Export("next_out") int next_out; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1459583845 + intValue = 918346221 ) @Export("outputLength") int outputLength; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1081351471 + intValue = 131560233 ) - int field3760; - @ObfuscatedName("w") + int field4168; + @ObfuscatedName("c") @Export("out_char") byte out_char; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1567479605 + intValue = -1093250351 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1589512339 + intValue = 221996135 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -113350235 + intValue = 1968874059 ) @Export("bsLive") int bsLive; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1608445671 + intValue = -1375451961 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1888817527 + intValue = 1105142065 ) - int field3776; - @ObfuscatedName("t") + int field4175; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2102774435 + intValue = 1781089345 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("unzftab") int[] unzftab; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -305344593 + intValue = 1209285469 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("cftab") int[] cftab; - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 471183687 + intValue = -531246717 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @Export("inUse") boolean[] inUse; - @ObfuscatedName("am") + @ObfuscatedName("ay") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("ll8") byte[] ll8; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("selector") byte[] selector; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("limit") int[][] limit; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @Export("base") int[][] base; - @ObfuscatedName("al") + @ObfuscatedName("as") @Export("perm") int[][] perm; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @Export("minLens") int[] minLens; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -255221635 + intValue = 1691301735 ) - int field3769; + int field4184; BZip2State() { - this.field3779 = 4096; // L: 4 - this.field3761 = 16; // L: 5 - this.field3759 = 258; // L: 6 - this.field3758 = 6; // L: 7 - this.field3782 = 50; // L: 8 - this.field3762 = 18002; // L: 9 + this.field4181 = 4096; // L: 4 + this.field4157 = 16; // L: 5 + this.field4158 = 258; // L: 6 + this.field4159 = 6; // L: 7 + this.field4160 = 50; // L: 8 + this.field4161 = 18002; // L: 9 this.nextByte = 0; // L: 11 this.next_out = 0; // L: 14 this.unzftab = new int[256]; // L: 25 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 82330356b9..a932bf0102 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,66 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("gs") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "Lda;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1837784551 + intValue = 1487980993 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 324986435 + intValue = -2109183059 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 392241551 + intValue = 184751419 ) @Export("y") int y; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1347087127 + intValue = -1907463847 ) @Export("orientationA") int orientationA; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1198661661 + intValue = 334995477 ) @Export("orientationB") int orientationB; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = -5322685038188485543L + longValue = 4648548109869818167L ) @Export("tag") public long tag; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 898643669 + intValue = 512629061 ) @Export("flags") int flags; @@ -73,55 +67,35 @@ public final class BoundaryObject { this.flags = 0; // L: 12 } // L: 14 - @ObfuscatedName("n") + @ObfuscatedName("fg") @ObfuscatedSignature( - descriptor = "(Lig;IIB)[Lly;", - garbageValue = "0" + descriptor = "(B)V", + garbageValue = "77" ) - public static IndexedSprite[] method3420(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 { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var4); // L: 30 - var3 = true; // L: 31 + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (class43.pcmPlayer1 != null) { // L: 3059 + class43.pcmPlayer1.run(); } - if (!var3) { // L: 33 - return null; - } else { - IndexedSprite[] var5 = new IndexedSprite[class336.SpriteBuffer_spriteCount]; // L: 36 + if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 3060 + ApproximateRouteStrategy.pcmPlayer0.run(); + } - for (int var6 = 0; var6 < class336.SpriteBuffer_spriteCount; ++var6) { // L: 37 - IndexedSprite var7 = var5[var6] = new IndexedSprite(); // L: 38 - var7.width = class336.SpriteBuffer_spriteWidth; // L: 39 - var7.height = class336.SpriteBuffer_spriteHeight; // L: 40 - var7.xOffset = class105.SpriteBuffer_xOffsets[var6]; // L: 41 - var7.yOffset = class336.SpriteBuffer_yOffsets[var6]; // L: 42 - var7.subWidth = class336.SpriteBuffer_spriteWidths[var6]; // L: 43 - var7.subHeight = class225.SpriteBuffer_spriteHeights[var6]; // L: 44 - var7.palette = HorizontalAlignment.SpriteBuffer_spritePalette; // L: 45 - var7.pixels = class2.SpriteBuffer_pixels[var6]; // L: 46 + } // L: 3061 + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-230387884" + ) + static boolean method3787(int var0) { + for (int var1 = 0; var1 < Client.field827; ++var1) { // L: 10872 + if (Client.field792[var1] == var0) { // L: 10873 + return true; } - - class105.SpriteBuffer_xOffsets = null; // L: 49 - class336.SpriteBuffer_yOffsets = null; // L: 50 - class336.SpriteBuffer_spriteWidths = null; // L: 51 - class225.SpriteBuffer_spriteHeights = null; // L: 52 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 53 - class2.SpriteBuffer_pixels = null; // L: 54 - return var5; // L: 58 } - } - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "33" - ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; // L: 3807 + return false; // L: 10875 } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 1f8430cc68..75532a534e 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,36 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("lj") @Implements("Bounds") public class Bounds { - @ObfuscatedName("e") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("gs") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("n") + @ObfuscatedName("bh") + @Export("otp") + static String otp; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1970300391 + intValue = -745325341 ) @Export("lowX") public int lowX; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2105661203 + intValue = -356491535 ) @Export("lowY") public int lowY; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1049215037 + intValue = 1775559987 ) @Export("highX") public int highX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1664972525 + intValue = 877483017 ) @Export("highY") public int highY; @@ -47,10 +44,10 @@ public class Bounds { this(0, 0, var1, var2); // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-91" + descriptor = "(IIS)V", + garbageValue = "-32383" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -58,10 +55,10 @@ public class Bounds { this.lowY = var2; // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "82" + garbageValue = "2" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -69,31 +66,31 @@ public class Bounds { this.highY = var2; // L: 25 } // L: 26 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lli;Lli;B)V", - garbageValue = "16" + descriptor = "(Llj;Llj;I)V", + garbageValue = "-281933087" ) - public void method6182(Bounds var1, Bounds var2) { - this.method6193(var1, var2); // L: 33 - this.method6179(var1, var2); // L: 34 + public void method5954(Bounds var1, Bounds var2) { + this.method5955(var1, var2); // L: 33 + this.method5960(var1, var2); // L: 34 } // L: 35 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lli;Lli;I)V", - garbageValue = "102469843" + descriptor = "(Llj;Llj;I)V", + garbageValue = "-1998327311" ) - void method6193(Bounds var1, Bounds var2) { + void method5955(Bounds var1, Bounds var2) { var2.lowX = this.lowX; // L: 38 var2.highX = this.highX; // L: 39 if (this.lowX < var1.lowX) { // L: 40 - var2.highX = (var2.highX * -1958684907 - (var1.lowX * -1958684907 - this.lowX * -1958684907)) * 1049215037; // L: 41 + var2.highX = (var2.highX * 528588283 - (var1.lowX * 528588283 - this.lowX * 528588283)) * 1775559987; // L: 41 var2.lowX = var1.lowX; // L: 42 } - if (var2.method6185() > var1.method6185()) { // L: 44 - var2.highX -= var2.method6185() - var1.method6185(); // L: 45 + if (var2.method5957() > var1.method5957()) { // L: 44 + var2.highX -= var2.method5957() - var1.method5957(); // L: 45 } if (var2.highX < 0) { // L: 47 @@ -102,21 +99,21 @@ public class Bounds { } // L: 48 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lli;Lli;I)V", - garbageValue = "1821841742" + descriptor = "(Llj;Llj;I)V", + garbageValue = "-1461929335" ) - void method6179(Bounds var1, Bounds var2) { + void method5960(Bounds var1, Bounds var2) { var2.lowY = this.lowY; // L: 51 var2.highY = this.highY; // L: 52 if (this.lowY < var1.lowY) { // L: 53 - var2.highY = (var2.highY * -691361509 - (var1.lowY * -691361509 - this.lowY * -691361509)) * -1664972525; // L: 54 + var2.highY = (var2.highY * 1104968249 - (var1.lowY * 1104968249 - this.lowY * 1104968249)) * 877483017; // L: 54 var2.lowY = var1.lowY; // L: 55 } - if (var2.method6186() > var1.method6186()) { // L: 57 - var2.highY -= var2.method6186() - var1.method6186(); // L: 58 + if (var2.method5958() > var1.method5958()) { // L: 57 + var2.highY -= var2.method5958() - var1.method5958(); // L: 58 } if (var2.highY < 0) { // L: 60 @@ -125,25 +122,117 @@ public class Bounds { } // L: 61 - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "16777215" - ) - int method6185() { - return this.highX + this.lowX; // L: 64 - } - - @ObfuscatedName("z") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "57" + garbageValue = "0" ) - int method6186() { - return this.highY + this.lowY; // L: 68 + int method5957() { + return this.lowX + this.highX; // L: 64 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1442149182" + ) + int method5958() { + return this.lowY + this.highY; // L: 68 } public String toString() { return null; // L: 29 } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(IIIIZI)V", + garbageValue = "-1536625645" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 3852 + var2 = 1; + } + + if (var3 < 1) { // L: 3853 + var3 = 1; + } + + int var5 = var3 - 334; // L: 3854 + int var6; + if (var5 < 0) { // L: 3856 + var6 = Client.field855; + } else if (var5 >= 100) { // L: 3857 + var6 = Client.field856; + } else { + var6 = (Client.field856 - Client.field855) * var5 / 100 + Client.field855; // L: 3858 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 3859 + int var8; + int var9; + short var17; + if (var7 < Client.field707) { // L: 3860 + var17 = Client.field707; // L: 3861 + var6 = var17 * var2 * 334 / (var3 * 512); // L: 3862 + if (var6 > Client.field742) { // L: 3863 + var6 = Client.field742; // L: 3864 + var8 = var3 * var6 * 512 / (var17 * 334); // L: 3865 + var9 = (var2 - var8) / 2; // L: 3866 + if (var4) { // L: 3867 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 3868 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 3869 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 3870 + } + + var0 += var9; // L: 3872 + var2 -= var9 * 2; // L: 3873 + } + } else if (var7 > Client.field862) { // L: 3876 + var17 = Client.field862; // L: 3877 + var6 = var17 * var2 * 334 / (var3 * 512); // L: 3878 + if (var6 < Client.field859) { // L: 3879 + var6 = Client.field859; // L: 3880 + var8 = var17 * var2 * 334 / (var6 * 512); // L: 3881 + var9 = (var3 - var8) / 2; // L: 3882 + if (var4) { // L: 3883 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 3884 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 3885 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 3886 + } + + var1 += var9; // L: 3888 + var3 -= var9 * 2; // L: 3889 + } + } + + Client.viewportZoom = var3 * var6 / 334; // L: 3892 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 3893 + int[] var16 = new int[9]; // L: 3895 + + for (var9 = 0; var9 < var16.length; ++var9) { // L: 3896 + int var10 = var9 * 32 + 15 + 128; // L: 3897 + int var11 = WorldMapID.method3116(var10); // L: 3898 + int var12 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 3899 + int var14 = var3 - 334; // L: 3902 + if (var14 < 0) { // L: 3903 + var14 = 0; + } else if (var14 > 100) { // L: 3904 + var14 = 100; + } + + int var15 = (Client.zoomWidth - Client.zoomHeight) * var14 / 100 + Client.zoomHeight; // L: 3905 + int var13 = var11 * var15 / 256; // L: 3906 + var16[var9] = var12 * var13 >> 16; // L: 3909 + } + + Scene.Scene_buildVisiblityMap(var16, 500, 800, var2 * 334 / var3, 334); // L: 3911 + } + + Client.viewportOffsetX = var0; // L: 3914 + Client.viewportOffsetY = var1; // L: 3915 + Client.viewportWidth = var2; // L: 3916 + Client.viewportHeight = var3; // L: 3917 + } // L: 3918 } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index c57bed68ed..7458730129 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -3,25 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ky") +@ObfuscatedName("lg") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("y") + @ObfuscatedName("ek") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1026270323 + intValue = -410155545 ) @Export("world") public int world; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 975938315 + intValue = 1237996835 ) @Export("int2") public int int2; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1192937939 + intValue = 213892793 ) @Export("rank") public int rank; @@ -30,10 +37,10 @@ public class Buddy extends User { this.world = -1; // L: 4 } // L: 8 - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "741820969" + garbageValue = "2093335339" ) @Export("set") void set(int var1, int var2) { @@ -41,23 +48,61 @@ public class Buddy extends User { this.int2 = var2; // L: 12 } // L: 13 - @ObfuscatedName("ao") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-50" + descriptor = "(I)I", + garbageValue = "1570510971" ) @Export("getWorld") public int getWorld() { return this.world; // L: 16 } - @ObfuscatedName("bj") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "292513341" + garbageValue = "-1660177096" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; // L: 20 } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1725299355" + ) + static int method5815(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1349 + var5 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1350 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.itemId; // L: 1351 + return 1; // L: 1352 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1354 + var5 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1355 + if (var5.itemId != -1) { // L: 1356 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1357 + } + + return 1; // L: 1358 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1360 + int var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1361 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1362 + if (var4 != null) { // L: 1363 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1364 + } + + return 1; // L: 1365 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1367 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1368 + return 1; // L: 1369 + } else { + return 2; // L: 1371 + } + } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 82b6c9c373..a1afbc1d60 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,13 +1,26 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fy") +@ObfuscatedName("ds") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("n") + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + @Export("NetCache_reference") + static Buffer NetCache_reference; + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -15,10 +28,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;B)I", - garbageValue = "-42" + descriptor = "(Llg;Llg;B)I", + garbageValue = "-25" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -33,87 +46,229 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "1" + descriptor = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "1328812178" ) - static int method3622(int var0, Script var1, boolean var2) { - Widget var6; - if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1146 - int var4; - if (var0 == 1928) { // L: 1163 - var6 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1164 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1165 - if (var4 >= 1 && var4 <= 10) { // L: 1166 - ApproximateRouteStrategy.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1169 - return 1; // L: 1170 - } else { - throw new RuntimeException(); // L: 1167 - } - } else if (var0 == 2928) { // L: 1172 - Interpreter.Interpreter_intStackSize -= 3; // L: 1173 - int var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1174 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1175 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1176 - if (var5 >= 1 && var5 <= 10) { // L: 1177 - ApproximateRouteStrategy.widgetDefaultMenuAction(var5, var3, var4, class237.getWidget(var3).itemId, ""); // L: 1180 - return 1; // L: 1181 - } else { - throw new RuntimeException(); // L: 1178 - } - } else { - return 2; // L: 1183 - } - } else if (Interpreter.field1123 >= 10) { // L: 1147 - throw new RuntimeException(); // L: 1148 - } else { - if (var0 >= 2000) { // L: 1151 - var6 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1152 - } else { - var6 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1154 + static void method2475(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 216 + Buffer var3 = new Buffer(500); // L: 217 + var3.writeByte(3); // L: 218 + var3.writeByte(var1 != null ? 1 : 0); // L: 219 + var3.writeCESU8(var0.getPath()); // L: 220 + if (var1 != null) { + var3.writeCESU8(""); // L: 221 } - if (var6.onResize == null) { // L: 1155 - return 0; - } else { - ScriptEvent var7 = new ScriptEvent(); // L: 1156 - var7.widget = var6; // L: 1157 - var7.args = var6.onResize; // L: 1158 - var7.field593 = Interpreter.field1123 + 1; // L: 1159 - Client.scriptEvents.addFirst(var7); // L: 1160 - return 1; // L: 1161 + var2.write(var3.array, 0, var3.offset); // L: 222 + var2.close(); // L: 223 + } catch (IOException var4) { // L: 225 + var4.printStackTrace(); // L: 226 + } + + } // L: 228 + + @ObfuscatedName("ip") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-783594374" + ) + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9055 + SpriteMask.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9056 + } + + long var4 = -1L; // L: 9059 + long var6 = -1L; // L: 9060 + + int var8; + for (var8 = 0; var8 < class124.method2490(); ++var8) { // L: 9061 + long var25 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9064 + if (var6 != var25) { // L: 9067 + var6 = var25; // L: 9068 + int var13 = Login.method1967(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9071 + int var14 = var13; // L: 9073 + long var17 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9077 + int var16 = (int)(var17 >>> 7 & 127L); // L: 9079 + var16 = var16; // L: 9083 + int var29 = class44.method519(var8); // L: 9084 + int var18 = class19.method295(var8); // L: 9085 + if (var29 == 2 && WorldMapArea.scene.getObjectFlags(class26.Client_plane, var13, var16, var25) >= 0) { // L: 9086 9087 + ObjectComposition var19 = class19.getObjectDefinition(var18); // L: 9088 + if (var19.transforms != null) { // L: 9089 + var19 = var19.transform(); + } + + if (var19 == null) { // L: 9090 + continue; + } + + if (Client.isItemSelected == 1) { // L: 9091 + SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(65535) + var19.name, 1, var18, var13, var16); // L: 9092 + } else if (Client.isSpellSelected) { // L: 9095 + if ((UserComparator10.selectedSpellFlags & 4) == 4) { // L: 9096 + SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(65535) + var19.name, 2, var18, var13, var16); // L: 9097 + } + } else { + String[] var20 = var19.actions; // L: 9102 + if (var20 != null) { // L: 9103 + for (int var21 = 4; var21 >= 0; --var21) { // L: 9104 + if (var20[var21] != null) { // L: 9105 + short var22 = 0; // L: 9106 + if (var21 == 0) { // L: 9107 + var22 = 3; + } + + if (var21 == 1) { // L: 9108 + var22 = 4; + } + + if (var21 == 2) { // L: 9109 + var22 = 5; + } + + if (var21 == 3) { // L: 9110 + var22 = 6; + } + + if (var21 == 4) { // L: 9111 + var22 = 1001; + } + + SpriteMask.insertMenuItemNoShift(var20[var21], DefaultsGroup.colorStartTag(65535) + var19.name, var22, var18, var14, var16); // L: 9112 + } + } + } + + SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(65535) + var19.name, 1002, var19.id, var14, var16); // L: 9117 + } + } + + Player var23; + int var30; + NPC var31; + int var38; + int[] var39; + if (var29 == 1) { // L: 9122 + NPC var34 = Client.npcs[var18]; // L: 9123 + if (var34 == null) { // L: 9124 + continue; + } + + if (var34.definition.size == 1 && (var34.x & 127) == 64 && (var34.y & 127) == 64) { // L: 9125 + for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9126 + var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9127 + if (var31 != null && var34 != var31 && var31.definition.size == 1 && var34.x == var31.x && var31.y == var34.y) { // L: 9128 + WorldMapSection2.addNpcToMenu(var31.definition, Client.npcIndices[var30], var14, var16); + } + } + + var30 = Players.Players_count; // L: 9130 + var39 = Players.Players_indices; // L: 9131 + + for (var38 = 0; var38 < var30; ++var38) { // L: 9132 + var23 = Client.players[var39[var38]]; // L: 9133 + if (var23 != null && var34.x == var23.x && var34.y == var23.y) { // L: 9134 + AbstractWorldMapData.addPlayerToMenu(var23, var39[var38], var14, var16); + } + } + } + + WorldMapSection2.addNpcToMenu(var34.definition, var18, var14, var16); // L: 9137 + } + + if (var29 == 0) { // L: 9139 + Player var35 = Client.players[var18]; // L: 9140 + if (var35 == null) { // L: 9141 + continue; + } + + if ((var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9142 + for (var30 = 0; var30 < Client.npcCount; ++var30) { // L: 9143 + var31 = Client.npcs[Client.npcIndices[var30]]; // L: 9144 + if (var31 != null && var31.definition.size == 1 && var31.x == var35.x && var35.y == var31.y) { // L: 9145 + WorldMapSection2.addNpcToMenu(var31.definition, Client.npcIndices[var30], var14, var16); + } + } + + var30 = Players.Players_count; // L: 9147 + var39 = Players.Players_indices; // L: 9148 + + for (var38 = 0; var38 < var30; ++var38) { // L: 9149 + var23 = Client.players[var39[var38]]; // L: 9150 + if (var23 != null && var23 != var35 && var35.x == var23.x && var35.y == var23.y) { // L: 9151 + AbstractWorldMapData.addPlayerToMenu(var23, var39[var38], var14, var16); + } + } + } + + if (var18 != Client.combatTargetPlayerIndex) { // L: 9154 + AbstractWorldMapData.addPlayerToMenu(var35, var18, var14, var16); + } else { + var4 = var25; // L: 9155 + } + } + + if (var29 == 3) { // L: 9157 + NodeDeque var37 = Client.groundItems[class26.Client_plane][var14][var16]; // L: 9158 + if (var37 != null) { // L: 9159 + for (TileItem var36 = (TileItem)var37.first(); var36 != null; var36 = (TileItem)var37.next()) { // L: 9160 9161 9194 + ItemComposition var40 = class23.ItemDefinition_get(var36.id); // L: 9162 + if (Client.isItemSelected == 1) { // L: 9163 + SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var40.name, 16, var36.id, var14, var16); // L: 9164 + } else if (Client.isSpellSelected) { // L: 9167 + if ((UserComparator10.selectedSpellFlags & 1) == 1) { // L: 9168 + SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var40.name, 17, var36.id, var14, var16); // L: 9169 + } + } else { + String[] var32 = var40.groundActions; // L: 9174 + + for (int var33 = 4; var33 >= 0; --var33) { // L: 9175 + if (var32 != null && var32[var33] != null) { // L: 9176 + byte var24 = 0; // L: 9177 + if (var33 == 0) { // L: 9178 + var24 = 18; + } + + if (var33 == 1) { // L: 9179 + var24 = 19; + } + + if (var33 == 2) { // L: 9180 + var24 = 20; + } + + if (var33 == 3) { // L: 9181 + var24 = 21; + } + + if (var33 == 4) { // L: 9182 + var24 = 22; + } + + SpriteMask.insertMenuItemNoShift(var32[var33], DefaultsGroup.colorStartTag(16748608) + var40.name, var24, var36.id, var14, var16); // L: 9183 + } else if (var33 == 2) { // L: 9186 + SpriteMask.insertMenuItemNoShift("Take", DefaultsGroup.colorStartTag(16748608) + var40.name, 20, var36.id, var14, var16); // L: 9187 + } + } + + SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16748608) + var40.name, 1004, var36.id, var14, var16); // L: 9191 + } + } + } + } } } - } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-866624945" - ) - static int method3621(int var0, Script var1, boolean var2) { - Widget var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1187 - if (var0 == ScriptOpcodes.IF_GETX) { // L: 1188 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1189 - return 1; // L: 1190 - } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1192 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1193 - return 1; // L: 1194 - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1196 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1197 - return 1; // L: 1198 - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1200 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1201 - return 1; // L: 1202 - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1204 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1205 - return 1; // L: 1206 - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1208 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1209 - return 1; // L: 1210 - } else { - return 2; // L: 1212 + if (-1L != var4) { // L: 9199 + var8 = Login.method1967(var4); // L: 9200 + int var9 = (int)(var4 >>> 7 & 127L); // L: 9203 + Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9206 + AbstractWorldMapData.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 9207 } - } + + } // L: 9209 } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index c4fffbf32a..467ed52603 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("nu") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("array") public byte[] array; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1025364431 + intValue = 1477627389 ) @Export("offset") public int offset; @@ -61,960 +61,1006 @@ public class Buffer extends Node { } // L: 42 public Buffer(int var1) { - this.array = class23.ByteArrayPool_getArray(var1); // L: 58 - this.offset = 0; // L: 59 - } // L: 60 + this.array = WorldMapArea.ByteArrayPool_getArray(var1); // L: 54 + this.offset = 0; // L: 55 + } // L: 56 public Buffer(byte[] var1) { - this.array = var1; // L: 63 - this.offset = 0; // L: 64 - } // L: 65 - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1006665451" - ) - @Export("releaseArray") - public void releaseArray() { - if (this.array != null) { // L: 68 - GrandExchangeOfferWorldComparator.ByteArrayPool_release(this.array); - } - - this.array = null; // L: 69 - } // L: 70 + this.array = var1; // L: 59 + this.offset = 0; // L: 60 + } // L: 61 @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-725228990" + descriptor = "(B)V", + garbageValue = "1" ) - @Export("writeByte") - public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 73 - } // L: 74 + @Export("releaseArray") + public void releaseArray() { + if (this.array != null) { // L: 64 + class14.ByteArrayPool_release(this.array); + } + + this.array = null; // L: 65 + } // L: 66 @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-631854152" + garbageValue = "-1298490112" ) - @Export("writeShort") - public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 77 - this.array[++this.offset - 1] = (byte)var1; // L: 78 - } // L: 79 - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1328174191" - ) - @Export("writeMedium") - public void writeMedium(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 82 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 83 - this.array[++this.offset - 1] = (byte)var1; // L: 84 - } // L: 85 + @Export("writeByte") + public void writeByte(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 69 + } // L: 70 @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1001765065" + garbageValue = "-1931325141" + ) + @Export("writeShort") + public void writeShort(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 73 + this.array[++this.offset - 1] = (byte)var1; // L: 74 + } // L: 75 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "-8617" + ) + @Export("writeMedium") + public void writeMedium(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 78 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 79 + this.array[++this.offset - 1] = (byte)var1; // L: 80 + } // L: 81 + + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1681728921" ) @Export("writeInt") public void writeInt(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 88 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 89 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 90 - this.array[++this.offset - 1] = (byte)var1; // L: 91 - } // L: 92 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 84 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 85 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 86 + this.array[++this.offset - 1] = (byte)var1; // L: 87 + } // L: 88 - @ObfuscatedName("bj") + @ObfuscatedName("az") @Export("writeLongMedium") public void writeLongMedium(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 95 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 96 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 97 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 98 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 99 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 100 - } // L: 101 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 91 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 92 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 93 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 94 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 95 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 96 + } // L: 97 - @ObfuscatedName("bn") + @ObfuscatedName("au") @Export("writeLong") public void writeLong(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 104 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 105 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109 - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110 - this.array[++this.offset - 1] = (byte)((int)var1); // L: 111 - } // L: 112 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 100 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 101 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 102 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 103 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 104 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 105 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 106 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 107 + } // L: 108 - @ObfuscatedName("bi") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "73" + descriptor = "(ZI)V", + garbageValue = "-997640464" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); // L: 115 - } // L: 116 + this.writeByte(var1 ? 1 : 0); // L: 111 + } // L: 112 - @ObfuscatedName("br") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1281175721" + garbageValue = "1857751198" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); // L: 123 - if (var2 >= 0) { // L: 124 + int var2 = var1.indexOf(0); // L: 119 + if (var2 >= 0) { // L: 120 throw new IllegalArgumentException(""); } else { - this.offset += ObjectComposition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 125 - this.array[++this.offset - 1] = 0; // L: 126 + this.offset += GameEngine.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121 + this.array[++this.offset - 1] = 0; // L: 122 } - } // L: 127 + } // L: 123 - @ObfuscatedName("bx") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2045020739" + garbageValue = "604540330" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); // L: 134 - if (var2 >= 0) { // L: 135 + int var2 = var1.indexOf(0); // L: 130 + if (var2 >= 0) { // L: 131 throw new IllegalArgumentException(""); } else { - this.array[++this.offset - 1] = 0; // L: 136 - this.offset += ObjectComposition.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 137 - this.array[++this.offset - 1] = 0; // L: 138 + this.array[++this.offset - 1] = 0; // L: 132 + this.offset += GameEngine.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 133 + this.array[++this.offset - 1] = 0; // L: 134 } - } // L: 139 + } // L: 135 - @ObfuscatedName("bc") + @ObfuscatedName("an") @ObfuscatedSignature( descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-507866074" + garbageValue = "-1755058719" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); // L: 144 - int var4 = 0; // L: 145 + int var2 = BufferedNetSocket.method5868(var1); // L: 138 + this.array[++this.offset - 1] = 0; // L: 139 + this.writeVarInt(var2); // L: 140 + this.offset += BufferedSource.method5917(this.array, this.offset, var1); // L: 141 + } // L: 142 - for (int var5 = 0; var5 < var3; ++var5) { // L: 146 - char var6 = var1.charAt(var5); // L: 147 - if (var6 <= 127) { // L: 148 - ++var4; - } else if (var6 <= 2047) { // L: 149 - var4 += 2; - } else { - var4 += 3; // L: 150 - } - } - - this.array[++this.offset - 1] = 0; // L: 155 - this.writeVarInt(var4); // L: 156 - this.offset += class277.method5192(this.array, this.offset, var1); // L: 157 - } // L: 158 - - @ObfuscatedName("bw") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-491759097" + descriptor = "([BIIB)V", + garbageValue = "31" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - this.array[++this.offset - 1] = var1[var4]; // L: 161 + this.array[++this.offset - 1] = var1[var4]; // L: 145 } - } // L: 162 + } // L: 146 - @ObfuscatedName("bv") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-891045829" + descriptor = "(Lnu;S)V", + garbageValue = "128" ) - public void method5683(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); // L: 165 - } // L: 166 - - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1107107708" - ) - @Export("writeLengthInt") - public void writeLengthInt(int var1) { - if (var1 < 0) { // L: 169 - throw new IllegalArgumentException(); // L: 170 - } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 172 - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 173 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 174 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 175 - } - } // L: 176 - - @ObfuscatedName("bl") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1934189526" - ) - @Export("writeLengthShort") - public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { // L: 179 - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 182 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 183 - } else { - throw new IllegalArgumentException(); // L: 180 - } - } // L: 184 + public void method6574(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 149 + } // L: 150 @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2132929022" + descriptor = "(IB)V", + garbageValue = "-22" + ) + @Export("writeLengthInt") + public void writeLengthInt(int var1) { + if (var1 < 0) { // L: 153 + throw new IllegalArgumentException(); // L: 154 + } else { + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 156 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 157 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 158 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 159 + } + } // L: 160 + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-84" + ) + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { // L: 163 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 166 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 167 + } else { + throw new IllegalArgumentException(); // L: 164 + } + } // L: 168 + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-46" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { - if (var1 >= 0 && var1 <= 255) { // L: 187 - this.array[this.offset - var1 - 1] = (byte)var1; // L: 190 + if (var1 >= 0 && var1 <= 255) { // L: 171 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 174 } else { - throw new IllegalArgumentException(); // L: 188 + throw new IllegalArgumentException(); // L: 172 } - } // L: 191 + } // L: 175 - @ObfuscatedName("bz") + @ObfuscatedName("bi") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-415253670" + garbageValue = "377594228" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { // L: 194 - this.writeByte(var1); // L: 195 - } else if (var1 >= 0 && var1 < 32768) { // L: 198 - this.writeShort(var1 + 32768); // L: 199 + if (var1 >= 0 && var1 < 128) { // L: 178 + this.writeByte(var1); // L: 179 + } else if (var1 >= 0 && var1 < 32768) { // L: 182 + this.writeShort(var1 + 32768); // L: 183 } else { - throw new IllegalArgumentException(); // L: 202 + throw new IllegalArgumentException(); // L: 186 } - } // L: 196 200 + } // L: 180 184 - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "7069" + descriptor = "(II)V", + garbageValue = "880940812" ) @Export("writeVarInt") public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { // L: 206 - if ((var1 & -16384) != 0) { // L: 207 - if ((var1 & -2097152) != 0) { // L: 208 - if ((var1 & -268435456) != 0) { // L: 209 + if ((var1 & -128) != 0) { // L: 190 + if ((var1 & -16384) != 0) { // L: 191 + if ((var1 & -2097152) != 0) { // L: 192 + if ((var1 & -268435456) != 0) { // L: 193 this.writeByte(var1 >>> 28 | 128); } - this.writeByte(var1 >>> 21 | 128); // L: 210 + this.writeByte(var1 >>> 21 | 128); // L: 194 } - this.writeByte(var1 >>> 14 | 128); // L: 212 + this.writeByte(var1 >>> 14 | 128); // L: 196 } - this.writeByte(var1 >>> 7 | 128); // L: 214 + this.writeByte(var1 >>> 7 | 128); // L: 198 } - this.writeByte(var1 & 127); // L: 216 - } // L: 217 + this.writeByte(var1 & 127); // L: 200 + } // L: 201 - @ObfuscatedName("bm") + @ObfuscatedName("bk") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1432126117" + garbageValue = "-2074552528" ) @Export("readUnsignedByte") public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; // L: 220 + return this.array[++this.offset - 1] & 255; // L: 204 } - @ObfuscatedName("bf") + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "-16" + descriptor = "(S)B", + garbageValue = "30" ) @Export("readByte") public byte readByte() { - return this.array[++this.offset - 1]; // L: 224 + return this.array[++this.offset - 1]; // L: 208 + } + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "6" + ) + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 212 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 213 } @ObfuscatedName("be") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "225678000" - ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; // L: 228 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 229 - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "912230375" + garbageValue = "903567991" ) @Export("readShort") public int readShort() { - this.offset += 2; // L: 233 - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 234 - if (var1 > 32767) { // L: 235 + this.offset += 2; // L: 217 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 218 + if (var1 > 32767) { // L: 219 var1 -= 65536; } - return var1; // L: 236 + return var1; // L: 220 + } + + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-27" + ) + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 224 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 225 + } + + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-31" + ) + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 229 + 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: 230 + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-1762871463" + ) + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 234 + long var3 = (long)this.readInt() & 4294967295L; // L: 235 + return var3 + (var1 << 32); // L: 236 + } + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "2" + ) + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 240 } @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-105" - ) - @Export("readMedium") - public int readMedium() { - this.offset += 3; // L: 240 - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 241 - } - - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "95" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; // L: 245 - 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: 246 - } - - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "(B)J", - garbageValue = "68" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; // L: 250 - long var3 = (long)this.readInt() & 4294967295L; // L: 251 - return (var1 << 32) + var3; // L: 252 - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1996547816" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; // L: 256 - } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2074077507" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "19859" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { // L: 260 - ++this.offset; // L: 261 - return null; // L: 262 + if (this.array[this.offset] == 0) { // L: 244 + ++this.offset; // L: 245 + return null; // L: 246 } else { - return this.readStringCp1252NullTerminated(); // L: 264 + return this.readStringCp1252NullTerminated(); // L: 248 + } + } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-1561912666" + ) + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 252 + + while (this.array[++this.offset - 1] != 0) { // L: 253 + } + + int var2 = this.offset - var1 - 1; // L: 254 + return var2 == 0 ? "" : class303.decodeStringCp1252(this.array, var1, var2); // L: 255 256 + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "47" + ) + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 260 + if (var1 != 0) { // L: 261 + throw new IllegalStateException(""); + } else { + int var2 = this.offset; // L: 262 + + while (this.array[++this.offset - 1] != 0) { // L: 263 + } + + int var3 = this.offset - var2 - 1; // L: 264 + return var3 == 0 ? "" : class303.decodeStringCp1252(this.array, var2, var3); // L: 265 266 + } + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1618486887" + ) + @Export("readCESU8") + public String readCESU8() { + byte var1 = this.array[++this.offset - 1]; // L: 270 + if (var1 != 0) { // L: 271 + throw new IllegalStateException(""); + } else { + int var2 = this.readVarInt(); // L: 272 + if (var2 + this.offset > this.array.length) { // L: 273 + throw new IllegalStateException(""); + } else { + byte[] var4 = this.array; // L: 275 + int var5 = this.offset; // L: 276 + char[] var6 = new char[var2]; // L: 278 + int var7 = 0; // L: 279 + int var8 = var5; // L: 280 + + int var11; + for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 281 282 313 + int var10 = var4[var8++] & 255; // L: 283 + if (var10 < 128) { // L: 285 + if (var10 == 0) { // L: 286 + var11 = 65533; + } else { + var11 = var10; // L: 287 + } + } else if (var10 < 192) { // L: 289 + var11 = 65533; + } else if (var10 < 224) { // L: 290 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 291 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 292 + if (var11 < 128) { // L: 293 + var11 = 65533; + } + } else { + var11 = 65533; // L: 295 + } + } else if (var10 < 240) { // L: 297 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 298 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 299 + if (var11 < 2048) { // L: 300 + var11 = 65533; + } + } else { + var11 = 65533; // L: 302 + } + } else if (var10 < 248) { // L: 304 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 305 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 306 + if (var11 >= 65536 && var11 <= 1114111) { // L: 307 + var11 = 65533; // L: 308 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 310 + } + } else { + var11 = 65533; // L: 312 + } + } + + String var3 = new String(var6, 0, var7); // L: 315 + this.offset += var2; // L: 318 + return var3; // L: 319 + } + } + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "-1339327449" + ) + @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: 323 + } + + } // L: 324 + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "137611702" + ) + @Export("readShortSmart") + public int readShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 327 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 328 329 + } + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "86" + ) + @Export("readUShortSmart") + public int readUShortSmart() { + int var1 = this.array[this.offset] & 255; // L: 333 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 334 335 + } + + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-56" + ) + public int method6595() { + int var1 = 0; // L: 339 + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 340 341 343 + var1 += 32767; // L: 342 + } + + var1 += var2; // L: 345 + return var1; // L: 346 + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-574632647" + ) + public int method6596() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 350 351 + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1199581115" + ) + public int method6597() { + if (this.array[this.offset] < 0) { // L: 355 + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); // L: 356 + return var1 == 32767 ? -1 : var1; // L: 357 } } @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2017763528" + descriptor = "(B)I", + garbageValue = "-81" ) - @Export("readStringCp1252NullTerminated") - public String readStringCp1252NullTerminated() { - int var1 = this.offset; // L: 268 + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; // L: 362 - while (this.array[++this.offset - 1] != 0) { // L: 269 + int var2; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 363 364 366 + var2 = (var2 | var1 & 127) << 7; // L: 365 } - int var2 = this.offset - var1 - 1; // L: 270 - return var2 == 0 ? "" : VertexNormal.decodeStringCp1252(this.array, var1, var2); // L: 271 272 + return var2 | var1; // L: 368 } - @ObfuscatedName("bo") + @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "586537561" + descriptor = "([II)V", + garbageValue = "-160142401" ) - @Export("readStringCp1252NullCircumfixed") - public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; // L: 276 - if (var1 != 0) { // L: 277 - throw new IllegalStateException(""); - } else { - int var2 = this.offset; // L: 278 + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 372 + this.offset = 0; // L: 373 - while (this.array[++this.offset - 1] != 0) { // L: 279 + for (int var3 = 0; var3 < var2; ++var3) { // L: 374 + int var4 = this.readInt(); // L: 375 + int var5 = this.readInt(); // L: 376 + int var6 = 0; // L: 377 + int var7 = -1640531527; // L: 378 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 379 380 383 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 381 + var6 += var7; // L: 382 } - int var3 = this.offset - var2 - 1; // L: 280 - return var3 == 0 ? "" : VertexNormal.decodeStringCp1252(this.array, var2, var3); // L: 281 282 - } - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "(S)Ljava/lang/String;", - garbageValue = "8221" - ) - @Export("readCESU8") - public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; // L: 286 - if (var1 != 0) { - throw new IllegalStateException(""); // L: 287 - } else { - int var2 = this.readVarInt(); // L: 288 - String var3 = Strings.method4327(this.array, this.offset, var2); // L: 290 - this.offset += var2; // L: 291 - return var3; // L: 292 - } - } - - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-199927912" - ) - @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: 296 + this.offset -= 8; // L: 385 + this.writeInt(var4); // L: 386 + this.writeInt(var5); // L: 387 } - } // L: 297 + } // L: 389 - @ObfuscatedName("cq") + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1063921109" + descriptor = "([II)V", + garbageValue = "472171978" ) - @Export("readShortSmart") - public int readShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 300 - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 301 302 - } + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 392 + this.offset = 0; // L: 393 - @ObfuscatedName("cb") + for (int var3 = 0; var3 < var2; ++var3) { // L: 394 + int var4 = this.readInt(); // L: 395 + int var5 = this.readInt(); // L: 396 + int var6 = -957401312; // L: 397 + int var7 = -1640531527; // L: 398 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 399 400 403 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 401 + var6 -= var7; // L: 402 + } + + this.offset -= 8; // L: 405 + this.writeInt(var4); // L: 406 + this.writeInt(var5); // L: 407 + } + + } // L: 409 + + @ObfuscatedName("cw") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "342141969" + descriptor = "([IIII)V", + garbageValue = "392525104" ) - @Export("readUShortSmart") - public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; // L: 306 - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 307 308 - } + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 412 + this.offset = var2; // L: 413 + int var5 = (var3 - var2) / 8; // L: 414 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 415 + int var7 = this.readInt(); // L: 416 + int var8 = this.readInt(); // L: 417 + int var9 = 0; // L: 418 + int var10 = -1640531527; // L: 419 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 420 421 424 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 422 + var9 += var10; // L: 423 + } + + this.offset -= 8; // L: 426 + this.writeInt(var7); // L: 427 + this.writeInt(var8); // L: 428 + } + + this.offset = var4; // L: 430 + } // L: 431 @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1617877263" + descriptor = "([IIIB)V", + garbageValue = "74" ) - public int method5704() { - int var1 = 0; // L: 312 + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 434 + this.offset = var2; // L: 435 + int var5 = (var3 - var2) / 8; // L: 436 - int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 313 314 316 - var1 += 32767; // L: 315 + for (int var6 = 0; var6 < var5; ++var6) { // L: 437 + int var7 = this.readInt(); // L: 438 + int var8 = this.readInt(); // L: 439 + int var9 = -957401312; // L: 440 + int var10 = -1640531527; // L: 441 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 442 443 446 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 444 + var9 -= var10; // L: 445 + } + + this.offset -= 8; // L: 448 + this.writeInt(var7); // L: 449 + this.writeInt(var8); // L: 450 } - var1 += var2; // L: 318 - return var1; // L: 319 + this.offset = var4; // L: 452 + } // L: 453 + + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-1040044414" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 456 + this.offset = 0; // L: 457 + byte[] var4 = new byte[var3]; // L: 458 + this.readBytes(var4, 0, var3); // L: 459 + BigInteger var5 = new BigInteger(var4); // L: 460 + BigInteger var6 = var5.modPow(var1, var2); // L: 461 + byte[] var7 = var6.toByteArray(); // L: 462 + this.offset = 0; // L: 463 + this.writeShort(var7.length); // L: 464 + this.writeBytes(var7, 0, var7.length); // L: 465 + } // L: 466 + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-83" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + int var2 = AbstractWorldMapData.method3102(this.array, var1, this.offset); // L: 469 + this.writeInt(var2); // L: 470 + return var2; // L: 471 } @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "87" + descriptor = "(B)Z", + garbageValue = "97" ) - public int method5705() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 323 324 + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 475 + int var1 = AbstractWorldMapData.method3102(this.array, 0, this.offset); // L: 476 + int var2 = this.readInt(); // L: 477 + return var1 == var2; // L: 478 } - @ObfuscatedName("ck") + @ObfuscatedName("cg") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2063199020" + ) + public void method6606(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 483 + } // L: 484 + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "21419" + ) + public void method6639(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 487 + } // L: 488 + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "10" + ) + @Export("writeShortLE") + public void writeShortLE(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 491 + } // L: 492 + + @ObfuscatedName("cc") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1318332981" + garbageValue = "-917854085" ) - public int method5833() { - if (this.array[this.offset] < 0) { // L: 328 - return this.readInt() & Integer.MAX_VALUE; - } else { - int var1 = this.readUnsignedShort(); // L: 329 - return var1 == 32767 ? -1 : var1; // L: 330 - } + public int method6609() { + return this.array[++this.offset - 1] - 128 & 255; // L: 495 } @ObfuscatedName("cn") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2047096049" + garbageValue = "-1498913775" ) - @Export("readVarInt") - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; // L: 335 - - int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 336 337 339 - var2 = (var2 | var1 & 127) << 7; // L: 338 - } - - return var2 | var1; // L: 341 + public int method6610() { + return 0 - this.array[++this.offset - 1] & 255; // L: 499 } - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-105213348" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 345 - this.offset = 0; // L: 346 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 347 - int var4 = this.readInt(); // L: 348 - int var5 = this.readInt(); // L: 349 - int var6 = 0; // L: 350 - int var7 = -1640531527; // L: 351 - - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 352 353 356 - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 354 - var6 += var7; // L: 355 - } - - this.offset -= 8; // L: 358 - this.writeInt(var4); // L: 359 - this.writeInt(var5); // L: 360 - } - - } // L: 362 - - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "2106116366" - ) - @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; // L: 365 - this.offset = 0; // L: 366 - - for (int var3 = 0; var3 < var2; ++var3) { // L: 367 - int var4 = this.readInt(); // L: 368 - int var5 = this.readInt(); // L: 369 - int var6 = -957401312; // L: 370 - int var7 = -1640531527; // L: 371 - - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 372 373 376 - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 374 - var6 -= var7; // L: 375 - } - - this.offset -= 8; // L: 378 - this.writeInt(var4); // L: 379 - this.writeInt(var5); // L: 380 - } - - } // L: 382 - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "([IIIB)V", - garbageValue = "6" - ) - @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 385 - this.offset = var2; // L: 386 - int var5 = (var3 - var2) / 8; // L: 387 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 388 - int var7 = this.readInt(); // L: 389 - int var8 = this.readInt(); // L: 390 - int var9 = 0; // L: 391 - int var10 = -1640531527; // L: 392 - - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 393 394 397 - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 395 - var9 += var10; // L: 396 - } - - this.offset -= 8; // L: 399 - this.writeInt(var7); // L: 400 - this.writeInt(var8); // L: 401 - } - - this.offset = var4; // L: 403 - } // L: 404 - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "-1639907144" - ) - @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; // L: 407 - this.offset = var2; // L: 408 - int var5 = (var3 - var2) / 8; // L: 409 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 410 - int var7 = this.readInt(); // L: 411 - int var8 = this.readInt(); // L: 412 - int var9 = -957401312; // L: 413 - int var10 = -1640531527; // L: 414 - - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 415 416 419 - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 417 - var9 -= var10; // L: 418 - } - - this.offset -= 8; // L: 421 - this.writeInt(var7); // L: 422 - this.writeInt(var8); // L: 423 - } - - this.offset = var4; // L: 425 - } // L: 426 - - @ObfuscatedName("cs") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-1400886376" - ) - @Export("encryptRsa") - public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; // L: 429 - this.offset = 0; // L: 430 - byte[] var4 = new byte[var3]; // L: 431 - this.readBytes(var4, 0, var3); // L: 432 - BigInteger var5 = new BigInteger(var4); // L: 433 - BigInteger var6 = var5.modPow(var1, var2); // L: 434 - byte[] var7 = var6.toByteArray(); // L: 435 - this.offset = 0; // L: 436 - this.writeShort(var7.length); // L: 437 - this.writeBytes(var7, 0, var7.length); // L: 438 - } // L: 439 - - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1855873704" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - int var2 = Player.method1317(this.array, var1, this.offset); // L: 442 - this.writeInt(var2); // L: 443 - return var2; // L: 444 - } - - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "483943428" - ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; // L: 448 - int var1 = Player.method1317(this.array, 0, this.offset); // L: 449 - int var2 = this.readInt(); // L: 450 - return var2 == var1; // L: 451 - } - - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "110714256" - ) - public void method5883(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 456 - } // L: 457 - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1893210682" - ) - public void method5778(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); // L: 460 - } // L: 461 - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-72732516" - ) - public void method5931(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); // L: 464 - } // L: 465 - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-35" - ) - public int method5776() { - return this.array[++this.offset - 1] - 128 & 255; // L: 468 - } - - @ObfuscatedName("co") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1293461120" + garbageValue = "-1369113061" ) - public int method5717() { - return 0 - this.array[++this.offset - 1] & 255; // L: 472 - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1006009212" - ) - public int method5720() { - return 128 - this.array[++this.offset - 1] & 255; // L: 476 - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-2124530748" - ) - public byte method5721() { - return (byte)(this.array[++this.offset - 1] - 128); // L: 480 + public int method6623() { + return 128 - this.array[++this.offset - 1] & 255; // L: 503 } @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(I)B", - garbageValue = "1450651314" + garbageValue = "1650115963" ) - public byte method5722() { - return (byte)(0 - this.array[++this.offset - 1]); // L: 484 + public byte method6584() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 507 + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "3" + ) + public byte method6612() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 511 + } + + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-1758456111" + ) + public byte method6678() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 515 + } + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "31" + ) + public void method6614(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 519 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 520 + } // L: 521 + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "960934308" + ) + public void method6771(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 524 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 525 + } // L: 526 + + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-876556698" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 529 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 530 + } // L: 531 + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2095394332" + ) + public int method6617() { + this.offset += 2; // L: 534 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 535 + } + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-110506441" + ) + public int method6748() { + this.offset += 2; // L: 539 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 540 + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "994048780" + ) + public int method6766() { + this.offset += 2; // L: 544 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 545 + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-112" + ) + public int method6718() { + this.offset += 2; // L: 549 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 550 + if (var1 > 32767) { // L: 551 + var1 -= 65536; + } + + return var1; // L: 552 + } + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1560666274" + ) + public int method6621() { + this.offset += 2; // L: 556 + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 557 + if (var1 > 32767) { // L: 558 + var1 -= 65536; + } + + return var1; // L: 559 } @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-362009311" + descriptor = "(I)I", + garbageValue = "1409751382" ) - public byte method5747() { - return (byte)(128 - this.array[++this.offset - 1]); // L: 488 + public int method6622() { + this.offset += 2; // L: 563 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 564 + if (var1 > 32767) { // L: 565 + var1 -= 65536; + } + + return var1; // L: 566 } - @ObfuscatedName("cw") + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "95868174" + ) + public int method6642() { + this.offset += 3; // L: 570 + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 2] & 255); // L: 571 + } + + @ObfuscatedName("cm") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1910800344" + garbageValue = "-1036994244" ) - @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 492 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 493 - } // L: 494 + public void method6624(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 575 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 576 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 577 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 578 + } // L: 579 @ObfuscatedName("ct") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1801053391" + garbageValue = "855566027" ) - public void method5725(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 497 - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 498 - } // L: 499 - - @ObfuscatedName("dx") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 502 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 503 - } // L: 504 + public void method6625(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 582 + this.array[++this.offset - 1] = (byte)var1; // L: 583 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 584 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 585 + } // L: 586 @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "2146834071" - ) - public int method5727() { - this.offset += 2; // L: 507 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 508 - } - - @ObfuscatedName("du") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-211808457" - ) - public int method5728() { - this.offset += 2; // L: 512 - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 513 - } - - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-25877" - ) - public int method5729() { - this.offset += 2; // L: 517 - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 518 - } - - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "114" - ) - public int method5730() { - this.offset += 2; // L: 522 - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 523 - if (var1 > 32767) { // L: 524 - var1 -= 65536; - } - - return var1; // L: 525 - } - - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "38246618" - ) - public int method5731() { - this.offset += 2; // L: 529 - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 530 - if (var1 > 32767) { // L: 531 - var1 -= 65536; - } - - return var1; // L: 532 - } - - @ObfuscatedName("db") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "166926488" + garbageValue = "-1886994070" ) - public void method5732(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 536 - this.array[++this.offset - 1] = (byte)var1; // L: 537 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 538 - } // L: 539 - - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-25" - ) - public int method5788() { - this.offset += 3; // L: 542 - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 543 - } + public void method6754(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 589 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 590 + this.array[++this.offset - 1] = (byte)var1; // L: 591 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 592 + } // L: 593 @ObfuscatedName("dm") @ObfuscatedSignature( - descriptor = "(IB)V", + descriptor = "(B)I", garbageValue = "115" ) - public void method5781(int var1) { - this.array[++this.offset - 1] = (byte)var1; // L: 547 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 548 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 549 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 550 - } // L: 551 - - @ObfuscatedName("dj") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "99" - ) - public void method5876(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 554 - this.array[++this.offset - 1] = (byte)var1; // L: 555 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 556 - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 557 - } // L: 558 - - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2087038458" - ) - public void method5736(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 561 - this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 562 - this.array[++this.offset - 1] = (byte)var1; // L: 563 - this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 564 - } // L: 565 - - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1781461165" - ) - public int method5895() { - this.offset += 4; // L: 568 - 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: 569 - } - - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1616505089" - ) - public int method5738() { - this.offset += 4; // L: 573 - 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: 574 + public int method6627() { + this.offset += 4; // L: 596 + 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: 597 } @ObfuscatedName("dy") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "331427137" + descriptor = "(B)I", + garbageValue = "81" ) - public int method5739() { - this.offset += 4; // L: 578 - 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: 579 + public int method6628() { + this.offset += 4; // L: 601 + 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: 602 } - @ObfuscatedName("dv") + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "2003375492" + descriptor = "(I)I", + garbageValue = "-1473623071" ) - public void method5740(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 583 - var1[var4] = this.array[++this.offset - 1]; + public int method6629() { + this.offset += 4; // L: 606 + 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: 607 + } + + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "1" + ) + public void method6630(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { + var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 611 } - } // L: 584 + } // L: 612 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 2869839e6e..4f1f3c9825 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("me") +@ObfuscatedName("nx") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "Lni;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -568041888096714247L + longValue = 727584182909602275L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1358972217 + intValue = 927076747 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -1257746194059994169L + longValue = -3945136328699705067L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1100235419 + intValue = -523064543 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 4142092645769618095L + longValue = -1861467906995136607L ) @Export("offset") long offset; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -2886354147678367329L + longValue = 8191777692377419287L ) @Export("fileLength") long fileLength; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -4295221967998641937L + longValue = 3225691643832492141L ) @Export("length") long length; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -6786211717248859979L + longValue = 7712306994019717031L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - descriptor = "(Lmc;II)V" + descriptor = "(Lni;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; // L: 9 @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; // L: 24 } // L: 25 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "2" + descriptor = "(I)V", + garbageValue = "-1544475638" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); // L: 29 } // L: 30 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { // L: 33 @@ -105,30 +105,30 @@ public class BufferedFile { } } // L: 35 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "657819457" + descriptor = "(B)J", + garbageValue = "4" ) @Export("length") public long length() { return this.length; // L: 38 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "([BS)V", - garbageValue = "29514" + descriptor = "([BI)V", + garbageValue = "-883591339" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); // L: 42 } // L: 43 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1136295656" + garbageValue = "1087602701" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 this.offset += (long)var3; // L: 50 return; // L: 51 @@ -202,13 +202,13 @@ public class BufferedFile { long var10 = -1L; // L: 96 if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 var13 = this.writeBufferOffset; // L: 98 - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 + } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 100 var13 = var4; // L: 101 } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= (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 + if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { // L: 103 + var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104 + } else if (var4 + (long)var7 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106 var10 = var4 + (long)var7; // L: 107 } @@ -231,15 +231,15 @@ public class BufferedFile { } } // L: 125 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-711377457" + garbageValue = "143357910" ) @Export("load") void load() throws IOException { this.readBufferLength = 0; // L: 128 - if (this.offset != this.fileOffset) { // L: 129 + if (this.fileOffset != this.offset) { // L: 129 this.accessFile.seek(this.offset); // L: 130 this.fileOffset = this.offset; // L: 131 } @@ -261,23 +261,23 @@ public class BufferedFile { } // L: 142 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "2039046126" + garbageValue = "265618871" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if (this.offset + (long)var3 > this.length) { // L: 146 - 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 > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 this.flush(); // L: 148 } - if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 + if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 this.offset += (long)var4; // L: 153 @@ -301,7 +301,7 @@ public class BufferedFile { } } else { - if (this.fileOffset != this.offset) { // L: 160 + if (this.offset != this.fileOffset) { // L: 160 this.accessFile.seek(this.offset); // L: 161 this.fileOffset = this.offset; // L: 162 } @@ -316,13 +316,13 @@ public class BufferedFile { long var6 = -1L; // L: 168 if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 var9 = this.offset; // L: 170 - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 var9 = this.readBufferOffset; // L: 173 } - if ((long)var3 + this.offset > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 - var6 = (long)var3 + this.offset; // L: 176 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { // L: 178 + if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 + var6 = this.offset + (long)var3; // L: 176 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178 var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 } @@ -339,21 +339,21 @@ public class BufferedFile { } } // L: 186 193 200 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-31" + garbageValue = "-18" ) @Export("flush") void flush() throws IOException { if (this.writeBufferOffset != -1L) { // L: 203 - if (this.writeBufferOffset != this.fileOffset) { // L: 204 + 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); // L: 208 - this.fileOffset += (long)this.writeBufferLength * -1727576888882233343L; // L: 209 + this.fileOffset += (long)this.writeBufferLength * -50342862159609855L; // L: 209 if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } @@ -366,10 +366,10 @@ public class BufferedFile { var1 = this.readBufferOffset; // L: 217 } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219 - var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222 - var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 + var3 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 220 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 + var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223 } if (var1 > -1L && var3 > var1) { // L: 225 diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 5cf1e62d9c..7b246b8093 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,39 +5,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lo") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("socket") Socket socket; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lll;" + descriptor = "Llm;" ) @Export("source") BufferedSource source; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llt;" + descriptor = "Lld;" ) @Export("sink") BufferedSink sink; BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { - this.socket = var1; // L: 12 - this.socket.setSoTimeout(30000); // L: 13 - this.socket.setTcpNoDelay(true); // L: 14 - this.socket.setReceiveBufferSize(65536); // L: 15 + this.socket = var1; + this.socket.setSoTimeout(30000); + this.socket.setTcpNoDelay(true); + this.socket.setReceiveBufferSize(65536); this.socket.setSendBufferSize(65536); // L: 16 - this.source = new BufferedSource(this.socket.getInputStream(), var2); // L: 17 + this.source = new BufferedSource(this.socket.getInputStream(), var2); this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 } // L: 19 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "136255387" + garbageValue = "-1705512918" ) @Export("close") public void close() { @@ -51,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); // L: 47 } // L: 48 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-29" + garbageValue = "-75" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-65" ) @Export("available") public int available() throws IOException { return this.source.available(); // L: 26 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1621767276" + garbageValue = "1604537239" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "-127" + garbageValue = "121" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1032488862" + garbageValue = "199608149" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -104,4 +104,27 @@ public class BufferedNetSocket extends AbstractSocket { protected void finalize() { this.close(); // L: 51 } // L: 52 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-417848608" + ) + public static int method5868(CharSequence var0) { + int var1 = var0.length(); // L: 9 + int var2 = 0; // L: 10 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 11 + char var4 = var0.charAt(var3); // L: 12 + if (var4 <= 127) { // L: 13 + ++var2; + } else if (var4 <= 2047) { // L: 14 + var2 += 2; + } else { + var2 += 3; // L: 15 + } + } + + return var2; // L: 17 + } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 86c0eb74b4..540dfd0527 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("ld") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("thread") Thread thread; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1750886899 + intValue = -1717513047 ) @Export("capacity") int capacity; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("buffer") byte[] buffer; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1446346341 + intValue = 1985311889 ) @Export("position") int position; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -51603125 + intValue = -123700751 ) @Export("limit") int limit; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("exception") IOException exception; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); // L: 197 } // L: 198 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1300767817" + garbageValue = "1952078918" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "52" + descriptor = "([BIII)V", + garbageValue = "-1726130817" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -98,8 +98,8 @@ public class BufferedSink implements Runnable { var5 = this.position - this.limit - 1; // L: 266 } - if (var5 < var3) { - throw new IOException(""); // L: 267 + if (var5 < var3) { // L: 267 + throw new IOException(""); } else { if (var3 + this.limit <= this.capacity) { // L: 268 System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269 @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } // L: 279 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1796941473" + garbageValue = "-40216394" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 3cd43b0b46..da84908314 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ll") +@ObfuscatedName("lm") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("thread") Thread thread; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1953404091 + intValue = -1895389513 ) @Export("capacity") int capacity; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("buffer") byte[] buffer; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2146586711 + intValue = 552004767 ) @Export("position") int position; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2116402287 + intValue = 1147375927 ) @Export("limit") int limit; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("exception") IOException exception; @@ -52,22 +52,22 @@ public class BufferedSource implements Runnable { this.thread.start(); // L: 69 } // L: 70 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1444651631" + descriptor = "(IB)Z", + garbageValue = "-36" ) @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) { + } else if (var1 > 0 && var1 < this.capacity) { // L: 107 synchronized(this) { // L: 108 int var3; 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) { // L: 112 @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "5789" + descriptor = "(B)I", + garbageValue = "-28" ) @Export("available") int available() throws IOException { @@ -110,15 +110,15 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1306188380" + garbageValue = "1857294674" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { // L: 135 - if (this.limit == this.position) { // L: 136 + if (this.position == this.limit) { // L: 136 if (this.exception != null) { // L: 137 throw new IOException(this.exception.toString()); } else { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "([BIII)I", - garbageValue = "255172200" + descriptor = "([BIIB)I", + garbageValue = "123" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-489650908" + descriptor = "(B)V", + garbageValue = "-28" ) @Export("close") void close() { @@ -186,15 +186,15 @@ public class BufferedSource implements Runnable { 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) { @@ -207,118 +207,97 @@ public class BufferedSource implements Runnable { 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(); // L: 83 - } catch (InterruptedException var10) { + } 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("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lig;III)Llm;", - garbageValue = "34379622" + descriptor = "([BILjava/lang/CharSequence;I)I", + garbageValue = "689227004" ) - @Export("SpriteBuffer_getSprite") - public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 79 - boolean var3; - if (var4 == null) { // L: 80 - var3 = false; // L: 81 - } else { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var4); // L: 84 - var3 = true; // L: 85 - } + public static int method5917(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); // L: 21 + int var4 = var1; // L: 22 - if (!var3) { // L: 87 - return null; - } else { - SpritePixels var5 = new SpritePixels(); // L: 90 - var5.width = class336.SpriteBuffer_spriteWidth; // L: 91 - var5.height = class336.SpriteBuffer_spriteHeight; // L: 92 - var5.xOffset = class105.SpriteBuffer_xOffsets[0]; // L: 93 - var5.yOffset = class336.SpriteBuffer_yOffsets[0]; // L: 94 - var5.subWidth = class336.SpriteBuffer_spriteWidths[0]; // L: 95 - var5.subHeight = class225.SpriteBuffer_spriteHeights[0]; // L: 96 - int var6 = var5.subHeight * var5.subWidth; // L: 97 - byte[] var7 = class2.SpriteBuffer_pixels[0]; // L: 98 - var5.pixels = new int[var6]; // L: 99 - - for (int var8 = 0; var8 < var6; ++var8) { // L: 100 - var5.pixels[var8] = HorizontalAlignment.SpriteBuffer_spritePalette[var7[var8] & 255]; - } - - class105.SpriteBuffer_xOffsets = null; // L: 102 - class336.SpriteBuffer_yOffsets = null; // L: 103 - class336.SpriteBuffer_spriteWidths = null; // L: 104 - class225.SpriteBuffer_spriteHeights = null; // L: 105 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 106 - class2.SpriteBuffer_pixels = null; // L: 107 - return var5; // L: 111 - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(B)[Llm;", - garbageValue = "49" - ) - static SpritePixels[] method6103() { - SpritePixels[] var0 = new SpritePixels[class336.SpriteBuffer_spriteCount]; // L: 172 - - for (int var1 = 0; var1 < class336.SpriteBuffer_spriteCount; ++var1) { // L: 173 - SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 174 - var2.width = class336.SpriteBuffer_spriteWidth; // L: 175 - var2.height = class336.SpriteBuffer_spriteHeight; // L: 176 - var2.xOffset = class105.SpriteBuffer_xOffsets[var1]; // L: 177 - var2.yOffset = class336.SpriteBuffer_yOffsets[var1]; // L: 178 - var2.subWidth = class336.SpriteBuffer_spriteWidths[var1]; // L: 179 - var2.subHeight = class225.SpriteBuffer_spriteHeights[var1]; // L: 180 - int var3 = var2.subHeight * var2.subWidth; // L: 181 - byte[] var4 = class2.SpriteBuffer_pixels[var1]; // L: 182 - var2.pixels = new int[var3]; // L: 183 - - for (int var5 = 0; var5 < var3; ++var5) { // L: 184 - var2.pixels[var5] = HorizontalAlignment.SpriteBuffer_spritePalette[var4[var5] & 255]; + for (int var5 = 0; var5 < var3; ++var5) { // L: 23 + char var6 = var2.charAt(var5); // L: 24 + if (var6 <= 127) { // L: 25 + var0[var4++] = (byte)var6; // L: 26 + } else if (var6 <= 2047) { // L: 28 + var0[var4++] = (byte)(192 | var6 >> 6); // L: 29 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 30 + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 33 + var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 34 + var0[var4++] = (byte)(128 | var6 & '?'); // L: 35 } } - class105.SpriteBuffer_xOffsets = null; // L: 187 - class336.SpriteBuffer_yOffsets = null; // L: 188 - class336.SpriteBuffer_spriteWidths = null; // L: 189 - class225.SpriteBuffer_spriteHeights = null; // L: 190 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 191 - class2.SpriteBuffer_pixels = null; // L: 192 - return var0; // L: 194 + return var4 - var1; // L: 38 } + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "519434496" + ) + static final void method5918() { + int var0 = class16.menuX; // L: 7792 + int var1 = FontName.menuY; // L: 7793 + int var2 = Player.menuWidth; // L: 7794 + int var3 = class11.menuHeight; // L: 7795 + int var4 = 6116423; // L: 7796 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 7797 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 7798 + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 7799 + class368.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 7800 + int var5 = MouseHandler.MouseHandler_x; // L: 7801 + int var6 = MouseHandler.MouseHandler_y; // L: 7802 + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 7803 + int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 7804 + int var9 = 16777215; // L: 7805 + if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 7806 + var9 = 16776960; + } + + class368.fontBold12.draw(class69.method1164(var7), var0 + 3, var8, var9, 0); // L: 7807 + } + + LoginScreenAnimation.method2198(class16.menuX, FontName.menuY, Player.menuWidth, class11.menuHeight); // L: 7809 + } // L: 7810 } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 4f51f98404..19c729e17b 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gt") +@ObfuscatedName("mw") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 4b9d78f11a..060969b854 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,39 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("kp") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1247159051 + intValue = 1309322053 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1859253651 + intValue = 535020743 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 282212251 + intValue = -1601199927 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("q") - @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; static { ByteArrayPool_smallCount = 0; // L: 4 @@ -47,10 +50,20 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; // L: 9 } - @ObfuscatedName("v") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Ljy;", + garbageValue = "-2079671317" + ) + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < GrandExchangeOfferNameComparator.WorldMapElement_cached.length && GrandExchangeOfferNameComparator.WorldMapElement_cached[var0] != null ? GrandExchangeOfferNameComparator.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63 + } + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IZI)[B", - garbageValue = "-1630315856" + garbageValue = "147973145" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -82,14 +95,14 @@ public class ByteArrayPool { return var4; // L: 48 } - if (ByteArrayPool_arrays != null) { // L: 50 - for (int var2 = 0; var2 < TriBool.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 - if (TriBool.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 - if (var0 < TriBool.ByteArrayPool_alternativeSizes[var2]) { + if (ScriptFrame.ByteArrayPool_arrays != null) { // L: 50 + for (int var2 = 0; var2 < UserComparator3.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 + if (UserComparator3.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 + if (var0 < UserComparator3.ByteArrayPool_alternativeSizes[var2]) { } - } else if (class225.ByteArrayPool_altSizeArrayCounts[var2] > 0) { - byte[] var3 = ByteArrayPool_arrays[var2][--class225.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 - ByteArrayPool_arrays[var2][class225.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 + } else if (class221.ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ScriptFrame.ByteArrayPool_arrays[var2][--class221.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 + ScriptFrame.ByteArrayPool_arrays[var2][class221.ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 return var3; // L: 55 } } @@ -97,4 +110,49 @@ public class ByteArrayPool { return new byte[var0]; // L: 68 } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + descriptor = "(IIIIIII)V", + garbageValue = "1064656053" + ) + static final void method5575(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 9885 + int var7 = var3 - var1; // L: 9886 + int var8 = var6 >= 0 ? var6 : -var6; // L: 9887 + int var9 = var7 >= 0 ? var7 : -var7; // L: 9888 + int var10 = var8; // L: 9889 + if (var8 < var9) { // L: 9890 + var10 = var9; + } + + if (var10 != 0) { // L: 9891 + int var11 = (var6 << 16) / var10; // L: 9892 + int var12 = (var7 << 16) / var10; // L: 9893 + if (var12 <= var11) { // L: 9894 + var11 = -var11; + } else { + var12 = -var12; // L: 9895 + } + + int var13 = var5 * var12 >> 17; // L: 9896 + int var14 = var5 * var12 + 1 >> 17; // L: 9897 + int var15 = var5 * var11 >> 17; // L: 9898 + int var16 = var5 * var11 + 1 >> 17; // L: 9899 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9900 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9901 + int var17 = var0 + var13; // L: 9902 + int var18 = var0 - var14; // L: 9903 + int var19 = var0 + var6 - var14; // L: 9904 + int var20 = var0 + var6 + var13; // L: 9905 + int var21 = var15 + var1; // L: 9906 + int var22 = var1 - var16; // L: 9907 + int var23 = var7 + var1 - var16; // L: 9908 + int var24 = var15 + var7 + var1; // L: 9909 + Rasterizer3D.method3389(var17, var18, var19); // L: 9910 + Rasterizer3D.method3370(var21, var22, var23, var17, var18, var19, var4); // L: 9911 + Rasterizer3D.method3389(var17, var19, var20); // L: 9912 + Rasterizer3D.method3370(var21, var23, var24, var17, var19, var20, var4); // L: 9913 + } + } // L: 9914 } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 329c4721f7..3914fef7b4 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,21 +1,34 @@ import java.util.TimeZone; import 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("hc") +@ObfuscatedName("hf") @Implements("Calendar") public class Calendar { - @ObfuscatedName("n") + @ObfuscatedName("sh") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("f") @Export("MONTH_NAMES_ENGLISH_GERMAN") - public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("v") + static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("o") @Export("DAYS_OF_THE_WEEK") - public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("d") + static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("u") @Export("Calendar_calendar") - public static java.util.Calendar Calendar_calendar; + static java.util.Calendar Calendar_calendar; + @ObfuscatedName("ez") + @ObfuscatedGetter( + intValue = 722062749 + ) + @Export("js5Port") + static int js5Port; static { MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 7 @@ -23,23 +36,4 @@ public class Calendar { java.util.Calendar.getInstance(); // L: 21 Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 22 } // L: 23 - - @ObfuscatedName("lh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1734349622" - ) - static String method4153(String var0) { - PlayerType[] var1 = class69.PlayerType_values(); // L: 11644 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11645 - PlayerType var3 = var1[var2]; // L: 11646 - if (var3.modIcon != -1 && var0.startsWith(UserComparator10.method3580(var3.modIcon))) { // L: 11648 11649 - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11650 - break; - } - } - - return var0; // L: 11657 - } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 3b3c5478e9..3d089de380 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,26 +1,27 @@ import java.awt.Component; import java.awt.Graphics; +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("bq") +@ObfuscatedName("ai") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = 2077405845 - ) - static int field439; - @ObfuscatedName("lz") + @ObfuscatedName("pj") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lln;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("n") + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("a") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("eo") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("f") @Export("component") Component component; @@ -36,57 +37,76 @@ public final class Canvas extends java.awt.Canvas { this.component.paint(var1); // L: 19 } // L: 20 - @ObfuscatedName("aw") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-866196004" + descriptor = "(Lig;IIIBZI)V", + garbageValue = "-501107063" ) - static int method935(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3273 - } + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 223 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 224 + if (var8 == null) { // L: 225 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 226 + if (var8 == null) { // L: 227 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 228 + if (var8 != null) { // L: 229 + if (var5) { // L: 230 + var8.removeDual(); // L: 231 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 232 + --NetCache.NetCache_pendingWritesCount; // L: 233 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 234 + } - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "-614885261" - ) - @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: 7245 + } else { + if (!var5) { // L: 238 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 239 + if (var8 != null) { // L: 240 + return; + } + } - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7246 7247 7252 - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7248 - var9 = var10; // L: 7249 - break; + var8 = new NetFileRequest(); // L: 242 + var8.archive = var0; // L: 243 + var8.crc = var3; // L: 244 + var8.padding = var4; // L: 245 + if (var5) { // L: 246 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 247 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 248 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 251 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 252 + ++NetCache.NetCache_pendingWritesCount; // L: 253 + } + + } } } + } // L: 236 255 - if (var9 == null) { // L: 7254 - var9 = new PendingSpawn(); // L: 7255 - var9.plane = var0; // L: 7256 - var9.type = var3; // L: 7257 - var9.x = var1; // L: 7258 - var9.y = var2; // L: 7259 - WorldMapElement.method4592(var9); // L: 7260 - Client.pendingSpawns.addFirst(var9); // L: 7261 - } - - var9.id = var4; // L: 7263 - var9.field948 = var5; // L: 7264 - var9.orientation = var6; // L: 7265 - var9.delay = var7; // L: 7266 - var9.hitpoints = var8; // L: 7267 - } // L: 7268 - - @ObfuscatedName("kb") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-54323362" + garbageValue = "-1588134058" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 11468 - var0.packetBuffer.writeByte(0); // L: 11469 - Client.packetWriter.addNode(var0); // L: 11470 - } // L: 11471 + static void method481() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 208 + Login.currentLoginField = 1; // L: 209 + } else { + Login.currentLoginField = 0; // L: 212 + } + + } // L: 214 + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "113" + ) + @Export("updateSoundEffectVolume") + static final void updateSoundEffectVolume(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11175 + Login.clientPreferences.soundEffectsVolume = var0; // L: 11176 + Message.savePreferences(); // L: 11177 + } // L: 11178 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index f060628a30..6aaeb3ccb5 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,165 +4,140 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("ca") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("hr") + @ObfuscatedName("g") + public static short[][] field1086; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Llm;" + descriptor = "Llj;" ) - @Export("mapDotSprites") - static SpritePixels[] mapDotSprites; - @ObfuscatedName("v") + static Bounds field1084; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lbd;" + descriptor = "[Lbs;" ) @Export("messages") Message[] messages; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1722504417 + intValue = 93372497 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; // L: 83 - } // L: 86 + this.messages = new Message[100]; // L: 81 + } // L: 84 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbd;", - garbageValue = "1561043824" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbs;", + garbageValue = "20" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; // L: 89 + Message var5 = this.messages[99]; // L: 87 - for (int var6 = this.count; var6 > 0; --var6) { // L: 90 - if (var6 != 100) { // L: 91 - this.messages[var6] = this.messages[var6 - 1]; // L: 92 + for (int var6 = this.count; var6 > 0; --var6) { // L: 88 + if (var6 != 100) { // L: 89 + this.messages[var6] = this.messages[var6 - 1]; // L: 90 } } - if (var5 == null) { // L: 94 + if (var5 == null) { // L: 92 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); // L: 96 - var5.removeDual(); // L: 97 - var5.set(var1, var2, var4, var3); // L: 98 + var5.remove(); // L: 94 + var5.removeDual(); // L: 95 + var5.set(var1, var2, var4, var3); // L: 96 } - this.messages[0] = var5; // L: 100 - if (this.count < 100) { // L: 101 + this.messages[0] = var5; // L: 98 + if (this.count < 100) { // L: 99 ++this.count; } - return var5; // L: 102 + return var5; // L: 100 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lbd;", - garbageValue = "-55839716" + descriptor = "(II)Lbs;", + garbageValue = "1201057009" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 106 107 + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 104 105 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2110362731" + descriptor = "(S)I", + garbageValue = "2861" ) @Export("size") int size() { - return this.count; // L: 111 + return this.count; // L: 109 } - @ObfuscatedName("v") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZI)[B", - garbageValue = "488468248" + descriptor = "(II)I", + garbageValue = "1715360982" ) - public static byte[] method2405(Object var0, boolean var1) { - if (var0 == null) { // L: 21 - return null; - } else if (var0 instanceof byte[]) { // L: 22 - byte[] var3 = (byte[])((byte[])var0); // L: 23 - return var1 ? UrlRequester.method3460(var3) : var3; // L: 24 - } else if (var0 instanceof AbstractByteArrayCopier) { // L: 27 - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 28 - return var2.get(); // L: 29 + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73 + if (var1 == null) { // L: 74 + return -1; } else { - throw new IllegalArgumentException(); // L: 31 + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76 } } - @ObfuscatedName("y") + @ObfuscatedName("jg") @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;Ljava/lang/String;I)Lly;", - garbageValue = "591050656" + descriptor = "(Lhu;I)V", + garbageValue = "-466644748" ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 121 - int var4 = var0.getFileId(var3, var2); // L: 122 - byte[] var7 = var0.takeFile(var3, var4); // L: 127 - boolean var6; - if (var7 == null) { // L: 128 - var6 = false; // L: 129 - } else { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var7); // L: 132 - var6 = true; // L: 133 - } - - IndexedSprite var5; - if (!var6) { // L: 135 - var5 = null; // L: 136 - } else { - var5 = ApproximateRouteStrategy.method1304(); // L: 139 - } - - return var5; // L: 141 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lcq;I)V", - garbageValue = "291320616" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1526 - Client.isMembersWorld = var0.isMembersOnly(); // L: 1527 - boolean var1 = var0.isMembersOnly(); // L: 1528 - if (var1 != Bounds.ItemDefinition_inMembersWorld) { // L: 1530 - ItemComposition.ItemDefinition_cached.clear(); // L: 1532 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 1533 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 1534 - Bounds.ItemDefinition_inMembersWorld = var1; // L: 1536 + static final void method2017(Widget var0) { + int var1 = var0.contentType; // L: 11252 + if (var1 == 324) { // L: 11253 + if (Client.field871 == -1) { // L: 11254 + Client.field871 = var0.spriteId2; // L: 11255 + Client.field713 = var0.spriteId; // L: 11256 } - } - if (var0.properties != Client.worldProperties) { // L: 1540 - Archive var3 = ModeWhere.archive8; // L: 1541 - int var2 = var0.properties; // L: 1542 - if ((var2 & 536870912) != 0) { // L: 1544 - Login.logoSprite = SpriteBuffer_getIndexedSpriteByName(var3, "logo_deadman_mode", ""); // L: 1545 - } else if ((var2 & 1073741824) != 0) { // L: 1547 - Login.logoSprite = SpriteBuffer_getIndexedSpriteByName(var3, "logo_seasonal_mode", ""); // L: 1548 + if (Client.playerAppearance.isFemale) { // L: 11258 + var0.spriteId2 = Client.field871; } else { - Login.logoSprite = SpriteBuffer_getIndexedSpriteByName(var3, "logo", ""); // L: 1551 + var0.spriteId2 = Client.field713; // L: 11259 } - } - MusicPatchNode.worldHost = var0.host; // L: 1555 - Client.worldId = var0.id; // L: 1556 - Client.worldProperties = var0.properties; // L: 1557 - MouseRecorder.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1558 - class171.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1559 - DynamicObject.currentPort = MouseRecorder.worldPort; // L: 1560 - } // L: 1561 -} \ No newline at end of file + } else if (var1 == 325) { // L: 11262 + if (Client.field871 == -1) { // L: 11263 + Client.field871 = var0.spriteId2; // L: 11264 + Client.field713 = var0.spriteId; // L: 11265 + } + + if (Client.playerAppearance.isFemale) { // L: 11267 + var0.spriteId2 = Client.field713; + } else { + var0.spriteId2 = Client.field871; // L: 11268 + } + + } else if (var1 == 327) { // L: 11271 + var0.modelAngleX = 150; // L: 11272 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11273 + var0.modelType = 5; // L: 11274 + var0.modelId = 0; // L: 11275 + } else if (var1 == 328) { // L: 11278 + var0.modelAngleX = 150; // L: 11279 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11280 + var0.modelType = 5; // L: 11281 + var0.modelId = 1; // L: 11282 + } + } // L: 11260 11269 11276 11283 11285 +} diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index c5cac37cea..673469d0a3 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,78 +4,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("lb") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("v") + @ObfuscatedName("gx") + @ObfuscatedGetter( + intValue = -813950429 + ) + static int field3818; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkg;" + descriptor = "Lla;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("l") + @ObfuscatedName("p") @Export("name") public String name; - @ObfuscatedName("s") + @ObfuscatedName("b") @Export("owner") public String owner; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("minKick") public byte minKick; - @ObfuscatedName("a") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1770422849 + intValue = 1749202535 ) @Export("rank") public int rank; - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 348775717 + intValue = -1051245869 ) - int field3671; + int field3824; @ObfuscatedSignature( - descriptor = "(Lml;Lkg;)V" + descriptor = "(Lmf;Lla;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); // L: 18 this.name = null; // L: 11 this.owner = null; // L: 12 - this.field3671 = 1; // L: 15 + this.field3824 = 1; // L: 15 this.loginType = var1; // L: 19 this.localUser = var2; // L: 20 } // L: 21 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljn;", - garbageValue = "-315842787" + descriptor = "(I)Llt;", + garbageValue = "-1522637653" ) @Export("newInstance") User newInstance() { return new ClanMate(); // L: 24 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)[Ljn;", - garbageValue = "1723641195" + descriptor = "(II)[Llt;", + garbageValue = "1232560537" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; // L: 28 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1893983659" + garbageValue = "-1170592676" ) @Export("readName") final void readName(String var1) { @@ -98,11 +103,11 @@ public class ClanChat extends UserList { } } - while (0L == var5 % 37L && var5 != 0L) { // L: 46 + while (var5 % 37L == 0L && 0L != var5) { // L: 46 var5 /= 37L; } - String var10 = Messages.base37DecodeLong(var5); // L: 49 + String var10 = Varcs.base37DecodeLong(var5); // L: 49 if (var10 == null) { // L: 50 var10 = ""; } @@ -110,10 +115,10 @@ public class ClanChat extends UserList { this.name = var10; // L: 53 } // L: 54 - @ObfuscatedName("bk") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-197094825" ) @Export("setOwner") final void setOwner(String var1) { @@ -136,11 +141,11 @@ public class ClanChat extends UserList { } } - while (var5 % 37L == 0L && 0L != var5) { // L: 71 + while (0L == var5 % 37L && 0L != var5) { // L: 71 var5 /= 37L; } - String var10 = Messages.base37DecodeLong(var5); // L: 74 + String var10 = Varcs.base37DecodeLong(var5); // L: 74 if (var10 == null) { // L: 75 var10 = ""; } @@ -148,138 +153,166 @@ public class ClanChat extends UserList { this.owner = var10; // L: 78 } // L: 79 - @ObfuscatedName("bu") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "-9" + descriptor = "(Lnu;I)V", + garbageValue = "-872249620" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 long var2 = var1.readLong(); // L: 83 - long var5 = var2; // L: 85 - String var4; - int var7; - if (var2 > 0L && var2 < 6582952005840035281L) { // L: 87 - if (var2 % 37L == 0L) { // L: 91 - var4 = null; // L: 92 - } else { - var7 = 0; // L: 95 + this.readName(class11.method196(var2)); // L: 84 + this.minKick = var1.readByte(); // L: 85 + int var4 = var1.readUnsignedByte(); // L: 86 + if (var4 != 255) { // L: 87 + this.clear(); // L: 88 - for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 96 97 99 - ++var7; // L: 98 - } - - StringBuilder var10 = new StringBuilder(var7); // L: 101 - - while (0L != var5) { // L: 102 - long var11 = var5; // L: 103 - var5 /= 37L; // L: 104 - var10.append(class299.base37Table[(int)(var11 - var5 * 37L)]); // L: 105 - } - - var4 = var10.reverse().toString(); // L: 107 - } - } else { - var4 = null; // L: 88 - } - - this.readName(var4); // L: 109 - this.minKick = var1.readByte(); // L: 110 - var7 = var1.readUnsignedByte(); // L: 111 - if (var7 != 255) { // L: 112 - this.clear(); // L: 113 - - for (int var13 = 0; var13 < var7; ++var13) { // L: 114 - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 115 - int var14 = var1.readUnsignedShort(); // L: 116 - var9.set(var14, ++this.field3671 - 1); // L: 117 - var9.rank = var1.readByte(); // L: 118 - var1.readStringCp1252NullTerminated(); // L: 119 - this.isLocalPlayer(var9); // L: 120 + for (int var5 = 0; var5 < var4; ++var5) { // L: 89 + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 90 + int var7 = var1.readUnsignedShort(); // L: 91 + var6.set(var7, ++this.field3824 - 1); // L: 92 + var6.rank = var1.readByte(); // L: 93 + var1.readStringCp1252NullTerminated(); // L: 94 + this.isLocalPlayer(var6); // L: 95 } } - } // L: 122 + } // L: 97 - @ObfuscatedName("bo") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-941337557" + descriptor = "(Lnu;I)V", + garbageValue = "-2086644068" ) - public final void method5428(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 125 - int var3 = var1.readUnsignedShort(); // L: 126 - byte var4 = var1.readByte(); // L: 127 - boolean var5 = false; // L: 128 - if (var4 == -128) { // L: 129 + public final void method5653(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 100 + int var3 = var1.readUnsignedShort(); // L: 101 + byte var4 = var1.readByte(); // L: 102 + boolean var5 = false; // L: 103 + if (var4 == -128) { // L: 104 var5 = true; } ClanMate var6; - if (var5) { // L: 130 - if (this.getSize() == 0) { // L: 131 + if (var5) { // L: 105 + if (this.getSize() == 0) { // L: 106 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 132 - if (var6 != null && var6.getWorld() == var3) { // L: 133 - this.remove(var6); // L: 134 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 107 + if (var6 != null && var6.getWorld() == var3) { // L: 108 + this.remove(var6); // L: 109 } } else { - var1.readStringCp1252NullTerminated(); // L: 138 - var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 139 - if (var6 == null) { // L: 140 - if (this.getSize() > super.capacity) { // L: 141 + var1.readStringCp1252NullTerminated(); // L: 113 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 114 + if (var6 == null) { // L: 115 + if (this.getSize() > super.capacity) { // L: 116 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 142 + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 117 } - var6.set(var3, ++this.field3671 - 1); // L: 144 - var6.rank = var4; // L: 145 - this.isLocalPlayer(var6); // L: 146 + var6.set(var3, ++this.field3824 - 1); // L: 119 + var6.rank = var4; // L: 120 + this.isLocalPlayer(var6); // L: 121 } - } // L: 148 + } // L: 123 - @ObfuscatedName("cv") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "17506" + descriptor = "(I)V", + garbageValue = "1868427261" ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 151 - ((ClanMate)this.get(var1)).clearIsFriend(); // L: 152 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 126 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 127 } - } // L: 154 + } // L: 129 - @ObfuscatedName("cd") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1186051536" + descriptor = "(B)V", + garbageValue = "-109" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 157 - ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 158 + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 132 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 133 } - } // L: 160 + } // L: 135 - @ObfuscatedName("cq") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljb;I)V", - garbageValue = "1217977801" + descriptor = "(Lly;I)V", + garbageValue = "-409410599" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { // L: 163 + if (var1.getUsername().equals(this.localUser.username())) { // L: 138 this.rank = var1.rank; } - } // L: 164 + } // L: 139 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lir;Lir;Ljava/lang/String;Ljava/lang/String;I)Lkq;", + garbageValue = "762686546" + ) + public static Font method5655(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 182 + int var5 = var0.getFileId(var4, var3); // L: 183 + return class236.method4378(var0, var1, var4, var5); // L: 184 + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + descriptor = "(Lhu;I)Z", + garbageValue = "633331288" + ) + static final boolean method5644(Widget var0) { + int var1 = var0.contentType; // L: 11332 + if (var1 == 205) { // L: 11333 + Client.logoutTimer = 250; // L: 11334 + return true; // L: 11335 + } else { + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { // L: 11337 + var2 = (var1 - 300) / 2; // L: 11338 + var3 = var1 & 1; // L: 11339 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11340 + } + + if (var1 >= 314 && var1 <= 323) { // L: 11342 + var2 = (var1 - 314) / 2; // L: 11343 + var3 = var1 & 1; // L: 11344 + Client.playerAppearance.method4205(var2, var3 == 1); // L: 11345 + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 11347 + } + + if (var1 == 325) { // L: 11348 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 11349 + PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); // L: 11351 + Client.playerAppearance.write(var4.packetBuffer); // L: 11352 + Client.packetWriter.addNode(var4); // L: 11353 + return true; // L: 11354 + } else { + return false; // L: 11356 + } + } + } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index d49382a67d..0e15f3a4ea 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("ly") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("friend") TriBool friend; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; // L: 7 } // L: 9 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1122963499" + descriptor = "(S)V", + garbageValue = "9619" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; // L: 12 } // L: 13 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1693898868" + garbageValue = "253215960" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; // L: 19 } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-932162684" + descriptor = "(B)V", + garbageValue = "24" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = InterfaceParent.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + this.friend = class13.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1113333247" + garbageValue = "2042295108" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; // L: 27 } // L: 28 - @ObfuscatedName("y") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1838909924" + garbageValue = "1304544049" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +82,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; // L: 34 } - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1629114941" + descriptor = "(B)V", + garbageValue = "1" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = InterfaceParent.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + this.ignored = class13.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 } // L: 39 } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 3fa3ff79d7..7fe5fca631 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -9,1913 +9,1959 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameEngine implements Usernamed { - @ObfuscatedName("nj") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("clickedWidget") - static Widget clickedWidget; - @ObfuscatedName("oy") + @ObfuscatedName("om") @ObfuscatedGetter( - intValue = -2130667967 - ) - static int field868; - @ObfuscatedName("of") - @ObfuscatedGetter( - intValue = 1098573147 + intValue = -682660239 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("ot") + @ObfuscatedName("oj") @ObfuscatedGetter( - longValue = 2641813586690994541L + intValue = -747091901 ) - static long field938; - @ObfuscatedName("ok") - static boolean[] field816; - @ObfuscatedName("oq") - static boolean[] field871; - @ObfuscatedName("ou") - static boolean[] field827; - @ObfuscatedName("no") - static boolean field754; - @ObfuscatedName("na") + static int field810; + @ObfuscatedName("pl") @ObfuscatedGetter( - intValue = -1143946983 + longValue = 5382423932192303621L ) - @Export("cycleCntr") - static int cycleCntr; - @ObfuscatedName("pz") + static long field819; + @ObfuscatedName("qy") + static boolean field842; + @ObfuscatedName("oo") + static boolean[] field811; + @ObfuscatedName("od") + static boolean[] field704; + @ObfuscatedName("og") + static boolean[] field812; + @ObfuscatedName("pv") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("ob") + @ObfuscatedName("tn") @ObfuscatedGetter( - intValue = -1002353487 + intValue = 1943798093 ) - static int field857; - @ObfuscatedName("sw") - @ObfuscatedGetter( - intValue = 1717158947 - ) - public static int field674; - @ObfuscatedName("nf") - static boolean field912; - @ObfuscatedName("qy") - static boolean field899; - @ObfuscatedName("nl") - @ObfuscatedGetter( - intValue = -1921114135 - ) - @Export("widgetClickX") - static int widgetClickX; - @ObfuscatedName("ni") - @ObfuscatedGetter( - intValue = -1056488497 - ) - @Export("widgetClickY") - static int widgetClickY; - @ObfuscatedName("nx") - @ObfuscatedGetter( - intValue = -1709629427 - ) - static int field714; - @ObfuscatedName("oh") + public static int field623; + @ObfuscatedName("oq") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("nc") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("clickedWidgetParent") - static Widget clickedWidgetParent; - @ObfuscatedName("oz") + @ObfuscatedName("px") @Export("rootWidgetXs") static int[] rootWidgetXs; - @ObfuscatedName("ox") + @ObfuscatedName("pi") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("nb") + @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = 1241551415 - ) - static int field844; - @ObfuscatedName("nk") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("viewportWidget") - static Widget viewportWidget; - @ObfuscatedName("oo") - @ObfuscatedGetter( - intValue = -129717857 + intValue = 1273380035 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("on") + @ObfuscatedName("pf") @Export("rootWidgetHeights") static int[] rootWidgetHeights; - @ObfuscatedName("mz") - @ObfuscatedGetter( - intValue = -852505975 - ) - @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("oj") + @ObfuscatedName("pb") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("to") - static int[] field708; - @ObfuscatedName("tl") - static int[] field859; - @ObfuscatedName("tz") + @ObfuscatedName("tt") @ObfuscatedSignature( - descriptor = "Lba;" + descriptor = "Lbm;" ) - static final ApproximateRouteStrategy field935; - @ObfuscatedName("oi") + static final ApproximateRouteStrategy field878; + @ObfuscatedName("op") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("nr") + @ObfuscatedName("qi") @ObfuscatedGetter( - intValue = 2048797241 - ) - static int field784; - @ObfuscatedName("ns") - @ObfuscatedGetter( - intValue = -1047647049 - ) - static int field847; - @ObfuscatedName("ql") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("nh") - @Export("changedVarps") - static int[] changedVarps; - @ObfuscatedName("np") - @ObfuscatedGetter( - intValue = -982241293 - ) - @Export("changedVarpCount") - static int changedVarpCount; - @ObfuscatedName("nq") - @Export("isDraggingWidget") - static boolean isDraggingWidget; - @ObfuscatedName("qb") - @ObfuscatedGetter( - intValue = -1138448215 - ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("qz") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("mx") - @ObfuscatedGetter( - intValue = 1334358693 - ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("my") - @ObfuscatedGetter( - intValue = 395200187 - ) - @Export("weight") - static int weight; - @ObfuscatedName("qg") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qt") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("qh") - @ObfuscatedSignature( - descriptor = "[Ldb;" - ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("ow") - @ObfuscatedGetter( - intValue = -1484403107 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("qa") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("sn") - @ObfuscatedGetter( - intValue = 1721716287 - ) - static int field850; - @ObfuscatedName("sq") - @ObfuscatedSignature( - descriptor = "Lhu;" - ) - @Export("playerAppearance") - static PlayerComposition playerAppearance; - @ObfuscatedName("sp") - @ObfuscatedGetter( - intValue = 1981759353 - ) - static int field927; - @ObfuscatedName("nv") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("rj") - static boolean[] field907; - @ObfuscatedName("rp") - static int[] field908; - @ObfuscatedName("qm") - @ObfuscatedGetter( - intValue = 219093963 + intValue = -1162506743 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("re") - static int[] field909; - @ObfuscatedName("qc") + @ObfuscatedName("qu") @ObfuscatedGetter( - intValue = 398494491 + intValue = -642989317 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("sd") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("mh") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("rm") - static int[] field799; - @ObfuscatedName("ss") + @ObfuscatedName("qe") @ObfuscatedGetter( - intValue = -1667351587 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("rc") - static int[] field911; - @ObfuscatedName("qx") - @ObfuscatedGetter( - intValue = 427449579 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("ms") - @ObfuscatedGetter( - intValue = 1924848015 - ) - @Export("chatEffects") - static int chatEffects; - @ObfuscatedName("mq") - @ObfuscatedGetter( - intValue = 588534727 - ) - static int field829; - @ObfuscatedName("pf") - @ObfuscatedGetter( - intValue = -1767216407 - ) - static int field889; - @ObfuscatedName("pj") - @ObfuscatedGetter( - longValue = -941531037774167647L - ) - static long field888; - @ObfuscatedName("mo") - @ObfuscatedGetter( - intValue = -316896937 - ) - @Export("followerIndex") - static int followerIndex; - @ObfuscatedName("sj") - @ObfuscatedSignature( - descriptor = "Lmd;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("ov") - @ObfuscatedGetter( - intValue = -245289527 - ) - static int field861; - @ObfuscatedName("nm") - @Export("changedItemContainers") - static int[] changedItemContainers; - @ObfuscatedName("ps") - @ObfuscatedGetter( - intValue = -1917805707 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -1661094869 - ) - static int field870; - @ObfuscatedName("ra") - static short field779; - @ObfuscatedName("ru") - static short field913; - @ObfuscatedName("rn") - static short field918; - @ObfuscatedName("qd") - @ObfuscatedGetter( - intValue = -1030278911 + intValue = -1926454051 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("ry") - static short field846; - @ObfuscatedName("pn") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("rt") - static short field690; - @ObfuscatedName("sa") - @ObfuscatedGetter( - intValue = -2031812647 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("rf") - static short field916; - @ObfuscatedName("ro") - @ObfuscatedGetter( - intValue = -841535669 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("so") - @ObfuscatedGetter( - intValue = 1712073895 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("pd") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("qi") - @ObfuscatedSignature( - descriptor = "[Llm;" - ) - @Export("mapIcons") - static SpritePixels[] mapIcons; - @ObfuscatedName("rx") - @ObfuscatedGetter( - intValue = 817591115 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("rr") - @ObfuscatedGetter( - intValue = -748247727 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("rs") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rw") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("pr") - @ObfuscatedGetter( - intValue = 1987074699 - ) - static int field885; + @ObfuscatedName("td") + static int[] field879; + @ObfuscatedName("tq") + static int[] field726; @ObfuscatedName("sk") - @ObfuscatedGetter( - intValue = -321864807 - ) - static int field934; - @ObfuscatedName("py") - static long[] field883; - @ObfuscatedName("pb") - static int[] field738; - @ObfuscatedName("pk") - static int[] field886; - @ObfuscatedName("om") @ObfuscatedSignature( - descriptor = "Lji;" - ) - static NodeDeque field660; - @ObfuscatedName("or") - @ObfuscatedSignature( - descriptor = "Lji;" - ) - static NodeDeque field865; - @ObfuscatedName("os") - @ObfuscatedGetter( - intValue = 337640139 - ) - static int field858; - @ObfuscatedName("pa") - @ObfuscatedGetter( - intValue = 1218379241 - ) - static int field884; - @ObfuscatedName("pg") - @ObfuscatedGetter( - intValue = 654875049 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("pp") - @ObfuscatedGetter( - intValue = -455870279 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("ne") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("mm") - @ObfuscatedGetter( - intValue = 2010628921 - ) - static int field705; - @ObfuscatedName("mv") - @ObfuscatedGetter( - intValue = -852143357 - ) - static int field699; - @ObfuscatedName("sb") - @ObfuscatedSignature( - descriptor = "[Lg;" + descriptor = "[Ljn;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("od") + @ObfuscatedName("oi") @ObfuscatedGetter( - intValue = 612039895 + intValue = 1247880161 ) - static int field710; - @ObfuscatedName("oc") - @ObfuscatedGetter( - intValue = -1152257297 - ) - static int field860; - @ObfuscatedName("ng") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("ol") - @ObfuscatedGetter( - intValue = 575315923 - ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("pi") - static int[] field879; - @ObfuscatedName("pe") - static String field882; - @ObfuscatedName("sz") + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("rw") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("qc") @ObfuscatedSignature( - descriptor = "Lbu;" + descriptor = "[Lp;" + ) + static class3[] field820; + @ObfuscatedName("rj") + static boolean[] field850; + @ObfuscatedName("sq") + @ObfuscatedGetter( + intValue = 1954140693 + ) + static int field871; + @ObfuscatedName("ts") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("sv") + @ObfuscatedSignature( + descriptor = "Lht;" + ) + @Export("playerAppearance") + static PlayerComposition playerAppearance; + @ObfuscatedName("tj") + @ObfuscatedGetter( + intValue = -1745248339 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("sj") + @ObfuscatedGetter( + intValue = 48563957 + ) + static int field713; + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = -116212155 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("rq") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("rk") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("rm") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("rc") + @ObfuscatedSignature( + descriptor = "[Lan;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("ru") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("qx") + @ObfuscatedGetter( + intValue = -381302747 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("pt") + static long[] field689; + @ObfuscatedName("qt") + @ObfuscatedGetter( + intValue = -163319865 + ) + static int field833; + @ObfuscatedName("po") + @ObfuscatedGetter( + longValue = 2385662544800034671L + ) + static long field678; + @ObfuscatedName("pn") + @ObfuscatedGetter( + intValue = 1846796199 + ) + static int field760; + @ObfuscatedName("st") + @ObfuscatedSignature( + descriptor = "Lmi;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("ra") + static short field855; + @ObfuscatedName("qf") + @ObfuscatedGetter( + intValue = 454240781 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("sd") + static short field856; + @ObfuscatedName("sa") + static short field707; + @ObfuscatedName("qn") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("sr") + static short field862; + @ObfuscatedName("ss") + static short field742; + @ObfuscatedName("sw") + @ObfuscatedGetter( + intValue = 295711759 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("se") + static short field859; + @ObfuscatedName("sn") + @ObfuscatedGetter( + intValue = -64925191 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("qp") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("qm") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("mapIcons") + static SpritePixels[] mapIcons; + @ObfuscatedName("sb") + @ObfuscatedGetter( + intValue = -272940265 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = 544272473 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("pr") + @ObfuscatedGetter( + intValue = -163290725 + ) + static int field827; + @ObfuscatedName("sx") + @ObfuscatedGetter( + intValue = 1561763743 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("ti") + @ObfuscatedGetter( + intValue = -1962349553 + ) + static int field740; + @ObfuscatedName("sp") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("sf") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("pe") + static int[] field792; + @ObfuscatedName("of") + @ObfuscatedSignature( + descriptor = "Lju;" + ) + static NodeDeque field806; + @ObfuscatedName("pu") + static int[] field828; + @ObfuscatedName("ol") + @ObfuscatedSignature( + descriptor = "Lju;" + ) + static NodeDeque field688; + @ObfuscatedName("rg") + static int[] field698; + @ObfuscatedName("rp") + static int[] field601; + @ObfuscatedName("rn") + static int[] field853; + @ObfuscatedName("rh") + static int[] field854; + @ObfuscatedName("ql") + @ObfuscatedSignature( + descriptor = "[Lm;" + ) + static class11[] field831; + @ObfuscatedName("py") + @ObfuscatedGetter( + intValue = 241170089 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("pz") + @ObfuscatedGetter( + intValue = -1079120289 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("pc") + static int[] field821; + @ObfuscatedName("pd") + static String field824; + @ObfuscatedName("so") + @ObfuscatedSignature( + descriptor = "Lbz;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; - @ObfuscatedName("oe") - @ObfuscatedGetter( - intValue = -687275157 + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Loh;" ) - @Export("chatCycle") - static int chatCycle; + @Export("leftTitleSprite") + static SpritePixels leftTitleSprite; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfe;" + descriptor = "[Lel;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ao") - static boolean field863; - @ObfuscatedName("bj") + @ObfuscatedName("ae") + static boolean field867; + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1878956735 + intValue = 552624005 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bn") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 839347685 + intValue = 2131247803 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bp") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1170422349 + intValue = -314365739 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bc") + @ObfuscatedName("ba") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1136397929 + intValue = -288951115 ) @Export("clientType") static int clientType; - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -2016510315 + intValue = 2088572863 ) - static int field667; - @ObfuscatedName("bg") + static int field605; + @ObfuscatedName("bq") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bm") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -196452763 + intValue = 284753475 ) @Export("gameState") static int gameState; @ObfuscatedName("ca") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cz") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = -1348493889 + intValue = 923749023 ) @Export("cycle") static int cycle; - @ObfuscatedName("cs") + @ObfuscatedName("cq") @ObfuscatedGetter( - longValue = -1640105390398986909L + longValue = -5043335151957037887L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 855740267 + intValue = 1203452297 ) - static int field675; - @ObfuscatedName("ci") + static int field875; + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = -1934473741 + intValue = -1304944871 ) - static int field687; - @ObfuscatedName("cy") + static int field759; + @ObfuscatedName("cv") @ObfuscatedGetter( - longValue = 7781100239728416583L + longValue = 5446174913048845565L ) - static long field853; - @ObfuscatedName("cm") + static long field851; + @ObfuscatedName("cj") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cc") + @ObfuscatedName("cy") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("co") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -685772431 + intValue = 1192352679 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cx") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -482349871 + intValue = -45138847 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cg") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 1334665879 + intValue = -1361076413 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("ch") + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -1077114245 + intValue = -1697851223 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cl") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 635139827 + intValue = -98255553 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cw") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -2046511493 + intValue = -538636661 ) @Export("hintArrowY") static int hintArrowY; @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 1644283943 + intValue = -1932075829 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("dx") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = -1136931287 + intValue = -1162986359 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("do") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = 15096337 + intValue = 1666549933 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("di") + @ObfuscatedName("dg") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldy;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dk") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "Lci;" + descriptor = "Ldy;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("db") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = 1514300673 + intValue = 296972281 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dj") + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = 1809473469 + intValue = -2004840955 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dh") + @ObfuscatedName("dz") @ObfuscatedGetter( - intValue = 1130532293 + intValue = -1450698847 ) - static int field761; - @ObfuscatedName("ef") + static int field630; + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = -1552699267 + intValue = 1573978957 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("eh") + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = 1808495023 + intValue = 1602941259 ) @Export("loginState") static int loginState; - @ObfuscatedName("et") + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = -1051745421 + intValue = -1017174837 ) - static int field696; - @ObfuscatedName("ec") + static int field633; + @ObfuscatedName("ey") @ObfuscatedGetter( - intValue = -1576620503 + intValue = -798312209 ) - static int field786; - @ObfuscatedName("ev") + static int field634; + @ObfuscatedName("eu") @ObfuscatedGetter( - intValue = -1472029095 + intValue = 189453593 ) - static int field701; - @ObfuscatedName("eq") - @ObfuscatedSignature( - descriptor = "Lfw;" - ) - static class169 field661; - @ObfuscatedName("ej") - @Export("Login_isUsernameRemembered") - static boolean Login_isUsernameRemembered; - @ObfuscatedName("ed") - @ObfuscatedSignature( - descriptor = "Lco;" - ) - @Export("secureRandomFuture") - static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fa") - @Export("randomDatData") - static byte[] randomDatData; - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "[Lca;" - ) - @Export("npcs") - static NPC[] npcs; - @ObfuscatedName("fq") - @ObfuscatedGetter( - intValue = 765821471 - ) - @Export("npcCount") - static int npcCount; - @ObfuscatedName("fn") - @Export("npcIndices") - static int[] npcIndices; - @ObfuscatedName("fc") - @ObfuscatedGetter( - intValue = 263389361 - ) - static int field725; - @ObfuscatedName("fg") - static int[] field697; - @ObfuscatedName("fk") + static int field635; + @ObfuscatedName("en") @ObfuscatedSignature( descriptor = "Ldx;" ) + static class125 field636; + @ObfuscatedName("ed") + @Export("Login_isUsernameRemembered") + static boolean Login_isUsernameRemembered; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "Lcz;" + ) + @Export("secureRandomFuture") + static SecureRandomFuture secureRandomFuture; + @ObfuscatedName("fy") + @Export("randomDatData") + static byte[] randomDatData; + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "[Ldo;" + ) + @Export("npcs") + static NPC[] npcs; + @ObfuscatedName("fl") + @ObfuscatedGetter( + intValue = -1634539077 + ) + @Export("npcCount") + static int npcCount; + @ObfuscatedName("fv") + @Export("npcIndices") + static int[] npcIndices; + @ObfuscatedName("fr") + @ObfuscatedGetter( + intValue = 1757350889 + ) + static int field645; + @ObfuscatedName("fw") + static int[] field646; + @ObfuscatedName("fk") + @ObfuscatedSignature( + descriptor = "Lep;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "Ldn;" + ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("ff") + @ObfuscatedName("fz") + @ObfuscatedSignature( + descriptor = "Lli;" + ) + static AbstractSocket field686; + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = 1659773339 + intValue = 734890615 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fd") - static boolean field712; + @ObfuscatedName("ft") + static boolean field737; @ObfuscatedName("fx") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fz") + @ObfuscatedName("fq") @ObfuscatedSignature( - descriptor = "Ljr;" + descriptor = "Lkh;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fm") + @ObfuscatedName("fd") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gt") + @ObfuscatedName("gk") @ObfuscatedGetter( - intValue = 464242229 + intValue = 1733290173 ) - static int field785; - @ObfuscatedName("gm") + static int field655; + @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = -2030893429 + intValue = -1750406597 ) - static int field717; - @ObfuscatedName("gq") + static int field656; + @ObfuscatedName("gn") @ObfuscatedGetter( - intValue = 987395951 + intValue = 1065721221 ) - static int field718; - @ObfuscatedName("ga") - @ObfuscatedGetter( - intValue = -642405077 - ) - static int field719; - @ObfuscatedName("gu") - @ObfuscatedGetter( - intValue = -176064215 - ) - static int field720; - @ObfuscatedName("gi") - @Export("isInInstance") - static boolean isInInstance; - @ObfuscatedName("gp") - @Export("instanceChunkTemplates") - static int[][][] instanceChunkTemplates; - @ObfuscatedName("gx") - static final int[] field724; + static int field657; @ObfuscatedName("gh") @ObfuscatedGetter( - intValue = 189676939 + intValue = 2141323521 ) - static int field808; - @ObfuscatedName("gg") - @ObfuscatedSignature( - descriptor = "[Llm;" - ) - @Export("headIconPkSprites") - static SpritePixels[] headIconPkSprites; - @ObfuscatedName("hf") + static int field752; + @ObfuscatedName("gb") @ObfuscatedGetter( - intValue = -64215021 + intValue = -906456671 ) - static int field727; - @ObfuscatedName("hc") + static int field659; + @ObfuscatedName("gf") + @Export("isInInstance") + static boolean isInInstance; + @ObfuscatedName("gw") + @Export("instanceChunkTemplates") + static int[][][] instanceChunkTemplates; + @ObfuscatedName("gm") + static final int[] field663; + @ObfuscatedName("gl") @ObfuscatedGetter( - intValue = -37136637 + intValue = 1694121313 ) - static int field777; - @ObfuscatedName("hg") + static int field799; + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = -466609539 + intValue = -1122631231 ) - static int field729; - @ObfuscatedName("hp") + static int field665; + @ObfuscatedName("hj") @ObfuscatedGetter( - intValue = -468186107 + intValue = -479029123 ) - static int field730; + static int field666; + @ObfuscatedName("hq") + @ObfuscatedGetter( + intValue = 1599811931 + ) + static int field667; @ObfuscatedName("hh") - static boolean field731; - @ObfuscatedName("ht") @ObfuscatedGetter( - intValue = 1576514889 + intValue = 785660529 + ) + static int field668; + @ObfuscatedName("hw") + static boolean field669; + @ObfuscatedName("hk") + @ObfuscatedGetter( + intValue = -76493703 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hx") + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -795362289 + intValue = 147847129 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hw") + @ObfuscatedName("hf") @ObfuscatedGetter( - intValue = -1632840885 + intValue = 206120351 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hl") + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = -1844659849 + intValue = -1232313345 ) @Export("camAngleDY") static int camAngleDY; @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = -1777101035 + intValue = -480575637 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hk") + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 1769284115 + intValue = -1057422407 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hi") + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 371434131 + intValue = -660688745 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("iq") + @ObfuscatedName("ie") @ObfuscatedGetter( - intValue = -1483884331 + intValue = 1806653119 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("ir") + @ObfuscatedName("iu") @ObfuscatedGetter( - intValue = -132229373 + intValue = 416588195 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("iu") + @ObfuscatedName("ip") @ObfuscatedGetter( - intValue = -1057458103 + intValue = 793641371 ) - static int field818; + static int field679; @ObfuscatedName("im") @ObfuscatedGetter( - intValue = 1233966987 + intValue = -1538078599 ) - static int field742; - @ObfuscatedName("ik") + static int field702; + @ObfuscatedName("ij") @ObfuscatedGetter( - intValue = -244545381 + intValue = -1065509781 ) - static int field743; - @ObfuscatedName("ig") + static int field681; + @ObfuscatedName("iz") @ObfuscatedGetter( - intValue = -1600677315 + intValue = 2029670705 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("iq") + @ObfuscatedGetter( + intValue = -1466920965 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("if") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = 537367085 + intValue = -1126512847 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; @ObfuscatedName("iy") @ObfuscatedGetter( - intValue = 549063475 + intValue = -320583695 ) - public static int field746; - @ObfuscatedName("ii") - static boolean field747; - @ObfuscatedName("io") - @ObfuscatedGetter( - intValue = -1997671203 - ) - static int field926; - @ObfuscatedName("ie") - static boolean field678; - @ObfuscatedName("ij") - @ObfuscatedGetter( - intValue = 1851941979 - ) - static int field880; - @ObfuscatedName("il") - @ObfuscatedGetter( - intValue = -1008480153 - ) - @Export("overheadTextCount") - static int overheadTextCount; - @ObfuscatedName("ic") - @ObfuscatedGetter( - intValue = 1307283333 - ) - @Export("overheadTextLimit") - static int overheadTextLimit; - @ObfuscatedName("ia") - @Export("overheadTextXs") - static int[] overheadTextXs; - @ObfuscatedName("is") - @Export("overheadTextYs") - static int[] overheadTextYs; - @ObfuscatedName("iw") - @Export("overheadTextAscents") - static int[] overheadTextAscents; + static int field684; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; + @ObfuscatedName("if") + static boolean field685; + @ObfuscatedName("ia") + @ObfuscatedGetter( + intValue = 1428883113 + ) + static int field826; + @ObfuscatedName("ig") + static boolean field687; + @ObfuscatedName("ic") + @ObfuscatedGetter( + intValue = -2048625487 + ) + static int field735; + @ObfuscatedName("ir") + @ObfuscatedGetter( + intValue = -952041977 + ) + @Export("overheadTextCount") + static int overheadTextCount; @ObfuscatedName("in") + @ObfuscatedGetter( + intValue = 1506427229 + ) + @Export("overheadTextLimit") + static int overheadTextLimit; + @ObfuscatedName("is") + @Export("overheadTextXs") + static int[] overheadTextXs; + @ObfuscatedName("iw") + @Export("overheadTextYs") + static int[] overheadTextYs; + @ObfuscatedName("iv") + @Export("overheadTextAscents") + static int[] overheadTextAscents; + @ObfuscatedName("io") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("ih") + @ObfuscatedName("ib") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("jl") + @ObfuscatedName("jt") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("jp") + @ObfuscatedName("jn") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("jx") + @ObfuscatedName("ja") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("jz") + @ObfuscatedName("jf") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("jg") + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -1014580553 + intValue = -1422454763 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jj") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = 946594095 + intValue = -1419535011 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("je") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = -1625567767 + intValue = 1293682241 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jy") + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = -2133468865 + intValue = -344110517 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jo") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = 950961469 + intValue = -45016791 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("js") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = -448019029 + intValue = 1968877359 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jd") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = 291298579 + intValue = 299893465 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jv") + @ObfuscatedName("ju") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jw") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 1260827455 + intValue = -308485147 ) - static int field770; - @ObfuscatedName("ju") + static int field708; + @ObfuscatedName("jp") @ObfuscatedGetter( - intValue = -939205371 + intValue = 1815166709 ) - static int field931; - @ObfuscatedName("jm") + static int field709; + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = -925019431 + intValue = 1995553501 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jt") + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = -1325030875 + intValue = -1701113733 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jk") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = 1709049139 + intValue = -1899145373 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jc") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = 971800427 + intValue = -1317847501 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; @ObfuscatedName("jq") - static boolean field776; - @ObfuscatedName("jr") + static boolean field714; + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = 1248603435 + intValue = 1705786143 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jb") + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = 1309202573 + intValue = -1564319989 ) - static int field778; - @ObfuscatedName("jh") + static int field716; + @ObfuscatedName("jd") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ku") + @ObfuscatedName("kf") @ObfuscatedSignature( - descriptor = "[Lbk;" + descriptor = "[Lcs;" ) @Export("players") static Player[] players; @ObfuscatedName("ky") @ObfuscatedGetter( - intValue = -728300783 + intValue = 507281317 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("kg") + @ObfuscatedName("kl") @ObfuscatedGetter( - intValue = -1425770135 + intValue = -1786300969 ) - static int field673; - @ObfuscatedName("km") + static int field720; + @ObfuscatedName("ka") @Export("renderSelf") static boolean renderSelf; @ObfuscatedName("kw") @ObfuscatedGetter( - intValue = -1928759915 + intValue = -1826358719 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kb") + @ObfuscatedName("kq") @ObfuscatedGetter( - intValue = 2056872733 + intValue = 1014585 ) - static int field851; - @ObfuscatedName("kf") - static int[] field845; - @ObfuscatedName("kz") + static int field723; + @ObfuscatedName("kx") + static int[] field724; + @ObfuscatedName("ks") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("kq") + @ObfuscatedName("ku") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("ki") + @ObfuscatedName("km") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kn") + @ObfuscatedName("kv") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kl") + @ObfuscatedName("kn") @ObfuscatedGetter( - intValue = -904891653 + intValue = -375939239 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("ks") + @ObfuscatedName("kp") @ObfuscatedSignature( - descriptor = "[[[Lji;" + descriptor = "[[[Lju;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kc") + @ObfuscatedName("kr") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; @ObfuscatedName("kh") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kd") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kx") + @ObfuscatedName("kk") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kv") + @ObfuscatedName("ki") @Export("levels") static int[] levels; - @ObfuscatedName("lk") + @ObfuscatedName("le") @Export("experience") static int[] experience; - @ObfuscatedName("lx") + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = -1636059503 + intValue = -343514321 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("lh") + @ObfuscatedName("la") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("ld") + @ObfuscatedName("lt") @ObfuscatedGetter( - intValue = -1929557275 + intValue = -676387903 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lw") + @ObfuscatedName("ll") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lv") + @ObfuscatedName("lf") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("ln") + @ObfuscatedName("lz") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("la") + @ObfuscatedName("lg") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lr") + @ObfuscatedName("ls") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("lg") + @ObfuscatedName("lw") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lj") + @ObfuscatedName("li") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lq") + @ObfuscatedName("lo") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lb") + @ObfuscatedName("ld") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("lo") + @ObfuscatedName("lp") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lc") + @ObfuscatedName("ln") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lp") + @ObfuscatedName("lh") @ObfuscatedGetter( - intValue = -2061703801 + intValue = 351354593 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("ly") + @ObfuscatedName("lc") @ObfuscatedGetter( - intValue = 505475035 + intValue = -47840029 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("mw") + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = 1736446689 + intValue = 233385425 ) - static int field815; - @ObfuscatedName("mi") + static int field753; + @ObfuscatedName("ms") @ObfuscatedGetter( - intValue = 244031685 + intValue = -796964637 ) - static int field925; - @ObfuscatedName("md") + static int field696; + @ObfuscatedName("mx") @ObfuscatedGetter( - intValue = -155496829 + intValue = -1862250245 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("mj") + @ObfuscatedName("ma") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mg") + @ObfuscatedName("mc") @ObfuscatedGetter( - intValue = 1221280359 + intValue = 1559657187 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("ma") + @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = -1666449457 + intValue = -1973847065 ) - static int field821; - @ObfuscatedName("mk") + static int field874; + @ObfuscatedName("mw") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("ml") + @ObfuscatedName("mb") @Export("selectedSpellName") static String selectedSpellName; @ObfuscatedName("mp") @ObfuscatedGetter( - intValue = -803137889 + intValue = -1769483355 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mu") + @ObfuscatedName("mh") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("ez") - @ObfuscatedSignature( - descriptor = "Lkx;" + @ObfuscatedName("mr") + @ObfuscatedGetter( + intValue = 432404741 ) - Buffer field702; + static int field764; + @ObfuscatedName("mj") + @ObfuscatedGetter( + intValue = 943374115 + ) + static int field765; + @ObfuscatedName("mv") + @ObfuscatedGetter( + intValue = 543822711 + ) + @Export("chatEffects") + static int chatEffects; + @ObfuscatedName("mq") + @ObfuscatedGetter( + intValue = -632422509 + ) + static int field767; + @ObfuscatedName("me") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("mg") + @ObfuscatedGetter( + intValue = -1222250575 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("mt") + @ObfuscatedGetter( + intValue = 1127684145 + ) + @Export("weight") + static int weight; + @ObfuscatedName("mu") + @ObfuscatedGetter( + intValue = 613808213 + ) + @Export("staffModLevel") + public static int staffModLevel; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = -828285273 + ) + @Export("followerIndex") + static int followerIndex; + @ObfuscatedName("nm") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("ni") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("viewportWidget") + static Widget viewportWidget; + @ObfuscatedName("nx") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("clickedWidget") + static Widget clickedWidget; + @ObfuscatedName("na") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("clickedWidgetParent") + static Widget clickedWidgetParent; + @ObfuscatedName("nh") + @ObfuscatedGetter( + intValue = -48358575 + ) + @Export("widgetClickX") + static int widgetClickX; + @ObfuscatedName("nn") + @ObfuscatedGetter( + intValue = -691888487 + ) + @Export("widgetClickY") + static int widgetClickY; + @ObfuscatedName("no") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("np") + static boolean field780; + @ObfuscatedName("ns") + @ObfuscatedGetter( + intValue = -1314877581 + ) + static int field727; + @ObfuscatedName("ne") + @ObfuscatedGetter( + intValue = 290813887 + ) + static int field782; + @ObfuscatedName("nc") + static boolean field783; + @ObfuscatedName("nq") + @ObfuscatedGetter( + intValue = -1611922761 + ) + static int field784; + @ObfuscatedName("ng") + @ObfuscatedGetter( + intValue = 719879569 + ) + static int field845; + @ObfuscatedName("nr") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = -1228541083 + ) + @Export("cycleCntr") + static int cycleCntr; + @ObfuscatedName("nj") + @Export("changedVarps") + static int[] changedVarps; + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = -544134857 + ) + @Export("changedVarpCount") + static int changedVarpCount; + @ObfuscatedName("nt") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("nz") + @ObfuscatedGetter( + intValue = -1782026175 + ) + static int field791; + @ObfuscatedName("nl") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("ou") + @ObfuscatedGetter( + intValue = -1372172675 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("oe") + static int[] field794; + @ObfuscatedName("ox") + @ObfuscatedGetter( + intValue = -1785174409 + ) + static int field613; + @ObfuscatedName("ow") + @ObfuscatedGetter( + intValue = -507783339 + ) + @Export("chatCycle") + static int chatCycle; + @ObfuscatedName("oh") + @ObfuscatedGetter( + intValue = -294436167 + ) + static int field797; + @ObfuscatedName("os") + @ObfuscatedGetter( + intValue = 163984103 + ) + static int field798; + @ObfuscatedName("oa") + @ObfuscatedGetter( + intValue = 1092884023 + ) + static int field786; + @ObfuscatedName("oy") + @ObfuscatedGetter( + intValue = 1340248461 + ) + static int field800; + @ObfuscatedName("ok") + @ObfuscatedGetter( + intValue = 1564656757 + ) + static int field801; + @ObfuscatedName("on") + @ObfuscatedGetter( + intValue = -1529362963 + ) + static int field802; + @ObfuscatedName("ot") + @ObfuscatedGetter( + intValue = 160490891 + ) + static int field803; + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + Buffer field746; @ObfuscatedName("fi") @ObfuscatedSignature( - descriptor = "Ll;" + descriptor = "Lax;" ) - class9 field782; + class35 field640; static { - field863 = true; // L: 183 - worldId = 1; // L: 184 - worldProperties = 0; // L: 185 - gameBuild = 0; // L: 187 - isMembersWorld = false; // L: 190 - isLowDetail = false; // L: 191 - clientType = -1; // L: 196 - field667 = -1; // L: 197 - onMobile = false; // L: 198 - gameState = 0; // L: 199 - isLoading = true; // L: 220 - cycle = 0; // L: 221 - mouseLastLastPressedTimeMillis = -1L; // L: 222 - field675 = -1; // L: 224 - field687 = -1; // L: 225 - field853 = -1L; // L: 226 - hadFocus = true; // L: 227 - displayFps = false; // L: 228 - rebootTimer = 0; // L: 229 - hintArrowType = 0; // L: 230 - hintArrowNpcIndex = 0; // L: 231 - hintArrowPlayerIndex = 0; // L: 232 - hintArrowX = 0; // L: 233 - hintArrowY = 0; // L: 234 - hintArrowHeight = 0; // L: 235 - hintArrowSubX = 0; // L: 236 - hintArrowSubY = 0; // L: 237 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 239 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 240 - titleLoadingStage = 0; // L: 242 - js5ConnectState = 0; // L: 245 - field761 = 0; // L: 246 - js5Errors = 0; // L: 268 - loginState = 0; // L: 270 - field696 = 0; // L: 271 - field786 = 0; // L: 272 - field701 = 0; // L: 273 - field661 = class169.field2012; // L: 274 - Login_isUsernameRemembered = false; // L: 283 - secureRandomFuture = new SecureRandomFuture(); // L: 284 - randomDatData = null; // L: 289 - npcs = new NPC[32768]; // L: 293 - npcCount = 0; // L: 294 - npcIndices = new int[32768]; // L: 295 - field725 = 0; // L: 296 - field697 = new int[250]; // L: 297 - packetWriter = new PacketWriter(); // L: 300 - logoutTimer = 0; // L: 302 - field712 = false; // L: 303 - useBufferedSocket = true; // L: 304 - timer = new Timer(); // L: 305 - fontsMap = new HashMap(); // L: 311 - field785 = 0; // L: 318 - field717 = 1; // L: 319 - field718 = 0; // L: 320 - field719 = 1; // L: 321 - field720 = 0; // L: 322 - collisionMaps = new CollisionMap[4]; // L: 330 - isInInstance = false; // L: 331 - instanceChunkTemplates = new int[4][13][13]; // L: 332 - field724 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 333 - field808 = 0; // L: 336 - field727 = 2301979; // L: 348 - field777 = 5063219; // L: 349 - field729 = 3353893; // L: 350 - field730 = 7759444; // L: 351 - field731 = false; // L: 352 - alternativeScrollbarWidth = 0; // L: 353 - camAngleX = 128; // L: 361 - camAngleY = 0; // L: 362 - camAngleDY = 0; // L: 363 - camAngleDX = 0; // L: 364 - mouseCamClickedX = 0; // L: 365 - mouseCamClickedY = 0; // L: 366 - oculusOrbState = 0; // L: 367 - camFollowHeight = 50; // L: 368 - field818 = 0; // L: 372 - field742 = 0; // L: 373 - field743 = 0; // L: 374 - oculusOrbNormalSpeed = 12; // L: 376 - oculusOrbSlowedSpeed = 6; // L: 377 - field746 = 0; // L: 378 - field747 = false; // L: 379 - field926 = 0; // L: 380 - field678 = false; // L: 381 - field880 = 0; // L: 382 - overheadTextCount = 0; // L: 383 - overheadTextLimit = 50; // L: 384 - overheadTextXs = new int[overheadTextLimit]; // L: 385 - overheadTextYs = new int[overheadTextLimit]; // L: 386 - overheadTextAscents = new int[overheadTextLimit]; // L: 387 - overheadTextXOffsets = new int[overheadTextLimit]; // L: 388 - overheadTextColors = new int[overheadTextLimit]; // L: 389 - overheadTextEffects = new int[overheadTextLimit]; // L: 390 - overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 391 - overheadText = new String[overheadTextLimit]; // L: 392 - tileLastDrawnActor = new int[104][104]; // L: 393 - viewportDrawCount = 0; // L: 394 - viewportTempX = -1; // L: 395 - viewportTempY = -1; // L: 396 - mouseCrossX = 0; // L: 397 - mouseCrossY = 0; // L: 398 - mouseCrossState = 0; // L: 399 - mouseCrossColor = 0; // L: 400 - showMouseCross = true; // L: 401 - field770 = 0; // L: 403 - field931 = 0; // L: 404 - dragItemSlotSource = 0; // L: 407 - draggedWidgetX = 0; // L: 408 - draggedWidgetY = 0; // L: 409 - dragItemSlotDestination = 0; // L: 410 - field776 = false; // L: 411 - itemDragDuration = 0; // L: 412 - field778 = 0; // L: 413 - showLoadingMessages = true; // L: 415 - players = new Player[2048]; // L: 417 - localPlayerIndex = -1; // L: 419 - field673 = 0; // L: 420 - renderSelf = true; // L: 422 - drawPlayerNames = 0; // L: 427 - field851 = 0; // L: 428 - field845 = new int[1000]; // L: 429 - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 431 - playerMenuActions = new String[8]; // L: 432 - playerOptionsPriorities = new boolean[8]; // L: 433 - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 434 - combatTargetPlayerIndex = -1; // L: 435 - groundItems = new NodeDeque[4][104][104]; // L: 436 - pendingSpawns = new NodeDeque(); // L: 437 - projectiles = new NodeDeque(); // L: 438 - graphicsObjects = new NodeDeque(); // L: 439 - currentLevels = new int[25]; // L: 440 - levels = new int[25]; // L: 441 - experience = new int[25]; // L: 442 - leftClickOpensMenu = 0; // L: 443 - isMenuOpen = false; // L: 444 - menuOptionsCount = 0; // L: 450 - menuArguments1 = new int[500]; // L: 451 - menuArguments2 = new int[500]; // L: 452 - menuOpcodes = new int[500]; // L: 453 - menuIdentifiers = new int[500]; // L: 454 - menuActions = new String[500]; // L: 455 - menuTargets = new String[500]; // L: 456 - menuShiftClick = new boolean[500]; // L: 457 - followerOpsLowPriority = false; // L: 458 - shiftClickDrop = false; // L: 460 - tapToDrop = false; // L: 461 - showMouseOverText = true; // L: 462 - viewportX = -1; // L: 463 - viewportY = -1; // L: 464 - field815 = 0; // L: 468 - field925 = 50; // L: 469 - isItemSelected = 0; // L: 470 - selectedItemName = null; // L: 474 - isSpellSelected = false; // L: 475 - selectedSpellChildIndex = -1; // L: 477 - field821 = -1; // L: 478 - selectedSpellActionName = null; // L: 480 - selectedSpellName = null; // L: 481 - rootInterface = -1; // L: 482 - interfaceParents = new NodeHashTable(8); // L: 483 - field705 = 0; // L: 488 - field699 = -1; // L: 489 - chatEffects = 0; // L: 490 - field829 = 0; // L: 491 - meslayerContinueWidget = null; // L: 492 - runEnergy = 0; // L: 493 - weight = 0; // L: 494 - staffModLevel = 0; // L: 495 - followerIndex = -1; // L: 496 - playerMod = false; // L: 497 - viewportWidget = null; // L: 498 - clickedWidget = null; // L: 499 - clickedWidgetParent = null; // L: 500 - widgetClickX = 0; // L: 501 - widgetClickY = 0; // L: 502 - draggedOnWidget = null; // L: 503 - field912 = false; // L: 504 - field714 = -1; // L: 505 - field844 = -1; // L: 506 - field754 = false; // L: 507 - field784 = -1; // L: 508 - field847 = -1; // L: 509 - isDraggingWidget = false; // L: 510 - cycleCntr = 1; // L: 515 - changedVarps = new int[32]; // L: 518 - changedVarpCount = 0; // L: 519 - changedItemContainers = new int[32]; // L: 520 - field870 = 0; // L: 521 - changedSkills = new int[32]; // L: 522 - changedSkillsCount = 0; // L: 523 - chatCycle = 0; // L: 524 - field857 = 0; // L: 525 - field858 = 0; // L: 526 - field710 = 0; // L: 527 - field860 = 0; // L: 528 - field861 = 0; // L: 529 - mouseWheelRotation = 0; // L: 532 - scriptEvents = new NodeDeque(); // L: 533 - field660 = new NodeDeque(); // L: 534 - field865 = new NodeDeque(); // L: 535 - widgetFlags = new NodeHashTable(512); // L: 536 - rootWidgetCount = 0; // L: 538 - field868 = -2; // L: 539 - field816 = new boolean[100]; // L: 540 - field827 = new boolean[100]; // L: 541 - field871 = new boolean[100]; // L: 542 - rootWidgetXs = new int[100]; // L: 543 - rootWidgetYs = new int[100]; // L: 544 - rootWidgetWidths = new int[100]; // L: 545 - rootWidgetHeights = new int[100]; // L: 546 - gameDrawingMode = 0; // L: 547 - field938 = 0L; // L: 548 - isResizable = true; // L: 549 - field879 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 556 - publicChatMode = 0; // L: 557 - tradeChatMode = 0; // L: 559 - field882 = ""; // L: 560 - field883 = new long[100]; // L: 562 - field884 = 0; // L: 563 - field885 = 0; // L: 565 - field886 = new int[128]; // L: 566 - field738 = new int[128]; // L: 567 - field888 = -1L; // L: 568 - field889 = -1; // L: 571 - mapIconCount = 0; // L: 572 - mapIconXs = new int[1000]; // L: 573 - mapIconYs = new int[1000]; // L: 574 - mapIcons = new SpritePixels[1000]; // L: 575 - destinationX = 0; // L: 576 - destinationY = 0; // L: 577 - minimapState = 0; // L: 584 - currentTrackGroupId = -1; // L: 585 - field899 = false; // L: 586 - soundEffectCount = 0; // L: 592 - soundEffectIds = new int[50]; // L: 593 - queuedSoundEffectLoops = new int[50]; // L: 594 - queuedSoundEffectDelays = new int[50]; // L: 595 - soundLocations = new int[50]; // L: 596 - soundEffects = new SoundEffect[50]; // L: 597 - isCameraLocked = false; // L: 599 - field907 = new boolean[5]; // L: 611 - field908 = new int[5]; // L: 612 - field909 = new int[5]; // L: 613 - field799 = new int[5]; // L: 614 - field911 = new int[5]; // L: 615 - field779 = 256; // L: 616 - field913 = 205; // L: 617 - zoomHeight = 256; // L: 618 - zoomWidth = 320; // L: 619 - field916 = 1; // L: 620 - field690 = 32767; // L: 621 - field918 = 1; // L: 622 - field846 = 32767; // L: 623 - viewportOffsetX = 0; // L: 624 - viewportOffsetY = 0; // L: 625 - viewportWidth = 0; // L: 626 - viewportHeight = 0; // L: 627 - viewportZoom = 0; // L: 628 - playerAppearance = new PlayerComposition(); // L: 630 - field850 = -1; // L: 631 - field927 = -1; // L: 632 - platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 634 - grandExchangeOffers = new GrandExchangeOffer[8]; // L: 636 - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 639 - field674 = -1; // L: 646 - archiveLoaders = new ArrayList(10); // L: 647 - archiveLoadersDone = 0; // L: 648 - field934 = 0; // L: 649 - field935 = new ApproximateRouteStrategy(); // L: 658 - field708 = new int[50]; // L: 659 - field859 = new int[50]; // L: 660 + field867 = true; // L: 193 + worldId = 1; // L: 194 + worldProperties = 0; // L: 195 + gameBuild = 0; // L: 197 + isMembersWorld = false; // L: 200 + isLowDetail = false; // L: 201 + clientType = -1; // L: 206 + field605 = -1; // L: 207 + onMobile = false; // L: 208 + gameState = 0; // L: 209 + isLoading = true; // L: 230 + cycle = 0; // L: 231 + mouseLastLastPressedTimeMillis = -1L; // L: 232 + field875 = -1; // L: 234 + field759 = -1; // L: 235 + field851 = -1L; // L: 236 + hadFocus = true; // L: 237 + displayFps = false; // L: 238 + rebootTimer = 0; // L: 239 + hintArrowType = 0; // L: 240 + hintArrowNpcIndex = 0; // L: 241 + hintArrowPlayerIndex = 0; // L: 242 + hintArrowX = 0; // L: 243 + hintArrowY = 0; // L: 244 + hintArrowHeight = 0; // L: 245 + hintArrowSubX = 0; // L: 246 + hintArrowSubY = 0; // L: 247 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 249 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 250 + titleLoadingStage = 0; // L: 252 + js5ConnectState = 0; // L: 255 + field630 = 0; // L: 256 + js5Errors = 0; // L: 278 + loginState = 0; // L: 280 + field633 = 0; // L: 281 + field634 = 0; // L: 282 + field635 = 0; // L: 283 + field636 = class125.field1458; // L: 284 + Login_isUsernameRemembered = false; // L: 293 + secureRandomFuture = new SecureRandomFuture(); // L: 294 + randomDatData = null; // L: 299 + npcs = new NPC[32768]; // L: 303 + npcCount = 0; // L: 304 + npcIndices = new int[32768]; // L: 305 + field645 = 0; // L: 306 + field646 = new int[250]; // L: 307 + packetWriter = new PacketWriter(); // L: 310 + logoutTimer = 0; // L: 312 + field737 = false; // L: 313 + useBufferedSocket = true; // L: 314 + timer = new Timer(); // L: 315 + fontsMap = new HashMap(); // L: 321 + field655 = 0; // L: 328 + field656 = 1; // L: 329 + field657 = 0; // L: 330 + field752 = 1; // L: 331 + field659 = 0; // L: 332 + collisionMaps = new CollisionMap[4]; // L: 340 + isInInstance = false; // L: 341 + instanceChunkTemplates = new int[4][13][13]; // L: 342 + field663 = 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: 343 + field799 = 0; // L: 346 + field665 = 2301979; // L: 358 + field666 = 5063219; // L: 359 + field667 = 3353893; // L: 360 + field668 = 7759444; // L: 361 + field669 = false; // L: 362 + alternativeScrollbarWidth = 0; // L: 363 + camAngleX = 128; // L: 371 + camAngleY = 0; // L: 372 + camAngleDY = 0; // L: 373 + camAngleDX = 0; // L: 374 + mouseCamClickedX = 0; // L: 375 + mouseCamClickedY = 0; // L: 376 + oculusOrbState = 0; // L: 377 + camFollowHeight = 50; // L: 378 + field679 = 0; // L: 382 + field702 = 0; // L: 383 + field681 = 0; // L: 384 + oculusOrbNormalSpeed = 12; // L: 386 + oculusOrbSlowedSpeed = 6; // L: 387 + field684 = 0; // L: 388 + field685 = false; // L: 389 + field826 = 0; // L: 390 + field687 = false; // L: 391 + field735 = 0; // L: 392 + overheadTextCount = 0; // L: 393 + overheadTextLimit = 50; // L: 394 + overheadTextXs = new int[overheadTextLimit]; // L: 395 + overheadTextYs = new int[overheadTextLimit]; // L: 396 + overheadTextAscents = new int[overheadTextLimit]; // L: 397 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 398 + overheadTextColors = new int[overheadTextLimit]; // L: 399 + overheadTextEffects = new int[overheadTextLimit]; // L: 400 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 401 + overheadText = new String[overheadTextLimit]; // L: 402 + tileLastDrawnActor = new int[104][104]; // L: 403 + viewportDrawCount = 0; // L: 404 + viewportTempX = -1; // L: 405 + viewportTempY = -1; // L: 406 + mouseCrossX = 0; // L: 407 + mouseCrossY = 0; // L: 408 + mouseCrossState = 0; // L: 409 + mouseCrossColor = 0; // L: 410 + showMouseCross = true; // L: 411 + field708 = 0; // L: 413 + field709 = 0; // L: 414 + dragItemSlotSource = 0; // L: 417 + draggedWidgetX = 0; // L: 418 + draggedWidgetY = 0; // L: 419 + dragItemSlotDestination = 0; // L: 420 + field714 = false; // L: 421 + itemDragDuration = 0; // L: 422 + field716 = 0; // L: 423 + showLoadingMessages = true; // L: 425 + players = new Player[2048]; // L: 427 + localPlayerIndex = -1; // L: 429 + field720 = 0; // L: 430 + renderSelf = true; // L: 432 + drawPlayerNames = 0; // L: 437 + field723 = 0; // L: 438 + field724 = new int[1000]; // L: 439 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 441 + playerMenuActions = new String[8]; // L: 442 + playerOptionsPriorities = new boolean[8]; // L: 443 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 444 + combatTargetPlayerIndex = -1; // L: 445 + groundItems = new NodeDeque[4][104][104]; // L: 446 + pendingSpawns = new NodeDeque(); // L: 447 + projectiles = new NodeDeque(); // L: 448 + graphicsObjects = new NodeDeque(); // L: 449 + currentLevels = new int[25]; // L: 450 + levels = new int[25]; // L: 451 + experience = new int[25]; // L: 452 + leftClickOpensMenu = 0; // L: 453 + isMenuOpen = false; // L: 454 + menuOptionsCount = 0; // L: 460 + menuArguments1 = new int[500]; // L: 461 + menuArguments2 = new int[500]; // L: 462 + menuOpcodes = new int[500]; // L: 463 + menuIdentifiers = new int[500]; // L: 464 + menuActions = new String[500]; // L: 465 + menuTargets = new String[500]; // L: 466 + menuShiftClick = new boolean[500]; // L: 467 + followerOpsLowPriority = false; // L: 468 + shiftClickDrop = false; // L: 470 + tapToDrop = false; // L: 471 + showMouseOverText = true; // L: 472 + viewportX = -1; // L: 473 + viewportY = -1; // L: 474 + field753 = 0; // L: 478 + field696 = 50; // L: 479 + isItemSelected = 0; // L: 480 + selectedItemName = null; // L: 484 + isSpellSelected = false; // L: 485 + selectedSpellChildIndex = -1; // L: 487 + field874 = -1; // L: 488 + selectedSpellActionName = null; // L: 490 + selectedSpellName = null; // L: 491 + rootInterface = -1; // L: 492 + interfaceParents = new NodeHashTable(8); // L: 493 + field764 = 0; // L: 498 + field765 = -1; // L: 499 + chatEffects = 0; // L: 500 + field767 = 0; // L: 501 + meslayerContinueWidget = null; // L: 502 + runEnergy = 0; // L: 503 + weight = 0; // L: 504 + staffModLevel = 0; // L: 505 + followerIndex = -1; // L: 506 + playerMod = false; // L: 507 + viewportWidget = null; // L: 508 + clickedWidget = null; // L: 509 + clickedWidgetParent = null; // L: 510 + widgetClickX = 0; // L: 511 + widgetClickY = 0; // L: 512 + draggedOnWidget = null; // L: 513 + field780 = false; // L: 514 + field727 = -1; // L: 515 + field782 = -1; // L: 516 + field783 = false; // L: 517 + field784 = -1; // L: 518 + field845 = -1; // L: 519 + isDraggingWidget = false; // L: 520 + cycleCntr = 1; // L: 525 + changedVarps = new int[32]; // L: 528 + changedVarpCount = 0; // L: 529 + changedItemContainers = new int[32]; // L: 530 + field791 = 0; // L: 531 + changedSkills = new int[32]; // L: 532 + changedSkillsCount = 0; // L: 533 + field794 = new int[32]; // L: 534 + field613 = 0; // L: 535 + chatCycle = 0; // L: 536 + field797 = 0; // L: 537 + field798 = 0; // L: 538 + field786 = 0; // L: 539 + field800 = 0; // L: 540 + field801 = 0; // L: 541 + field802 = 0; // L: 542 + field803 = 0; // L: 543 + mouseWheelRotation = 0; // L: 548 + scriptEvents = new NodeDeque(); // L: 549 + field806 = new NodeDeque(); // L: 550 + field688 = new NodeDeque(); // L: 551 + widgetFlags = new NodeHashTable(512); // L: 552 + rootWidgetCount = 0; // L: 554 + field810 = -2; // L: 555 + field811 = new boolean[100]; // L: 556 + field812 = new boolean[100]; // L: 557 + field704 = new boolean[100]; // L: 558 + rootWidgetXs = new int[100]; // L: 559 + rootWidgetYs = new int[100]; // L: 560 + rootWidgetWidths = new int[100]; // L: 561 + rootWidgetHeights = new int[100]; // L: 562 + gameDrawingMode = 0; // L: 563 + field819 = 0L; // L: 564 + isResizable = true; // L: 565 + field821 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 572 + publicChatMode = 0; // L: 573 + tradeChatMode = 0; // L: 575 + field824 = ""; // L: 576 + field689 = new long[100]; // L: 578 + field760 = 0; // L: 579 + field827 = 0; // L: 581 + field828 = new int[128]; // L: 582 + field792 = new int[128]; // L: 583 + field678 = -1L; // L: 584 + field831 = new class11[1]; // L: 588 + field820 = new class3[1]; // L: 590 + field833 = -1; // L: 591 + mapIconCount = 0; // L: 592 + mapIconXs = new int[1000]; // L: 593 + mapIconYs = new int[1000]; // L: 594 + mapIcons = new SpritePixels[1000]; // L: 595 + destinationX = 0; // L: 596 + destinationY = 0; // L: 597 + minimapState = 0; // L: 604 + currentTrackGroupId = -1; // L: 605 + field842 = false; // L: 606 + soundEffectCount = 0; // L: 612 + soundEffectIds = new int[50]; // L: 613 + queuedSoundEffectLoops = new int[50]; // L: 614 + queuedSoundEffectDelays = new int[50]; // L: 615 + soundLocations = new int[50]; // L: 616 + soundEffects = new SoundEffect[50]; // L: 617 + isCameraLocked = false; // L: 619 + field850 = new boolean[5]; // L: 631 + field601 = new int[5]; // L: 632 + field698 = new int[5]; // L: 633 + field853 = new int[5]; // L: 634 + field854 = new int[5]; // L: 635 + field855 = 256; // L: 636 + field856 = 205; // L: 637 + zoomHeight = 256; // L: 638 + zoomWidth = 320; // L: 639 + field859 = 1; // L: 640 + field742 = 32767; // L: 641 + field707 = 1; // L: 642 + field862 = 32767; // L: 643 + viewportOffsetX = 0; // L: 644 + viewportOffsetY = 0; // L: 645 + viewportWidth = 0; // L: 646 + viewportHeight = 0; // L: 647 + viewportZoom = 0; // L: 648 + playerAppearance = new PlayerComposition(); // L: 650 + field871 = -1; // L: 651 + field713 = -1; // L: 652 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 654 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 656 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 659 + field623 = -1; // L: 666 + archiveLoaders = new ArrayList(10); // L: 667 + archiveLoadersDone = 0; // L: 668 + field740 = 0; // L: 669 + field878 = new ApproximateRouteStrategy(); // L: 678 + field879 = new int[50]; // L: 679 + field726 = new int[50]; // L: 680 } - @ObfuscatedName("b") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-226650241" + garbageValue = "-1835470787" ) @Export("resizeGame") protected final void resizeGame() { - field938 = Tiles.currentTimeMillis() + 500L; // L: 3831 - this.resizeJS(); // L: 3832 - if (rootInterface != -1) { // L: 3833 + field819 = ObjectSound.currentTimeMillis() + 500L; // L: 3621 + this.resizeJS(); // L: 3622 + if (rootInterface != -1) { // L: 3623 this.resizeRoot(true); } - } // L: 3834 + } // L: 3624 @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-337269105" + garbageValue = "-473168642" ) @Export("setUp") protected final void setUp() { - Strings.method4329(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 791 - MouseRecorder.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 792 - class171.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 793 - DynamicObject.currentPort = MouseRecorder.worldPort; // L: 794 - PlayerComposition.field2565 = class224.field2577; // L: 795 - class105.field1339 = class224.field2573; // L: 796 - HealthBar.field1143 = class224.field2575; // L: 797 - WorldMapSprite.field259 = class224.field2574; // L: 798 - ScriptFrame.urlRequester = new UrlRequester(); // L: 799 - this.setUpKeyboard(); // L: 800 - this.setUpMouse(); // L: 801 - PlayerType.mouseWheel = this.mouseWheel(); // L: 802 - WorldMapScaleHandler.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 803 - AccessFile var2 = null; // L: 806 - ClientPreferences var3 = new ClientPreferences(); // L: 807 + class0.method12(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 798 + AttackOption.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 799 + Calendar.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 800 + class5.currentPort = AttackOption.worldPort; // L: 801 + PlayerComposition.field2601 = class223.field2609; // L: 802 + ChatChannel.field1086 = class223.field2608; // L: 803 + WorldMapSection1.field1753 = class223.field2611; // L: 804 + PlayerComposition.field2596 = class223.field2610; // L: 805 + class32.urlRequester = new UrlRequester(); // L: 806 + this.setUpKeyboard(); // L: 807 + this.setUpMouse(); // L: 808 + class9.mouseWheel = this.mouseWheel(); // L: 809 + FriendLoginUpdate.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 810 + AccessFile var2 = null; // L: 813 + ClientPreferences var3 = new ClientPreferences(); // L: 814 try { - var2 = WorldMapRectangle.getPreferencesFile("", FontName.field3699.name, false); // L: 809 - byte[] var4 = new byte[(int)var2.length()]; // L: 810 + var2 = class15.getPreferencesFile("", class27.field208.name, false); // L: 816 + byte[] var4 = new byte[(int)var2.length()]; // L: 817 int var6; - for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 811 812 815 - var6 = var2.read(var4, var5, var4.length - var5); // L: 813 - if (var6 == -1) { // L: 814 + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 818 819 822 + var6 = var2.read(var4, var5, var4.length - var5); // L: 820 + if (var6 == -1) { // L: 821 throw new IOException(); } } - var3 = new ClientPreferences(new Buffer(var4)); // L: 817 - } catch (Exception var8) { // L: 819 + var3 = new ClientPreferences(new Buffer(var4)); // L: 824 + } catch (Exception var8) { // L: 826 } try { - if (var2 != null) { // L: 821 + if (var2 != null) { // L: 828 var2.close(); } - } catch (Exception var7) { // L: 823 + } catch (Exception var7) { // L: 830 } - WorldMapSectionType.clientPreferences = var3; // L: 826 - this.setUpClipboard(); // L: 827 - KeyHandler.method912(this, WorldMapData_1.null_string); // L: 828 - if (gameBuild != 0) { // L: 829 + Login.clientPreferences = var3; // L: 833 + this.setUpClipboard(); // L: 834 + String var9 = DevicePcmPlayerProvider.null_string; // L: 836 + class44.applet = this; // L: 838 + if (var9 != null) { // L: 839 + class44.field294 = var9; + } + + if (gameBuild != 0) { // L: 841 displayFps = true; } - GameBuild.setWindowedMode(WorldMapSectionType.clientPreferences.windowMode); // L: 830 - InterfaceParent.friendSystem = new FriendSystem(Message.loginType); // L: 831 - } // L: 832 + Tile.setWindowedMode(Login.clientPreferences.windowMode); // L: 842 + class13.friendSystem = new FriendSystem(AbstractUserComparator.loginType); // L: 843 + } // L: 844 @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-123" + garbageValue = "-102" ) @Export("doCycle") protected final void doCycle() { - ++cycle; // L: 835 - this.doCycleJs5(); // L: 836 + ++cycle; // L: 847 + this.doCycleJs5(); // L: 848 while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 840 - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 841 - } // L: 842 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 852 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 853 + } // L: 854 - if (var1 == null) { // L: 843 - LoginPacket.method3815(); // L: 847 - UserComparator5.playPcmPlayers(); // L: 848 - synchronized(KeyHandler.KeyHandler_instance) { // L: 850 - ++KeyHandler.KeyHandler_idleCycles; // L: 851 - KeyHandler.field418 = KeyHandler.field424; // L: 852 - KeyHandler.field421 = 0; // L: 853 - int var5; - if (KeyHandler.field417 >= 0) { // L: 854 - while (KeyHandler.field417 != KeyHandler.field416) { // L: 859 - var5 = KeyHandler.field407[KeyHandler.field416]; // L: 860 - KeyHandler.field416 = KeyHandler.field416 + 1 & 127; // L: 861 - if (var5 < 0) { // L: 862 - KeyHandler.KeyHandler_pressedKeys[~var5] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var5] && KeyHandler.field421 < KeyHandler.field420.length - 1) { // L: 864 - KeyHandler.field420[++KeyHandler.field421 - 1] = var5; // L: 865 - } - - KeyHandler.KeyHandler_pressedKeys[var5] = true; // L: 867 + if (var1 == null) { // L: 855 + int var4; + try { + if (class210.musicPlayerStatus == 1) { // L: 861 + var4 = class210.midiPcmStream.method4018(); // L: 862 + if (var4 > 0 && class210.midiPcmStream.isReady()) { // L: 863 + var4 -= class1.pcmSampleLength; // L: 864 + if (var4 < 0) { // L: 865 + var4 = 0; } + + class210.midiPcmStream.setPcmStreamVolume(var4); // L: 866 + } else { + class210.midiPcmStream.clear(); // L: 869 + class210.midiPcmStream.removeAll(); // L: 870 + if (class210.musicTrackArchive != null) { // L: 871 + class210.musicPlayerStatus = 2; + } else { + class210.musicPlayerStatus = 0; // L: 872 + } + + WallDecoration.musicTrack = null; // L: 873 + class210.soundCache = null; // L: 874 } - } else { - for (var5 = 0; var5 < 112; ++var5) { // L: 855 - KeyHandler.KeyHandler_pressedKeys[var5] = false; - } - - KeyHandler.field417 = KeyHandler.field416; // L: 856 } - - if (KeyHandler.field421 > 0) { // L: 871 - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field424 = KeyHandler.field423; // L: 872 + } catch (Exception var6) { // L: 877 + var6.printStackTrace(); // L: 878 + class210.midiPcmStream.clear(); // L: 879 + class210.musicPlayerStatus = 0; // L: 880 + WallDecoration.musicTrack = null; // L: 881 + class210.soundCache = null; // L: 882 + class210.musicTrackArchive = null; // L: 883 } - class60.method967(); // L: 875 - int var6; - if (PlayerType.mouseWheel != null) { // L: 876 - var6 = PlayerType.mouseWheel.useRotation(); // L: 877 - mouseWheelRotation = var6; // L: 878 + BoundaryObject.playPcmPlayers(); // L: 886 + WorldMapIcon_1.method2699(); // L: 887 + PlayerType.method4414(); // L: 888 + if (class9.mouseWheel != null) { // L: 889 + var4 = class9.mouseWheel.useRotation(); // L: 890 + mouseWheelRotation = var4; // L: 891 } - if (gameState == 0) { // L: 880 - GameEngine.load(); // L: 881 - WorldMapSprite.clock.mark(); // L: 883 + if (gameState == 0) { // L: 893 + class34.load(); // L: 894 + Decimator.clock.mark(); // L: 896 - for (var6 = 0; var6 < 32; ++var6) { // L: 884 - GameEngine.graphicsTickTimes[var6] = 0L; + for (var4 = 0; var4 < 32; ++var4) { // L: 897 + GameEngine.graphicsTickTimes[var4] = 0L; } - for (var6 = 0; var6 < 32; ++var6) { // L: 885 - GameEngine.clientTickTimes[var6] = 0L; + for (var4 = 0; var4 < 32; ++var4) { // L: 898 + GameEngine.clientTickTimes[var4] = 0L; } - VertexNormal.gameCyclesToDo = 0; // L: 886 - } else if (gameState == 5) { // L: 889 - class9.doCycleTitle(this); // L: 890 - GameEngine.load(); // L: 891 - WorldMapSprite.clock.mark(); // L: 893 + class232.gameCyclesToDo = 0; // L: 899 + } else if (gameState == 5) { // L: 902 + UserComparator7.doCycleTitle(this); // L: 903 + class34.load(); // L: 904 + Decimator.clock.mark(); // L: 906 - for (var6 = 0; var6 < 32; ++var6) { // L: 894 - GameEngine.graphicsTickTimes[var6] = 0L; + for (var4 = 0; var4 < 32; ++var4) { // L: 907 + GameEngine.graphicsTickTimes[var4] = 0L; } - for (var6 = 0; var6 < 32; ++var6) { // L: 895 - GameEngine.clientTickTimes[var6] = 0L; + for (var4 = 0; var4 < 32; ++var4) { // L: 908 + GameEngine.clientTickTimes[var4] = 0L; } - VertexNormal.gameCyclesToDo = 0; // L: 896 - } else if (gameState != 10 && gameState != 11) { // L: 899 - if (gameState == 20) { // L: 900 - class9.doCycleTitle(this); // L: 901 - this.doCycleLoggedOut(); // L: 902 - } else if (gameState == 25) { // L: 904 - WorldMapIcon_1.method375(); + class232.gameCyclesToDo = 0; // L: 909 + } else if (gameState != 10 && gameState != 11) { // L: 912 + if (gameState == 20) { // L: 913 + UserComparator7.doCycleTitle(this); // L: 914 + this.doCycleLoggedOut(); // L: 915 + } else if (gameState == 25) { // L: 917 + Varcs.method2340(); } } else { - class9.doCycleTitle(this); + UserComparator7.doCycleTitle(this); } - if (gameState == 30) { // L: 905 + if (gameState == 30) { // L: 918 this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { // L: 906 + } else if (gameState == 40 || gameState == 45) { // L: 919 this.doCycleLoggedOut(); } - return; // L: 907 + return; // L: 920 } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 844 + var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 856 } } - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1888023388" + garbageValue = "-278821415" ) @Export("draw") protected final void draw(boolean var1) { boolean var2; - label173: { + label172: { try { - if (class206.musicPlayerStatus == 2) { // L: 913 - if (class204.musicTrack == null) { // L: 914 - class204.musicTrack = MusicTrack.readTrack(class206.musicTrackArchive, class206.musicTrackGroupId, SoundSystem.musicTrackFileId); // L: 915 - if (class204.musicTrack == null) { // L: 916 - var2 = false; // L: 917 - break label173; + if (class210.musicPlayerStatus == 2) { // L: 926 + if (WallDecoration.musicTrack == null) { // L: 927 + WallDecoration.musicTrack = MusicTrack.readTrack(class210.musicTrackArchive, FaceNormal.musicTrackGroupId, WorldMapID.musicTrackFileId); // L: 928 + if (WallDecoration.musicTrack == null) { // L: 929 + var2 = false; // L: 930 + break label172; } } - if (class182.soundCache == null) { // L: 921 - class182.soundCache = new SoundCache(class206.soundEffectsArchive, class206.musicSamplesArchive); + if (class210.soundCache == null) { // L: 934 + class210.soundCache = new SoundCache(class210.soundEffectsArchive, class372.musicSamplesArchive); } - if (VertexNormal.midiPcmStream.loadMusicTrack(class204.musicTrack, class206.musicPatchesArchive, class182.soundCache, 22050)) { // L: 922 - VertexNormal.midiPcmStream.clearAll(); // L: 923 - VertexNormal.midiPcmStream.setPcmStreamVolume(DevicePcmPlayerProvider.musicTrackVolume); // L: 924 - VertexNormal.midiPcmStream.setMusicTrack(class204.musicTrack, class206.musicTrackBoolean); // L: 925 - class206.musicPlayerStatus = 0; // L: 926 - class204.musicTrack = null; // L: 927 - class182.soundCache = null; // L: 928 - class206.musicTrackArchive = null; // L: 929 - var2 = true; // L: 930 - break label173; + if (class210.midiPcmStream.loadMusicTrack(WallDecoration.musicTrack, class210.musicPatchesArchive, class210.soundCache, 22050)) { // L: 935 + class210.midiPcmStream.clearAll(); // L: 936 + class210.midiPcmStream.setPcmStreamVolume(class375.musicTrackVolume); // L: 937 + class210.midiPcmStream.setMusicTrack(WallDecoration.musicTrack, class210.musicTrackBoolean); // L: 938 + class210.musicPlayerStatus = 0; // L: 939 + WallDecoration.musicTrack = null; // L: 940 + class210.soundCache = null; // L: 941 + class210.musicTrackArchive = null; // L: 942 + var2 = true; // L: 943 + break label172; } } - } catch (Exception var6) { // L: 935 - var6.printStackTrace(); // L: 936 - VertexNormal.midiPcmStream.clear(); // L: 937 - class206.musicPlayerStatus = 0; // L: 938 - class204.musicTrack = null; // L: 939 - class182.soundCache = null; // L: 940 - class206.musicTrackArchive = null; // L: 941 + } catch (Exception var6) { // L: 948 + var6.printStackTrace(); // L: 949 + class210.midiPcmStream.clear(); // L: 950 + class210.musicPlayerStatus = 0; // L: 951 + WallDecoration.musicTrack = null; // L: 952 + class210.soundCache = null; // L: 953 + class210.musicTrackArchive = null; // L: 954 } - var2 = false; // L: 943 + var2 = false; // L: 956 } - if (var2 && field899 && class197.pcmPlayer0 != null) { // L: 946 947 - class197.pcmPlayer0.tryDiscard(); + if (var2 && field842 && ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 959 960 + ApproximateRouteStrategy.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field938 && Tiles.currentTimeMillis() > field938) { // L: 949 950 - GameBuild.setWindowedMode(BoundaryObject.getWindowedMode()); // L: 951 + if ((gameState == 10 || gameState == 20 || gameState == 30) && field819 != 0L && ObjectSound.currentTimeMillis() > field819) { // L: 962 963 + Tile.setWindowedMode(WorldMapScaleHandler.getWindowedMode()); // L: 964 } int var4; - if (var1) { // L: 954 - for (var4 = 0; var4 < 100; ++var4) { // L: 955 - field816[var4] = true; + if (var1) { // L: 967 + for (var4 = 0; var4 < 100; ++var4) { // L: 968 + field811[var4] = true; } } - if (gameState == 0) { // L: 957 + if (gameState == 0) { // L: 970 this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { // L: 958 - MilliClock.drawTitle(ScriptEvent.fontBold12, SecureRandomCallable.fontPlain11, Login.fontPlain12); - } else if (gameState != 10 && gameState != 11) { // L: 959 - if (gameState == 20) { // L: 960 - MilliClock.drawTitle(ScriptEvent.fontBold12, SecureRandomCallable.fontPlain11, Login.fontPlain12); - } else if (gameState == 25) { // L: 961 - if (field720 == 1) { // L: 962 - if (field785 > field717) { // L: 963 - field717 = field785; + } else if (gameState == 5) { // L: 971 + class32.drawTitle(class368.fontBold12, class0.fontPlain11, class14.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 972 + if (gameState == 20) { // L: 973 + class32.drawTitle(class368.fontBold12, class0.fontPlain11, class14.fontPlain12); + } else if (gameState == 25) { // L: 974 + if (field659 == 1) { // L: 975 + if (field655 > field656) { // L: 976 + field656 = field655; } - var4 = (field717 * 50 - field785 * 50) / field717; // L: 964 - WorldMapIcon_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 965 - } else if (field720 == 2) { // L: 967 - if (field718 > field719) { // L: 968 - field719 = field718; + var4 = (field656 * 50 - field655 * 50) / field656; // L: 977 + class2.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 978 + } else if (field659 == 2) { // L: 980 + if (field657 > field752) { // L: 981 + field752 = field657; } - var4 = (field719 * 50 - field718 * 50) / field719 + 50; // L: 969 - WorldMapIcon_1.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 970 + var4 = (field752 * 50 - field657 * 50) / field752 + 50; // L: 982 + class2.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); // L: 983 } else { - WorldMapIcon_1.drawLoadingMessage("Loading - please wait.", false); // L: 972 + class2.drawLoadingMessage("Loading - please wait.", false); // L: 985 } - } else if (gameState == 30) { // L: 974 + } else if (gameState == 30) { // L: 987 this.drawLoggedIn(); - } else if (gameState == 40) { // L: 975 - WorldMapIcon_1.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { // L: 976 - WorldMapIcon_1.drawLoadingMessage("Please wait...", false); + } else if (gameState == 40) { // L: 988 + class2.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 989 + class2.drawLoadingMessage("Please wait...", false); } } else { - MilliClock.drawTitle(ScriptEvent.fontBold12, SecureRandomCallable.fontPlain11, Login.fontPlain12); + class32.drawTitle(class368.fontBold12, class0.fontPlain11, class14.fontPlain12); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 977 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 978 - if (field827[var4]) { // L: 979 - FileSystem.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 980 - field827[var4] = false; // L: 981 + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 990 + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 991 + if (field812[var4]) { // L: 992 + GameEngine.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 993 + field812[var4] = false; // L: 994 } } - } else if (gameState > 0) { // L: 985 - FileSystem.rasterProvider.drawFull(0, 0); // L: 986 + } else if (gameState > 0) { // L: 998 + GameEngine.rasterProvider.drawFull(0, 0); // L: 999 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 987 - field827[var4] = false; + for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1000 + field812[var4] = false; } } - } // L: 989 + } // L: 1002 - @ObfuscatedName("ax") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1925350941" + descriptor = "(B)V", + garbageValue = "74" ) @Export("kill0") protected final void kill0() { - if (GrandExchangeOffer.varcs.hasUnwrittenChanges()) { // L: 992 - GrandExchangeOffer.varcs.write(); + if (TextureProvider.varcs.hasUnwrittenChanges()) { // L: 1005 + TextureProvider.varcs.write(); } - if (Friend.mouseRecorder != null) { // L: 993 - Friend.mouseRecorder.isRunning = false; + if (Language.mouseRecorder != null) { // L: 1006 + Language.mouseRecorder.isRunning = false; } - Friend.mouseRecorder = null; // L: 994 - packetWriter.close(); // L: 995 - if (KeyHandler.KeyHandler_instance != null) { // L: 997 - synchronized(KeyHandler.KeyHandler_instance) { // L: 998 - KeyHandler.KeyHandler_instance = null; // L: 999 - } // L: 1000 + Language.mouseRecorder = null; // L: 1007 + packetWriter.close(); // L: 1008 + if (KeyHandler.KeyHandler_instance != null) { // L: 1010 + synchronized(KeyHandler.KeyHandler_instance) { // L: 1011 + KeyHandler.KeyHandler_instance = null; // L: 1012 + } // L: 1013 } - if (MouseHandler.MouseHandler_instance != null) { // L: 1004 - synchronized(MouseHandler.MouseHandler_instance) { // L: 1005 - MouseHandler.MouseHandler_instance = null; // L: 1006 - } // L: 1007 + class139.method2669(); // L: 1016 + class9.mouseWheel = null; // L: 1017 + if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 1018 + ApproximateRouteStrategy.pcmPlayer0.shutdown(); } - PlayerType.mouseWheel = null; // L: 1010 - if (class197.pcmPlayer0 != null) { // L: 1011 - class197.pcmPlayer0.shutdown(); + if (class43.pcmPlayer1 != null) { // L: 1019 + class43.pcmPlayer1.shutdown(); } - if (WorldMapDecorationType.pcmPlayer1 != null) { // L: 1012 - WorldMapDecorationType.pcmPlayer1.shutdown(); - } - - WorldMapAreaData.method782(); // L: 1013 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1015 - if (ArchiveDiskActionHandler.field3187 != 0) { // L: 1016 - ArchiveDiskActionHandler.field3187 = 1; // L: 1017 + Skills.method4377(); // L: 1020 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1022 + if (ArchiveDiskActionHandler.field3239 != 0) { // L: 1023 + ArchiveDiskActionHandler.field3239 = 1; // L: 1024 try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1019 - } catch (InterruptedException var5) { // L: 1021 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1026 + } catch (InterruptedException var4) { // L: 1028 } } } - if (ScriptFrame.urlRequester != null) { // L: 1025 - ScriptFrame.urlRequester.close(); // L: 1026 - ScriptFrame.urlRequester = null; // L: 1027 + if (class32.urlRequester != null) { // L: 1032 + class32.urlRequester.close(); // L: 1033 + class32.urlRequester = null; // L: 1034 } - WorldMapSection2.method387(); // L: 1029 - } // L: 1030 + class19.method284(); // L: 1036 + } // L: 1037 - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "103" + descriptor = "(I)V", + garbageValue = "1242495393" ) - protected final void vmethod1423() { - } // L: 667 + protected final void vmethod1219() { + } // L: 687 public final void init() { try { - if (this.checkHost()) { // L: 673 - for (int var1 = 0; var1 <= 20; ++var1) { // L: 674 - String var2 = this.getParameter(Integer.toString(var1)); // L: 675 - if (var2 != null) { // L: 676 - switch(var1) { // L: 677 + if (this.checkHost()) { // L: 693 + for (int var1 = 0; var1 <= 20; ++var1) { // L: 694 + String var2 = this.getParameter(Integer.toString(var1)); // L: 695 + if (var2 != null) { // L: 696 + switch(var1) { // L: 697 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; // L: 726 + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 770 case 2: case 11: case 13: @@ -1923,1214 +1969,863 @@ public final class Client extends GameEngine implements Usernamed { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { // L: 713 + if (var2.equalsIgnoreCase("true")) { // L: 700 isMembersWorld = true; } else { - isMembersWorld = false; // L: 714 + isMembersWorld = false; // L: 701 } break; case 4: - if (clientType == -1) { // L: 719 - clientType = Integer.parseInt(var2); // L: 720 + if (clientType == -1) { // L: 731 + clientType = Integer.parseInt(var2); // L: 732 } break; case 5: - worldProperties = Integer.parseInt(var2); // L: 696 - break; // L: 697 + worldProperties = Integer.parseInt(var2); // L: 726 + break; // L: 727 case 6: - NPCComposition.clientLanguage = Language.method3854(Integer.parseInt(var2)); // L: 758 - break; // L: 759 + class35.clientLanguage = Language.method4691(Integer.parseInt(var2)); // L: 760 + break; // L: 761 case 7: - int var4 = Integer.parseInt(var2); // L: 737 - GameBuild[] var5 = class1.method16(); // L: 740 - int var6 = 0; - - GameBuild var3; - while (true) { - if (var6 >= var5.length) { - var3 = null; // L: 751 - break; - } - - GameBuild var7 = var5[var6]; // L: 742 - if (var4 == var7.buildId) { // L: 744 - var3 = var7; // L: 745 - break; // L: 746 - } - - ++var6; // L: 741 - } - - Skills.field2774 = var3; // L: 753 - break; // L: 754 + FriendsList.field3812 = ItemLayer.method3270(Integer.parseInt(var2)); // L: 721 + break; // L: 722 case 8: - if (var2.equalsIgnoreCase("true")) { // L: 685 + if (var2.equalsIgnoreCase("true")) { // L: 738 } break; case 9: - AccessFile.field4100 = var2; // L: 708 - break; // L: 709 + class0.field4 = var2; // L: 765 + break; // L: 766 case 10: - FontName.field3699 = (StudioGame)InterfaceParent.findEnumerated(DesktopPlatformInfoProvider.method6478(), Integer.parseInt(var2)); // L: 701 - if (FontName.field3699 == StudioGame.oldscape) { // L: 702 - Message.loginType = LoginType.oldscape; + StudioGame[] var3 = new StudioGame[]{StudioGame.game3, StudioGame.game4, StudioGame.game5, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.runescape}; // L: 746 + class27.field208 = (StudioGame)UserComparator8.findEnumerated(var3, Integer.parseInt(var2)); // L: 748 + if (class27.field208 == StudioGame.oldscape) { // L: 749 + AbstractUserComparator.loginType = LoginType.oldscape; } else { - Message.loginType = LoginType.field4072; // L: 703 + AbstractUserComparator.loginType = LoginType.field4086; // L: 750 } break; case 12: - worldId = Integer.parseInt(var2); // L: 691 - break; // L: 692 + worldId = Integer.parseInt(var2); // L: 755 + break; // L: 756 case 14: - ItemLayer.field1562 = Integer.parseInt(var2); // L: 731 - break; // L: 732 + FaceNormal.field2002 = Integer.parseInt(var2); // L: 716 + break; // L: 717 case 15: - gameBuild = Integer.parseInt(var2); // L: 763 - break; + gameBuild = Integer.parseInt(var2); // L: 711 + break; // L: 712 case 17: - Projectile.field1254 = var2; // L: 680 + class244.field2909 = var2; // L: 706 } } } - Scene.Scene_isLowDetail = false; // L: 770 - isLowDetail = false; // L: 771 - MusicPatchNode.worldHost = this.getCodeBase().getHost(); // L: 773 - String var8 = Skills.field2774.name; // L: 774 - byte var9 = 0; // L: 775 + Scene.Scene_isLowDetail = false; // L: 777 + isLowDetail = false; // L: 778 + MusicPatch.worldHost = this.getCodeBase().getHost(); // L: 780 + String var4 = FriendsList.field3812.name; // L: 781 + byte var5 = 0; // L: 782 try { - Projectile.findAndLoadCache("oldschool", var8, var9, 21); // L: 777 - } catch (Exception var10) { // L: 779 - SequenceDefinition.RunException_sendStackTrace((String)null, var10); // L: 780 + CollisionMap.findAndLoadCache("oldschool", var4, var5, 21); // L: 784 + } catch (Exception var6) { // L: 786 + class223.RunException_sendStackTrace((String)null, var6); // L: 787 } - class1.client = this; // L: 782 - class217.clientType = clientType; // L: 783 - if (field667 == -1) { // L: 784 - field667 = 0; // L: 785 + class10.client = this; // L: 789 + RunException.clientType = clientType; // L: 790 + if (field605 == -1) { // L: 791 + field605 = 0; // L: 792 } - this.startThread(765, 503, 194); // L: 787 + this.startThread(765, 503, 195); // L: 794 } - } catch (RuntimeException var11) { - throw class298.newRunException(var11, "client.init(" + ')'); + } catch (RuntimeException var7) { + throw UserComparator10.newRunException(var7, "client.init(" + ')'); } - } // L: 788 + } // L: 795 - @ObfuscatedName("ej") + @ObfuscatedName("en") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-733084897" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { // L: 1069 - long var2 = Tiles.currentTimeMillis(); // L: 1072 - int var4 = (int)(var2 - NetCache.field3222); // L: 1073 - NetCache.field3222 = var2; // L: 1074 - if (var4 > 200) { // L: 1075 - var4 = 200; - } - - NetCache.NetCache_loadTime += var4; // L: 1076 - boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1077 - var1 = true; // L: 1078 - } else if (class297.NetCache_socket == null) { // L: 1081 - var1 = false; // L: 1082 - } else { - try { - label243: { - if (NetCache.NetCache_loadTime > 30000) { // L: 1086 - throw new IOException(); - } - - NetFileRequest var5; - Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1087 - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1088 - var6 = new Buffer(4); // L: 1089 - var6.writeByte(1); // L: 1090 - var6.writeMedium((int)var5.key); // L: 1091 - class297.NetCache_socket.write(var6.array, 0, 4); // L: 1092 - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1093 - --NetCache.NetCache_pendingPriorityWritesCount; // L: 1094 - ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1095 - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1097 - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1098 - var6 = new Buffer(4); // L: 1099 - var6.writeByte(0); // L: 1100 - var6.writeMedium((int)var5.key); // L: 1101 - class297.NetCache_socket.write(var6.array, 0, 4); // L: 1102 - var5.removeDual(); // L: 1103 - NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1104 - --NetCache.NetCache_pendingWritesCount; // L: 1105 - ++NetCache.NetCache_pendingResponsesCount; // L: 1106 - } - - for (int var17 = 0; var17 < 100; ++var17) { // L: 1108 - int var18 = class297.NetCache_socket.available(); // L: 1109 - if (var18 < 0) { // L: 1110 - throw new IOException(); - } - - if (var18 == 0) { // L: 1111 - break; - } - - NetCache.NetCache_loadTime = 0; // L: 1112 - byte var7 = 0; // L: 1113 - if (SecureRandomCallable.NetCache_currentResponse == null) { // L: 1114 - var7 = 8; - } else if (NetCache.field3219 == 0) { // L: 1115 - var7 = 1; - } - - int var8; - int var9; - int var10; - int var12; - byte[] var10000; - int var10001; - Buffer var25; - if (var7 > 0) { // L: 1116 - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1117 - if (var8 > var18) { // L: 1118 - var8 = var18; - } - - class297.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1119 - if (NetCache.field3213 != 0) { // L: 1120 - for (var9 = 0; var9 < var8; ++var9) { // L: 1121 - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3213; - } - } - - var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1123 - var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1124 - break; - } - - if (SecureRandomCallable.NetCache_currentResponse == null) { // L: 1125 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1126 - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1127 - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1128 - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1129 - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1130 - long var13 = (long)(var10 + (var9 << 16)); // L: 1131 - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1132 - PlayerType.field3137 = true; // L: 1133 - if (var15 == null) { // L: 1134 - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1135 - PlayerType.field3137 = false; // L: 1136 - } - - if (var15 == null) { // L: 1138 - throw new IOException(); // L: 1139 - } - - int var16 = var11 == 0 ? 5 : 9; // L: 1141 - SecureRandomCallable.NetCache_currentResponse = var15; // L: 1142 - NetCache.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + SecureRandomCallable.NetCache_currentResponse.padding); // L: 1143 - NetCache.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1144 - NetCache.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1145 - NetCache.field3219 = 8; // L: 1146 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1147 - } else if (NetCache.field3219 == 0) { // L: 1150 - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1151 - NetCache.field3219 = 1; // L: 1152 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1153 - } else { - SecureRandomCallable.NetCache_currentResponse = null; // L: 1157 - } - } - } else { - var8 = NetCache.NetCache_responseArchiveBuffer.array.length - SecureRandomCallable.NetCache_currentResponse.padding; // L: 1163 - var9 = 512 - NetCache.field3219; // L: 1164 - if (var9 > var8 - NetCache.NetCache_responseArchiveBuffer.offset) { // L: 1165 - var9 = var8 - NetCache.NetCache_responseArchiveBuffer.offset; - } - - if (var9 > var18) { // L: 1166 - var9 = var18; - } - - class297.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var9); // L: 1167 - if (NetCache.field3213 != 0) { // L: 1168 - for (var10 = 0; var10 < var9; ++var10) { // L: 1169 - var10000 = NetCache.NetCache_responseArchiveBuffer.array; - var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var10; - var10000[var10001] ^= NetCache.field3213; - } - } - - var25 = NetCache.NetCache_responseArchiveBuffer; // L: 1171 - var25.offset += var9; - NetCache.field3219 += var9; // L: 1172 - if (var8 == NetCache.NetCache_responseArchiveBuffer.offset) { // L: 1173 - if (SecureRandomCallable.NetCache_currentResponse.key == 16711935L) { // L: 1174 - SoundSystem.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; // L: 1175 - - for (var10 = 0; var10 < 256; ++var10) { // L: 1176 - Archive var19 = NetCache.NetCache_archives[var10]; // L: 1177 - if (var19 != null) { // L: 1178 - SoundSystem.NetCache_reference.offset = var10 * 8 + 5; // L: 1179 - var12 = SoundSystem.NetCache_reference.readInt(); // L: 1180 - int var20 = SoundSystem.NetCache_reference.readInt(); // L: 1181 - var19.loadIndex(var12, var20); // L: 1182 - } - } - } else { - NetCache.NetCache_crc.reset(); // L: 1187 - NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1188 - var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1189 - if (var10 != SecureRandomCallable.NetCache_currentResponse.crc) { // L: 1190 - try { - class297.NetCache_socket.close(); // L: 1192 - } catch (Exception var23) { // L: 1194 - } - - ++NetCache.NetCache_crcMismatches; // L: 1195 - class297.NetCache_socket = null; // L: 1196 - NetCache.field3213 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1197 - var1 = false; // L: 1198 - break label243; - } - - NetCache.NetCache_crcMismatches = 0; // L: 1201 - NetCache.NetCache_ioExceptions = 0; // L: 1202 - SecureRandomCallable.NetCache_currentResponse.archive.write((int)(SecureRandomCallable.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, 16711680L == (SecureRandomCallable.NetCache_currentResponse.key & 16711680L), PlayerType.field3137); // L: 1203 - } - - SecureRandomCallable.NetCache_currentResponse.remove(); // L: 1205 - if (PlayerType.field3137) { // L: 1206 - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; // L: 1207 - } - - NetCache.field3219 = 0; // L: 1208 - SecureRandomCallable.NetCache_currentResponse = null; // L: 1209 - NetCache.NetCache_responseArchiveBuffer = null; // L: 1210 - } else { - if (NetCache.field3219 != 512) { // L: 1212 - break; - } - - NetCache.field3219 = 0; - } - } - } - - var1 = true; // L: 1216 - } - } catch (IOException var24) { - try { - class297.NetCache_socket.close(); // L: 1220 - } catch (Exception var22) { // L: 1222 - } - - ++NetCache.NetCache_ioExceptions; // L: 1223 - class297.NetCache_socket = null; // L: 1224 - var1 = false; // L: 1225 - } - } - - if (!var1) { // L: 1229 + if (gameState != 1000) { // L: 1096 + boolean var1 = WorldMapCacheName.method3189(); // L: 1097 + if (!var1) { // L: 1098 this.doCycleJs5Connect(); } } - } // L: 1230 + } // L: 1099 - @ObfuscatedName("ed") + @ObfuscatedName("eq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1394260996" + garbageValue = "-1791659166" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { // L: 1233 - this.error("js5crc"); // L: 1234 - gameState = 1000; // L: 1235 + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1102 + this.error("js5crc"); // L: 1103 + gameState = 1000; // L: 1104 } else { - if (NetCache.NetCache_ioExceptions >= 4) { // L: 1238 - if (gameState <= 5) { // L: 1239 - this.error("js5io"); // L: 1240 - gameState = 1000; // L: 1241 - return; // L: 1242 + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1107 + if (gameState <= 5) { // L: 1108 + this.error("js5io"); // L: 1109 + gameState = 1000; // L: 1110 + return; // L: 1111 } - field761 = 3000; // L: 1245 - NetCache.NetCache_ioExceptions = 3; // L: 1246 + field630 = 3000; // L: 1114 + NetCache.NetCache_ioExceptions = 3; // L: 1115 } - if (--field761 + 1 <= 0) { // L: 1249 + if (--field630 + 1 <= 0) { // L: 1118 try { - if (js5ConnectState == 0) { // L: 1251 - TaskHandler.js5SocketTask = GameEngine.taskHandler.newSocketTask(MusicPatchNode.worldHost, DynamicObject.currentPort); // L: 1252 - ++js5ConnectState; // L: 1253 + if (js5ConnectState == 0) { // L: 1120 + Message.js5SocketTask = GameEngine.taskHandler.newSocketTask(MusicPatch.worldHost, class5.currentPort); // L: 1121 + ++js5ConnectState; // L: 1122 } - if (js5ConnectState == 1) { // L: 1255 - if (TaskHandler.js5SocketTask.status == 2) { // L: 1256 - this.js5Error(-1); // L: 1257 - return; // L: 1258 + if (js5ConnectState == 1) { // L: 1124 + if (Message.js5SocketTask.status == 2) { // L: 1125 + this.js5Error(-1); // L: 1126 + return; // L: 1127 } - if (TaskHandler.js5SocketTask.status == 1) { // L: 1260 + if (Message.js5SocketTask.status == 1) { // L: 1129 ++js5ConnectState; } } - if (js5ConnectState == 2) { // L: 1262 - if (useBufferedSocket) { // L: 1263 - WorldMapArea.js5Socket = method1841((Socket)TaskHandler.js5SocketTask.result, 40000, 5000); // L: 1264 + if (js5ConnectState == 2) { // L: 1131 + if (useBufferedSocket) { // L: 1132 + KeyHandler.js5Socket = ServerPacket.method3901((Socket)Message.js5SocketTask.result, 40000, 5000); // L: 1133 } else { - WorldMapArea.js5Socket = new NetSocket((Socket)TaskHandler.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1267 + KeyHandler.js5Socket = new NetSocket((Socket)Message.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1136 } - Buffer var1 = new Buffer(5); // L: 1269 - var1.writeByte(15); // L: 1270 - var1.writeInt(194); // L: 1271 - WorldMapArea.js5Socket.write(var1.array, 0, 5); // L: 1272 - ++js5ConnectState; // L: 1273 - World.field1036 = Tiles.currentTimeMillis(); // L: 1274 + Buffer var1 = new Buffer(5); // L: 1138 + var1.writeByte(15); // L: 1139 + var1.writeInt(195); // L: 1140 + KeyHandler.js5Socket.write(var1.array, 0, 5); // L: 1141 + ++js5ConnectState; // L: 1142 + PacketBufferNode.field2348 = ObjectSound.currentTimeMillis(); // L: 1143 } - if (js5ConnectState == 3) { // L: 1276 - if (WorldMapArea.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1277 - int var5 = WorldMapArea.js5Socket.readUnsignedByte(); // L: 1278 - if (var5 != 0) { // L: 1279 - this.js5Error(var5); // L: 1280 - return; // L: 1281 + if (js5ConnectState == 3) { // L: 1145 + if (KeyHandler.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1146 + int var5 = KeyHandler.js5Socket.readUnsignedByte(); // L: 1147 + if (var5 != 0) { // L: 1148 + this.js5Error(var5); // L: 1149 + return; // L: 1150 } - ++js5ConnectState; // L: 1283 - } else if (Tiles.currentTimeMillis() - World.field1036 > 30000L) { // L: 1286 - this.js5Error(-2); // L: 1287 - return; // L: 1288 + ++js5ConnectState; // L: 1152 + } else if (ObjectSound.currentTimeMillis() - PacketBufferNode.field2348 > 30000L) { // L: 1155 + this.js5Error(-2); // L: 1156 + return; // L: 1157 } } - if (js5ConnectState == 4) { // L: 1292 - AbstractSocket var10 = WorldMapArea.js5Socket; // L: 1293 - boolean var2 = gameState > 20; // L: 1294 - if (class297.NetCache_socket != null) { // L: 1296 + if (js5ConnectState == 4) { // L: 1161 + AbstractSocket var10 = KeyHandler.js5Socket; // L: 1162 + boolean var2 = gameState > 20; // L: 1163 + if (class303.NetCache_socket != null) { // L: 1165 try { - class297.NetCache_socket.close(); // L: 1298 - } catch (Exception var8) { // L: 1300 + class303.NetCache_socket.close(); // L: 1167 + } catch (Exception var8) { // L: 1169 } - class297.NetCache_socket = null; // L: 1301 + class303.NetCache_socket = null; // L: 1170 } - class297.NetCache_socket = var10; // L: 1303 - Actor.method1867(var2); // L: 1304 - NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1305 - SecureRandomCallable.NetCache_currentResponse = null; // L: 1306 - NetCache.NetCache_responseArchiveBuffer = null; // L: 1307 - NetCache.field3219 = 0; // L: 1308 + class303.NetCache_socket = var10; // L: 1172 + class246.method4409(var2); // L: 1173 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1174 + class208.NetCache_currentResponse = null; // L: 1175 + InterfaceParent.NetCache_responseArchiveBuffer = null; // L: 1176 + NetCache.field3295 = 0; // L: 1177 while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1310 - if (var3 == null) { // L: 1311 + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1179 + if (var3 == null) { // L: 1180 while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1317 - if (var3 == null) { // L: 1318 - if (NetCache.field3213 != 0) { // L: 1324 + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1186 + if (var3 == null) { // L: 1187 + if (NetCache.field3287 != 0) { // L: 1193 try { - Buffer var11 = new Buffer(4); // L: 1326 - var11.writeByte(4); // L: 1327 - var11.writeByte(NetCache.field3213); // L: 1328 - var11.writeShort(0); // L: 1329 - class297.NetCache_socket.write(var11.array, 0, 4); // L: 1330 + Buffer var11 = new Buffer(4); // L: 1195 + var11.writeByte(4); // L: 1196 + var11.writeByte(NetCache.field3287); // L: 1197 + var11.writeShort(0); // L: 1198 + class303.NetCache_socket.write(var11.array, 0, 4); // L: 1199 } catch (IOException var7) { try { - class297.NetCache_socket.close(); // L: 1334 - } catch (Exception var6) { // L: 1336 + class303.NetCache_socket.close(); // L: 1203 + } catch (Exception var6) { // L: 1205 } - ++NetCache.NetCache_ioExceptions; // L: 1337 - class297.NetCache_socket = null; // L: 1338 + ++NetCache.NetCache_ioExceptions; // L: 1206 + class303.NetCache_socket = null; // L: 1207 } } - NetCache.NetCache_loadTime = 0; // L: 1341 - NetCache.field3222 = Tiles.currentTimeMillis(); // L: 1342 - TaskHandler.js5SocketTask = null; // L: 1344 - WorldMapArea.js5Socket = null; // L: 1345 - js5ConnectState = 0; // L: 1346 - js5Errors = 0; // L: 1347 - return; // L: 1353 + NetCache.NetCache_loadTime = 0; // L: 1210 + NetCache.field3284 = ObjectSound.currentTimeMillis(); // L: 1211 + Message.js5SocketTask = null; // L: 1213 + KeyHandler.js5Socket = null; // L: 1214 + js5ConnectState = 0; // L: 1215 + js5Errors = 0; // L: 1216 + return; // L: 1222 } - NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1319 - NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1320 - ++NetCache.NetCache_pendingWritesCount; // L: 1321 - --NetCache.NetCache_pendingResponsesCount; // L: 1322 + NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1188 + NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1189 + ++NetCache.NetCache_pendingWritesCount; // L: 1190 + --NetCache.NetCache_pendingResponsesCount; // L: 1191 } } - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1312 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1313 - --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1314 + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1181 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 1182 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 1183 } } - } catch (IOException var9) { // L: 1350 - this.js5Error(-3); // L: 1351 + } catch (IOException var9) { // L: 1219 + this.js5Error(-3); // L: 1220 } } } - } // L: 1236 + } // L: 1105 - @ObfuscatedName("ei") + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "78" + descriptor = "(II)V", + garbageValue = "1994468046" ) @Export("js5Error") void js5Error(int var1) { - TaskHandler.js5SocketTask = null; // L: 1356 - WorldMapArea.js5Socket = null; // L: 1357 - js5ConnectState = 0; // L: 1358 - if (DynamicObject.currentPort == MouseRecorder.worldPort) { // L: 1359 - DynamicObject.currentPort = class171.js5Port; + Message.js5SocketTask = null; // L: 1225 + KeyHandler.js5Socket = null; // L: 1226 + js5ConnectState = 0; // L: 1227 + if (class5.currentPort == AttackOption.worldPort) { // L: 1228 + class5.currentPort = Calendar.js5Port; } else { - DynamicObject.currentPort = MouseRecorder.worldPort; // L: 1360 + class5.currentPort = AttackOption.worldPort; // L: 1229 } - ++js5Errors; // L: 1361 - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1362 - if (gameState <= 5) { // L: 1363 - this.error("js5connect_full"); // L: 1364 - gameState = 1000; // L: 1365 - } else { - field761 = 3000; // L: 1367 - } - } else if (js5Errors >= 2 && var1 == 6) { // L: 1369 - this.error("js5connect_outofdate"); // L: 1370 - gameState = 1000; // L: 1371 - } else if (js5Errors >= 4) { // L: 1373 - if (gameState <= 5) { // L: 1374 - this.error("js5connect"); // L: 1375 - gameState = 1000; // L: 1376 - } else { - field761 = 3000; // L: 1378 + ++js5Errors; // L: 1230 + if (js5Errors < 2 || var1 != 7 && var1 != 9) { // L: 1231 + if (js5Errors >= 2 && var1 == 6) { // L: 1238 + this.error("js5connect_outofdate"); // L: 1239 + gameState = 1000; // L: 1240 + } else if (js5Errors >= 4) { // L: 1242 + if (gameState <= 5) { // L: 1243 + this.error("js5connect"); // L: 1244 + gameState = 1000; // L: 1245 + } else { + field630 = 3000; // L: 1247 + } } + } else if (gameState <= 5) { // L: 1232 + this.error("js5connect_full"); // L: 1233 + gameState = 1000; // L: 1234 + } else { + field630 = 3000; // L: 1236 } - } // L: 1380 + } // L: 1249 - @ObfuscatedName("ft") + @ObfuscatedName("ee") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1483271988" + descriptor = "(B)V", + garbageValue = "36" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); // L: 1795 - PacketBuffer var2 = packetWriter.packetBuffer; // L: 1796 + Object var1 = packetWriter.getSocket(); // L: 1680 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 1681 try { - if (loginState == 0) { // L: 1798 - if (WorldMapManager.secureRandom == null && (secureRandomFuture.isDone() || field696 > 250)) { // L: 1799 - WorldMapManager.secureRandom = secureRandomFuture.get(); // L: 1800 - secureRandomFuture.shutdown(); // L: 1801 - secureRandomFuture = null; // L: 1802 + if (loginState == 0) { // L: 1683 + if (Canvas.secureRandom == null && (secureRandomFuture.isDone() || field633 > 250)) { // L: 1684 + Canvas.secureRandom = secureRandomFuture.get(); // L: 1685 + secureRandomFuture.shutdown(); // L: 1686 + secureRandomFuture = null; // L: 1687 } - if (WorldMapManager.secureRandom != null) { // L: 1804 - if (var1 != null) { // L: 1805 - ((AbstractSocket)var1).close(); // L: 1806 - var1 = null; // L: 1807 + if (Canvas.secureRandom != null) { // L: 1689 + if (var1 != null) { // L: 1690 + ((AbstractSocket)var1).close(); // L: 1691 + var1 = null; // L: 1692 } - NetSocket.socketTask = null; // L: 1809 - field712 = false; // L: 1810 - field696 = 0; // L: 1811 - loginState = 1; // L: 1812 + socketTask = null; // L: 1694 + field737 = false; // L: 1695 + field633 = 0; // L: 1696 + loginState = 1; // L: 1697 } } - if (loginState == 1) { // L: 1815 - if (NetSocket.socketTask == null) { // L: 1816 - NetSocket.socketTask = GameEngine.taskHandler.newSocketTask(MusicPatchNode.worldHost, DynamicObject.currentPort); // L: 1817 + if (loginState == 1) { // L: 1700 + if (socketTask == null) { // L: 1701 + socketTask = GameEngine.taskHandler.newSocketTask(MusicPatch.worldHost, class5.currentPort); // L: 1702 } - if (NetSocket.socketTask.status == 2) { // L: 1819 + if (socketTask.status == 2) { // L: 1704 throw new IOException(); } - if (NetSocket.socketTask.status == 1) { // L: 1820 - if (useBufferedSocket) { // L: 1821 - var1 = method1841((Socket)NetSocket.socketTask.result, 40000, 5000); // L: 1822 + if (socketTask.status == 1) { // L: 1705 + if (useBufferedSocket) { // L: 1706 + var1 = ServerPacket.method3901((Socket)socketTask.result, 40000, 5000); // L: 1707 } else { - var1 = new NetSocket((Socket)NetSocket.socketTask.result, GameEngine.taskHandler, 5000); // L: 1825 + var1 = new NetSocket((Socket)socketTask.result, GameEngine.taskHandler, 5000); // L: 1710 } - packetWriter.setSocket((AbstractSocket)var1); // L: 1827 - NetSocket.socketTask = null; // L: 1828 - loginState = 2; // L: 1829 + packetWriter.setSocket((AbstractSocket)var1); // L: 1712 + socketTask = null; // L: 1713 + loginState = 2; // L: 1714 } } - PacketBufferNode var4; - if (loginState == 2) { // L: 1832 - packetWriter.clearBuffer(); // L: 1833 - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 1838 - var4 = new PacketBufferNode(); // L: 1839 - } else { - var4 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 1842 - } - - var4.clientPacket = null; // L: 1845 - var4.clientPacketLength = 0; // L: 1846 - var4.packetBuffer = new PacketBuffer(5000); // L: 1847 - var4.packetBuffer.writeByte(LoginPacket.field2342.id); // L: 1851 - packetWriter.addNode(var4); // L: 1852 - packetWriter.flush(); // L: 1853 - var2.offset = 0; // L: 1854 - loginState = 3; // L: 1855 + PacketBufferNode var3; + if (loginState == 2) { // L: 1717 + packetWriter.clearBuffer(); // L: 1718 + var3 = class6.method98(); // L: 1719 + var3.packetBuffer.writeByte(LoginPacket.field2456.id); // L: 1720 + packetWriter.addNode(var3); // L: 1721 + packetWriter.flush(); // L: 1722 + var2.offset = 0; // L: 1723 + loginState = 3; // L: 1724 } + int var4; boolean var12; - int var13; - if (loginState == 3) { // L: 1857 - if (class197.pcmPlayer0 != null) { // L: 1858 - class197.pcmPlayer0.method2612(); + if (loginState == 3) { // L: 1726 + if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 1727 + ApproximateRouteStrategy.pcmPlayer0.method807(); } - if (WorldMapDecorationType.pcmPlayer1 != null) { // L: 1859 - WorldMapDecorationType.pcmPlayer1.method2612(); + if (class43.pcmPlayer1 != null) { // L: 1728 + class43.pcmPlayer1.method807(); } - var12 = true; // L: 1860 - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1861 1862 + var12 = true; // L: 1729 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1730 1731 var12 = false; } - if (var12) { // L: 1864 - var13 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1865 - if (class197.pcmPlayer0 != null) { // L: 1866 - class197.pcmPlayer0.method2612(); + if (var12) { // L: 1733 + var4 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1734 + if (ApproximateRouteStrategy.pcmPlayer0 != null) { // L: 1735 + ApproximateRouteStrategy.pcmPlayer0.method807(); } - if (WorldMapDecorationType.pcmPlayer1 != null) { // L: 1867 - WorldMapDecorationType.pcmPlayer1.method2612(); + if (class43.pcmPlayer1 != null) { // L: 1736 + class43.pcmPlayer1.method807(); } - if (var13 != 0) { // L: 1868 - class52.getLoginError(var13); // L: 1869 - return; // L: 1870 + if (var4 != 0) { // L: 1737 + Messages.getLoginError(var4); // L: 1738 + return; // L: 1739 } - var2.offset = 0; // L: 1872 - loginState = 4; // L: 1873 + var2.offset = 0; // L: 1741 + loginState = 4; // L: 1742 } } - int var35; - if (loginState == 4) { // L: 1876 - if (var2.offset < 8) { // L: 1877 - var35 = ((AbstractSocket)var1).available(); // L: 1878 - if (var35 > 8 - var2.offset) { // L: 1879 - var35 = 8 - var2.offset; + int var34; + if (loginState == 4) { // L: 1745 + if (var2.offset < 8) { // L: 1746 + var34 = ((AbstractSocket)var1).available(); // L: 1747 + if (var34 > 8 - var2.offset) { // L: 1748 + var34 = 8 - var2.offset; } - if (var35 > 0) { // L: 1880 - ((AbstractSocket)var1).read(var2.array, var2.offset, var35); // L: 1881 - var2.offset += var35; // L: 1882 + if (var34 > 0) { // L: 1749 + ((AbstractSocket)var1).read(var2.array, var2.offset, var34); // L: 1750 + var2.offset += var34; // L: 1751 } } - if (var2.offset == 8) { // L: 1885 - var2.offset = 0; // L: 1886 - class236.field3108 = var2.readLong(); // L: 1887 - loginState = 5; // L: 1888 + if (var2.offset == 8) { // L: 1754 + var2.offset = 0; // L: 1755 + HealthBarUpdate.field1277 = var2.readLong(); // L: 1756 + loginState = 5; // L: 1757 } } int var7; int var9; - int var15; - if (loginState == 5) { // L: 1891 - packetWriter.packetBuffer.offset = 0; // L: 1892 - packetWriter.clearBuffer(); // L: 1893 - PacketBuffer var3 = new PacketBuffer(500); // L: 1894 - int[] var27 = new int[]{WorldMapManager.secureRandom.nextInt(), WorldMapManager.secureRandom.nextInt(), WorldMapManager.secureRandom.nextInt(), WorldMapManager.secureRandom.nextInt()}; // L: 1895 1896 1897 1898 1899 - var3.offset = 0; // L: 1900 - var3.writeByte(1); // L: 1901 - var3.writeInt(var27[0]); // L: 1902 - var3.writeInt(var27[1]); // L: 1903 - var3.writeInt(var27[2]); // L: 1904 - var3.writeInt(var27[3]); // L: 1905 - var3.writeLong(class236.field3108); // L: 1906 + int var14; + if (loginState == 5) { // L: 1760 + packetWriter.packetBuffer.offset = 0; // L: 1761 + packetWriter.clearBuffer(); // L: 1762 + PacketBuffer var23 = new PacketBuffer(500); // L: 1763 + int[] var13 = new int[]{Canvas.secureRandom.nextInt(), Canvas.secureRandom.nextInt(), Canvas.secureRandom.nextInt(), Canvas.secureRandom.nextInt()}; // L: 1764 1765 1766 1767 1768 + var23.offset = 0; // L: 1769 + var23.writeByte(1); // L: 1770 + var23.writeInt(var13[0]); // L: 1771 + var23.writeInt(var13[1]); // L: 1772 + var23.writeInt(var13[2]); // L: 1773 + var23.writeInt(var13[3]); // L: 1774 + var23.writeLong(HealthBarUpdate.field1277); // L: 1775 int var11; - if (gameState == 40) { // L: 1907 - var3.writeInt(class1.field5[0]); // L: 1908 - var3.writeInt(class1.field5[1]); // L: 1909 - var3.writeInt(class1.field5[2]); // L: 1910 - var3.writeInt(class1.field5[3]); // L: 1911 + if (gameState == 40) { // L: 1776 + var23.writeInt(class231.field2803[0]); // L: 1777 + var23.writeInt(class231.field2803[1]); // L: 1778 + var23.writeInt(class231.field2803[2]); // L: 1779 + var23.writeInt(class231.field2803[3]); // L: 1780 } else { - var3.writeByte(field661.rsOrdinal()); // L: 1914 - switch(field661.field2014) { // L: 1915 + var23.writeByte(field636.rsOrdinal()); // L: 1783 + switch(field636.field1460) { // L: 1784 case 0: - case 2: - var3.writeMedium(Canvas.field439); // L: 1939 - ++var3.offset; // L: 1940 - break; - case 1: - var3.offset += 4; // L: 1918 - break; // L: 1919 case 3: - LinkedHashMap var6 = WorldMapSectionType.clientPreferences.parameters; // L: 1924 - String var8 = Login.Login_username; // L: 1926 - var9 = var8.length(); // L: 1928 - int var10 = 0; // L: 1929 + var23.writeMedium(class139.field1560); // L: 1793 + ++var23.offset; // L: 1794 + break; // L: 1795 + case 1: + LinkedHashMap var6 = Login.clientPreferences.parameters; // L: 1800 + String var8 = Login.Login_username; // L: 1802 + var9 = var8.length(); // L: 1804 + int var10 = 0; // L: 1805 - for (var11 = 0; var11 < var9; ++var11) { // L: 1930 + for (var11 = 0; var11 < var9; ++var11) { // L: 1806 var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var3.writeInt((Integer)var6.get(var10)); // L: 1933 + var23.writeInt((Integer)var6.get(var10)); // L: 1809 + break; + case 2: + var23.offset += 4; // L: 1787 } - var3.writeByte(class323.field3852.rsOrdinal()); // L: 1944 - var3.writeStringCp1252NullTerminated(Login.Login_password); // L: 1945 + var23.writeByte(class385.field4204.rsOrdinal()); // L: 1813 + var23.writeStringCp1252NullTerminated(Login.Login_password); // L: 1814 } - var3.encryptRsa(class92.field1184, class92.field1177); // L: 1947 - class1.field5 = var27; // L: 1948 - PacketBufferNode var30; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 1953 - var30 = new PacketBufferNode(); // L: 1954 + var23.encryptRsa(class82.field983, class82.field982); // L: 1816 + class231.field2803 = var13; // L: 1817 + PacketBufferNode var5 = class6.method98(); // L: 1818 + var5.packetBuffer.offset = 0; // L: 1819 + if (gameState == 40) { // L: 1820 + var5.packetBuffer.writeByte(LoginPacket.field2452.id); // L: 1821 } else { - var30 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 1957 + var5.packetBuffer.writeByte(LoginPacket.field2451.id); // L: 1824 } - var30.clientPacket = null; // L: 1960 - var30.clientPacketLength = 0; // L: 1961 - var30.packetBuffer = new PacketBuffer(5000); // L: 1962 - var30.packetBuffer.offset = 0; // L: 1966 - if (gameState == 40) { // L: 1967 - var30.packetBuffer.writeByte(LoginPacket.field2338.id); // L: 1968 + var5.packetBuffer.writeShort(0); // L: 1826 + var14 = var5.packetBuffer.offset; // L: 1827 + var5.packetBuffer.writeInt(195); // L: 1828 + var5.packetBuffer.writeInt(1); // L: 1829 + var5.packetBuffer.writeByte(clientType); // L: 1830 + var5.packetBuffer.writeByte(field605); // L: 1831 + var5.packetBuffer.writeBytes(var23.array, 0, var23.offset); // L: 1832 + var7 = var5.packetBuffer.offset; // L: 1833 + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 1834 + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 1835 + var5.packetBuffer.writeShort(InterfaceParent.canvasWidth); // L: 1836 + var5.packetBuffer.writeShort(GameEngine.canvasHeight); // L: 1837 + PacketBuffer var32 = var5.packetBuffer; // L: 1838 + if (randomDatData != null) { // L: 1840 + var32.writeBytes(randomDatData, 0, randomDatData.length); // L: 1841 } else { - var30.packetBuffer.writeByte(LoginPacket.field2336.id); // L: 1971 + byte[] var15 = Tile.method3356(); // L: 1844 + var32.writeBytes(var15, 0, var15.length); // L: 1845 } - var30.packetBuffer.writeShort(0); // L: 1973 - var7 = var30.packetBuffer.offset; // L: 1974 - var30.packetBuffer.writeInt(194); // L: 1975 - var30.packetBuffer.writeInt(1); // L: 1976 - var30.packetBuffer.writeByte(clientType); // L: 1977 - var30.packetBuffer.writeByte(field667); // L: 1978 - var30.packetBuffer.writeBytes(var3.array, 0, var3.offset); // L: 1979 - var15 = var30.packetBuffer.offset; // L: 1980 - var30.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 1981 - var30.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 1982 - var30.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); // L: 1983 - var30.packetBuffer.writeShort(class25.canvasHeight); // L: 1984 - GrandExchangeOfferOwnWorldComparator.method1378(var30.packetBuffer); // L: 1985 - var30.packetBuffer.writeStringCp1252NullTerminated(AccessFile.field4100); // L: 1986 - var30.packetBuffer.writeInt(ItemLayer.field1562); // L: 1987 - Buffer var16 = new Buffer(GrandExchangeOfferUnitPriceComparator.platformInfo.size()); // L: 1988 - GrandExchangeOfferUnitPriceComparator.platformInfo.write(var16); // L: 1989 - var30.packetBuffer.writeBytes(var16.array, 0, var16.array.length); // L: 1990 - var30.packetBuffer.writeByte(clientType); // L: 1991 - var30.packetBuffer.writeInt(0); // L: 1992 - var30.packetBuffer.method5876(class8.archive5.hash); // L: 1993 - var30.packetBuffer.method5781(UrlRequester.archive6.hash); // L: 1994 - var30.packetBuffer.method5781(WorldMapData_0.archive7.hash); // L: 1995 - var30.packetBuffer.method5736(WorldMapManager.archive11.hash); // L: 1996 - var30.packetBuffer.method5736(ModeWhere.archive8.hash); // L: 1997 - var30.packetBuffer.method5736(WorldMapSection0.archive12.hash); // L: 1998 - var30.packetBuffer.method5736(PlayerComposition.archive3.hash); // L: 1999 - var30.packetBuffer.method5781(CollisionMap.archive13.hash); // L: 2000 - var30.packetBuffer.writeInt(Login.archive20.hash); // L: 2001 - var30.packetBuffer.writeInt(class25.archive18.hash); // L: 2002 - var30.packetBuffer.writeInt(ViewportMouse.archive9.hash); // L: 2003 - var30.packetBuffer.writeInt(Tiles.archive14.hash); // L: 2004 - var30.packetBuffer.writeInt(LoginScreenAnimation.archive10.hash); // L: 2005 - var30.packetBuffer.method5781(ArchiveLoader.archive19.hash); // L: 2006 - var30.packetBuffer.method5876(WorldMapIcon_0.archive2.hash); // L: 2007 - var30.packetBuffer.writeInt(ItemComposition.archive17.hash); // L: 2008 - var30.packetBuffer.method5781(class52.archive0.hash); // L: 2009 - var30.packetBuffer.method5781(0); // L: 2010 - var30.packetBuffer.writeInt(WorldMapCacheName.archive4.hash); // L: 2011 - var30.packetBuffer.method5876(SpriteMask.archive15.hash); // L: 2012 - var30.packetBuffer.method5876(SpriteMask.archive1.hash); // L: 2013 - var30.packetBuffer.xteaEncrypt(var27, var15, var30.packetBuffer.offset); // L: 2014 - var30.packetBuffer.writeLengthShort(var30.packetBuffer.offset - var7); // L: 2015 - packetWriter.addNode(var30); // L: 2016 - packetWriter.flush(); // L: 2017 - packetWriter.isaacCipher = new IsaacCipher(var27); // L: 2018 - int[] var17 = new int[4]; // L: 2019 + var5.packetBuffer.writeStringCp1252NullTerminated(class0.field4); // L: 1847 + var5.packetBuffer.writeInt(FaceNormal.field2002); // L: 1848 + Buffer var37 = new Buffer(UserComparator8.platformInfo.size()); // L: 1849 + UserComparator8.platformInfo.write(var37); // L: 1850 + var5.packetBuffer.writeBytes(var37.array, 0, var37.array.length); // L: 1851 + var5.packetBuffer.writeByte(clientType); // L: 1852 + var5.packetBuffer.writeInt(0); // L: 1853 + var5.packetBuffer.method6754(MilliClock.archive13.hash); // L: 1854 + var5.packetBuffer.method6625(NPCComposition.archive20.hash); // L: 1855 + var5.packetBuffer.writeInt(class246.archive18.hash); // L: 1856 + var5.packetBuffer.writeInt(class373.archive10.hash); // L: 1857 + var5.packetBuffer.method6754(class8.archive6.hash); // L: 1858 + var5.packetBuffer.method6624(AbstractWorldMapData.archive9.hash); // L: 1859 + var5.packetBuffer.method6625(SoundSystem.archive8.hash); // L: 1860 + var5.packetBuffer.method6754(class12.archive7.hash); // L: 1861 + var5.packetBuffer.method6754(class283.archive19.hash); // L: 1862 + var5.packetBuffer.method6754(0); // L: 1863 + var5.packetBuffer.method6624(class10.archive11.hash); // L: 1864 + var5.packetBuffer.method6624(class0.archive17.hash); // L: 1865 + var5.packetBuffer.method6754(Buddy.archive15.hash); // L: 1866 + var5.packetBuffer.method6624(BuddyRankComparator.archive12.hash); // L: 1867 + var5.packetBuffer.writeInt(class367.archive1.hash); // L: 1868 + var5.packetBuffer.method6624(WorldMapSection0.archive14.hash); // L: 1869 + var5.packetBuffer.method6754(class5.archive3.hash); // L: 1870 + var5.packetBuffer.method6624(class157.archive5.hash); // L: 1871 + var5.packetBuffer.method6625(ItemContainer.archive4.hash); // L: 1872 + var5.packetBuffer.writeInt(TriBool.archive0.hash); // L: 1873 + var5.packetBuffer.method6625(class235.archive2.hash); // L: 1874 + var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); // L: 1875 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 1876 + packetWriter.addNode(var5); // L: 1877 + packetWriter.flush(); // L: 1878 + packetWriter.isaacCipher = new IsaacCipher(var13); // L: 1879 + int[] var16 = new int[4]; // L: 1880 - for (var11 = 0; var11 < 4; ++var11) { // L: 2020 - var17[var11] = var27[var11] + 50; + for (var11 = 0; var11 < 4; ++var11) { // L: 1881 + var16[var11] = var13[var11] + 50; } - var2.newIsaacCipher(var17); // L: 2021 - loginState = 6; // L: 2022 + var2.newIsaacCipher(var16); // L: 1882 + loginState = 6; // L: 1883 } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2024 2025 - var35 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2026 - if (var35 == 21 && gameState == 20) { // L: 2027 - loginState = 12; // L: 2028 - } else if (var35 == 2) { // L: 2030 - loginState = 14; // L: 2031 - } else if (var35 == 15 && gameState == 40) { // L: 2033 - packetWriter.serverPacketLength = -1; // L: 2034 - loginState = 19; // L: 2035 - } else if (var35 == 64) { // L: 2037 - loginState = 10; // L: 2038 - } else if (var35 == 23 && field786 < 1) { // L: 2040 - ++field786; // L: 2041 - loginState = 0; // L: 2042 - } else if (var35 == 29) { // L: 2044 - loginState = 17; // L: 2045 + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 1885 1886 + var34 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1887 + if (var34 == 21 && gameState == 20) { // L: 1888 + loginState = 12; // L: 1889 + } else if (var34 == 2) { // L: 1891 + loginState = 14; // L: 1892 + } else if (var34 == 15 && gameState == 40) { // L: 1894 + packetWriter.serverPacketLength = -1; // L: 1895 + loginState = 19; // L: 1896 + } else if (var34 == 64) { // L: 1898 + loginState = 10; // L: 1899 + } else if (var34 == 23 && field634 < 1) { // L: 1901 + ++field634; // L: 1902 + loginState = 0; // L: 1903 + } else if (var34 == 29) { // L: 1905 + loginState = 17; // L: 1906 } else { - if (var35 != 69) { // L: 2047 - class52.getLoginError(var35); // L: 2051 - return; // L: 2052 + if (var34 != 69) { // L: 1908 + Messages.getLoginError(var34); // L: 1912 + return; // L: 1913 } - loginState = 7; // L: 2048 + loginState = 7; // L: 1909 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2056 2057 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2058 - var2.offset = 0; // L: 2059 - Decimator.field1480 = var2.readUnsignedShort(); // L: 2060 - loginState = 8; // L: 2061 + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 1917 1918 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 1919 + var2.offset = 0; // L: 1920 + class367.field4117 = var2.readUnsignedShort(); // L: 1921 + loginState = 8; // L: 1922 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= Decimator.field1480) { // L: 2064 2065 - var2.offset = 0; // L: 2066 - ((AbstractSocket)var1).read(var2.array, var2.offset, Decimator.field1480); // L: 2067 - class7 var23 = WorldMapIcon_1.method376()[var2.readUnsignedByte()]; // L: 2068 + if (loginState == 8 && ((AbstractSocket)var1).available() >= class367.field4117) { // L: 1925 1926 + var2.offset = 0; // L: 1927 + ((AbstractSocket)var1).read(var2.array, var2.offset, class367.field4117); // L: 1928 + class34[] var24 = new class34[]{class34.field236}; // L: 1931 + class34 var35 = var24[var2.readUnsignedByte()]; // L: 1933 try { - switch(var23.field36) { // L: 2072 + switch(var35.field230) { // L: 1937 case 0: - class5 var28 = new class5(); // L: 2075 - this.field782 = new class9(var2, var28); // L: 2085 - loginState = 9; // L: 2086 + class28 var27 = new class28(); // L: 1944 + this.field640 = new class35(var2, var27); // L: 1950 + loginState = 9; // L: 1951 break; default: - throw new IllegalArgumentException(); // L: 2080 + throw new IllegalArgumentException(); // L: 1940 } - } catch (Exception var21) { // L: 2088 - class52.getLoginError(22); // L: 2089 - return; // L: 2090 + } catch (Exception var21) { // L: 1953 + Messages.getLoginError(22); // L: 1954 + return; // L: 1955 } } - if (loginState == 9 && this.field782.method108()) { // L: 2094 2095 - this.field702 = this.field782.method94(); // L: 2096 - this.field782.method93(); // L: 2097 - this.field782 = null; // L: 2098 - if (this.field702 == null) { // L: 2099 - class52.getLoginError(22); // L: 2100 - return; // L: 2101 + if (loginState == 9 && this.field640.method426()) { // L: 1959 1960 + this.field746 = this.field640.method425(); // L: 1961 + this.field640.method427(); // L: 1962 + this.field640 = null; // L: 1963 + if (this.field746 == null) { // L: 1964 + Messages.getLoginError(22); // L: 1965 + return; // L: 1966 } - packetWriter.clearBuffer(); // L: 2103 - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 2108 - var4 = new PacketBufferNode(); // L: 2109 - } else { - var4 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 2112 - } - - var4.clientPacket = null; // L: 2115 - var4.clientPacketLength = 0; // L: 2116 - var4.packetBuffer = new PacketBuffer(5000); // L: 2117 - var4.packetBuffer.writeByte(LoginPacket.field2337.id); // L: 2121 - var4.packetBuffer.writeShort(this.field702.offset); // L: 2122 - var4.packetBuffer.method5683(this.field702); // L: 2123 - packetWriter.addNode(var4); // L: 2124 - packetWriter.flush(); // L: 2125 - this.field702 = null; // L: 2126 - loginState = 6; // L: 2127 + packetWriter.clearBuffer(); // L: 1968 + var3 = class6.method98(); // L: 1969 + var3.packetBuffer.writeByte(LoginPacket.field2450.id); // L: 1970 + var3.packetBuffer.writeShort(this.field746.offset); // L: 1971 + var3.packetBuffer.method6574(this.field746); // L: 1972 + packetWriter.addNode(var3); // L: 1973 + packetWriter.flush(); // L: 1974 + this.field746 = null; // L: 1975 + loginState = 6; // L: 1976 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2130 2131 - MilliClock.field2032 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2132 - loginState = 11; // L: 2133 + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 1979 1980 + class11.field108 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1981 + loginState = 11; // L: 1982 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= MilliClock.field2032) { // L: 2136 2137 - ((AbstractSocket)var1).read(var2.array, 0, MilliClock.field2032); // L: 2138 - var2.offset = 0; // L: 2139 - loginState = 6; // L: 2140 + if (loginState == 11 && ((AbstractSocket)var1).available() >= class11.field108) { // L: 1985 1986 + ((AbstractSocket)var1).read(var2.array, 0, class11.field108); // L: 1987 + var2.offset = 0; // L: 1988 + loginState = 6; // L: 1989 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2143 2144 - field701 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2145 - loginState = 13; // L: 2146 + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 1992 1993 + field635 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 1994 + loginState = 13; // L: 1995 } - if (loginState == 13) { // L: 2149 - field696 = 0; // L: 2150 - InvDefinition.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field701 / 60 + " seconds."); // L: 2151 - if (--field701 <= 0) { // L: 2152 + if (loginState == 13) { // L: 1998 + field633 = 0; // L: 1999 + class9.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field635 / 60 + " seconds."); // L: 2000 + if (--field635 <= 0) { // L: 2001 loginState = 0; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2155 2156 - UserComparator7.field1999 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2157 - loginState = 15; // L: 2158 + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2004 2005 + WorldMapLabelSize.field1572 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2006 + loginState = 15; // L: 2007 } - boolean var36; - if (loginState == 15 && ((AbstractSocket)var1).available() >= UserComparator7.field1999) { // L: 2161 2162 - var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2163 - ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2164 - var2.offset = 0; // L: 2165 - var36 = false; // L: 2166 - if (var12) { // L: 2167 - var13 = var2.readByteIsaac() << 24; // L: 2168 - var13 |= var2.readByteIsaac() << 16; // L: 2169 - var13 |= var2.readByteIsaac() << 8; // L: 2170 - var13 |= var2.readByteIsaac(); // L: 2171 - String var33 = Login.Login_username; // L: 2173 - var7 = var33.length(); // L: 2175 - var15 = 0; // L: 2176 - var9 = 0; // L: 2177 + if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapLabelSize.field1572) { // L: 2010 2011 + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2012 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2013 + var2.offset = 0; // L: 2014 + boolean var25 = false; // L: 2015 + if (var12) { // L: 2016 + var4 = var2.readByteIsaac() << 24; // L: 2017 + var4 |= var2.readByteIsaac() << 16; // L: 2018 + var4 |= var2.readByteIsaac() << 8; // L: 2019 + var4 |= var2.readByteIsaac(); // L: 2020 + String var30 = Login.Login_username; // L: 2022 + var7 = var30.length(); // L: 2024 + int var17 = 0; // L: 2025 + var9 = 0; // L: 2026 while (true) { if (var9 >= var7) { - if (WorldMapSectionType.clientPreferences.parameters.size() >= 10 && !WorldMapSectionType.clientPreferences.parameters.containsKey(var15)) { // L: 2181 2182 - Iterator var34 = WorldMapSectionType.clientPreferences.parameters.entrySet().iterator(); // L: 2183 - var34.next(); // L: 2184 - var34.remove(); // L: 2185 + if (Login.clientPreferences.parameters.size() >= 10 && !Login.clientPreferences.parameters.containsKey(var17)) { // L: 2030 2031 + Iterator var33 = Login.clientPreferences.parameters.entrySet().iterator(); // L: 2032 + var33.next(); // L: 2033 + var33.remove(); // L: 2034 } - WorldMapSectionType.clientPreferences.parameters.put(var15, var13); // L: 2188 + Login.clientPreferences.parameters.put(var17, var4); // L: 2037 break; } - var15 = (var15 << 5) - var15 + var33.charAt(var9); + var17 = (var17 << 5) - var17 + var30.charAt(var9); ++var9; } } - if (Login_isUsernameRemembered) { // L: 2190 - WorldMapSectionType.clientPreferences.rememberedUsername = Login.Login_username; // L: 2191 + if (Login_isUsernameRemembered) { // L: 2039 + Login.clientPreferences.rememberedUsername = Login.Login_username; // L: 2040 } else { - WorldMapSectionType.clientPreferences.rememberedUsername = null; // L: 2194 + Login.clientPreferences.rememberedUsername = null; // L: 2043 } - class23.savePreferences(); // L: 2196 - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2197 - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2198 - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2199 - localPlayerIndex <<= 8; // L: 2200 - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2201 - field673 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2202 - ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2203 - var2.offset = 0; // L: 2204 - ServerPacket[] var5 = WorldMapRegion.ServerPacket_values(); // L: 2205 - int var19 = var2.readSmartByteShortIsaac(); // L: 2206 - if (var19 < 0 || var19 >= var5.length) { // L: 2207 - throw new IOException(var19 + " " + var2.offset); + Message.savePreferences(); // L: 2045 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2046 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2047 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2048 + localPlayerIndex <<= 8; // L: 2049 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2050 + field720 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2051 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2052 + var2.offset = 0; // L: 2053 + ServerPacket[] var28 = ItemLayer.ServerPacket_values(); // L: 2054 + var14 = var2.readSmartByteShortIsaac(); // L: 2055 + if (var14 < 0 || var14 >= var28.length) { // L: 2056 + throw new IOException(var14 + " " + var2.offset); } - packetWriter.serverPacket = var5[var19]; // L: 2208 - packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2209 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2210 - var2.offset = 0; // L: 2211 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2212 + packetWriter.serverPacket = var28[var14]; // L: 2057 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2058 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2059 + var2.offset = 0; // L: 2060 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2061 try { - Client var14 = class1.client; // L: 2214 - JSObject.getWindow(var14).call("zap", (Object[])null); // L: 2217 - } catch (Throwable var20) { // L: 2220 + class42.method509(class10.client, "zap"); // L: 2063 + } catch (Throwable var20) { // L: 2065 } - loginState = 16; // L: 2221 + loginState = 16; // L: 2066 } - if (loginState != 16) { // L: 2224 - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2355 2356 - var2.offset = 0; // L: 2357 - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2358 - var2.offset = 0; // L: 2359 - Interpreter.field1116 = var2.readUnsignedShort(); // L: 2360 - loginState = 18; // L: 2361 + if (loginState == 16) { // L: 2069 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2070 + var2.offset = 0; // L: 2071 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2072 + timer.method5587(); // L: 2073 + class304.method5536(); // L: 2074 + AccessFile.updatePlayer(var2); // L: 2075 + class105.field1327 = -1; // L: 2076 + Players.loadRegions(false, var2); // L: 2077 + packetWriter.serverPacket = null; // L: 2078 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= Interpreter.field1116) { // L: 2364 2365 - var2.offset = 0; // L: 2366 - ((AbstractSocket)var1).read(var2.array, 0, Interpreter.field1116); // L: 2367 - var2.offset = 0; // L: 2368 - String var26 = var2.readStringCp1252NullTerminated(); // L: 2369 - String var32 = var2.readStringCp1252NullTerminated(); // L: 2370 - String var29 = var2.readStringCp1252NullTerminated(); // L: 2371 - InvDefinition.setLoginResponseString(var26, var32, var29); // L: 2372 - ItemContainer.updateGameState(10); // L: 2373 + } else { + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2082 2083 + var2.offset = 0; // L: 2084 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2085 + var2.offset = 0; // L: 2086 + class9.field63 = var2.readUnsignedShort(); // L: 2087 + loginState = 18; // L: 2088 } - if (loginState == 19) { // L: 2376 - if (packetWriter.serverPacketLength == -1) { // L: 2377 - if (((AbstractSocket)var1).available() < 2) { // L: 2378 + if (loginState == 18 && ((AbstractSocket)var1).available() >= class9.field63) { // L: 2091 2092 + var2.offset = 0; // L: 2093 + ((AbstractSocket)var1).read(var2.array, 0, class9.field63); // L: 2094 + var2.offset = 0; // L: 2095 + String var26 = var2.readStringCp1252NullTerminated(); // L: 2096 + String var36 = var2.readStringCp1252NullTerminated(); // L: 2097 + String var29 = var2.readStringCp1252NullTerminated(); // L: 2098 + class9.setLoginResponseString(var26, var36, var29); // L: 2099 + class20.updateGameState(10); // L: 2100 + } + + if (loginState != 19) { // L: 2103 + ++field633; // L: 2153 + if (field633 > 2000) { // L: 2154 + if (field634 < 1) { // L: 2155 + if (AttackOption.worldPort == class5.currentPort) { // L: 2156 + class5.currentPort = Calendar.js5Port; + } else { + class5.currentPort = AttackOption.worldPort; // L: 2157 + } + + ++field634; // L: 2158 + loginState = 0; // L: 2159 + } else { + Messages.getLoginError(-3); // L: 2162 + } + } + } else { + if (packetWriter.serverPacketLength == -1) { // L: 2104 + if (((AbstractSocket)var1).available() < 2) { // L: 2105 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2379 - var2.offset = 0; // L: 2380 - packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2381 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2106 + var2.offset = 0; // L: 2107 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2108 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2383 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2384 - var2.offset = 0; // L: 2385 - var35 = packetWriter.serverPacketLength; // L: 2386 - timer.method5200(); // L: 2387 - class232.method4323(); // L: 2388 - class234.updatePlayer(var2); // L: 2389 - if (var35 != var2.offset) { // L: 2390 - throw new RuntimeException(); // L: 2391 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2110 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2111 + var2.offset = 0; // L: 2112 + var34 = packetWriter.serverPacketLength; // L: 2113 + timer.method5582(); // L: 2114 + packetWriter.clearBuffer(); // L: 2116 + packetWriter.packetBuffer.offset = 0; // L: 2117 + packetWriter.serverPacket = null; // L: 2118 + packetWriter.field1381 = null; // L: 2119 + packetWriter.field1392 = null; // L: 2120 + packetWriter.field1393 = null; // L: 2121 + packetWriter.serverPacketLength = 0; // L: 2122 + packetWriter.field1391 = 0; // L: 2123 + rebootTimer = 0; // L: 2124 + menuOptionsCount = 0; // L: 2126 + isMenuOpen = false; // L: 2127 + minimapState = 0; // L: 2129 + destinationX = 0; // L: 2130 + + for (var4 = 0; var4 < 2048; ++var4) { // L: 2131 + players[var4] = null; } - } - } else { - ++field696; // L: 2395 - if (field696 > 2000) { // L: 2396 - if (field786 < 1) { // L: 2397 - if (MouseRecorder.worldPort == DynamicObject.currentPort) { // L: 2398 - DynamicObject.currentPort = class171.js5Port; - } else { - DynamicObject.currentPort = MouseRecorder.worldPort; // L: 2399 - } - ++field786; // L: 2400 - loginState = 0; // L: 2401 - } else { - class52.getLoginError(-3); // L: 2404 + Varcs.localPlayer = null; // L: 2132 + + for (var4 = 0; var4 < npcs.length; ++var4) { // L: 2133 + NPC var31 = npcs[var4]; // L: 2134 + if (var31 != null) { // L: 2135 + var31.targetIndex = -1; // L: 2136 + var31.false0 = false; // L: 2137 + } + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2141 + class20.updateGameState(30); // L: 2143 + + for (var4 = 0; var4 < 100; ++var4) { // L: 2144 + field811[var4] = true; + } + + ItemContainer.method2093(); // L: 2145 + AccessFile.updatePlayer(var2); // L: 2147 + if (var34 != var2.offset) { // L: 2148 + throw new RuntimeException(); // L: 2149 } } } - } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2225 - var2.offset = 0; // L: 2226 - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2227 - timer.method5198(); // L: 2228 - mouseLastLastPressedTimeMillis = -1L; // L: 2231 - Friend.mouseRecorder.index = 0; // L: 2232 - PcmPlayer.hasFocus = true; // L: 2233 - hadFocus = true; // L: 2234 - field888 = -1L; // L: 2235 - ScriptEvent.method1271(); // L: 2236 - packetWriter.clearBuffer(); // L: 2237 - packetWriter.packetBuffer.offset = 0; // L: 2238 - packetWriter.serverPacket = null; // L: 2239 - packetWriter.field1331 = null; // L: 2240 - packetWriter.field1333 = null; // L: 2241 - packetWriter.field1334 = null; // L: 2242 - packetWriter.serverPacketLength = 0; // L: 2243 - packetWriter.field1330 = 0; // L: 2244 - rebootTimer = 0; // L: 2245 - logoutTimer = 0; // L: 2246 - hintArrowType = 0; // L: 2247 - menuOptionsCount = 0; // L: 2249 - isMenuOpen = false; // L: 2250 - MouseHandler.MouseHandler_idleCycles = 0; // L: 2253 - Messages.Messages_channels.clear(); // L: 2256 - Messages.Messages_hashTable.clear(); // L: 2257 - Messages.Messages_queue.clear(); // L: 2258 - Messages.Messages_count = 0; // L: 2259 - isItemSelected = 0; // L: 2261 - isSpellSelected = false; // L: 2262 - soundEffectCount = 0; // L: 2263 - camAngleY = 0; // L: 2264 - oculusOrbState = 0; // L: 2265 - HealthBarUpdate.field1016 = null; // L: 2266 - minimapState = 0; // L: 2267 - field889 = -1; // L: 2268 - destinationX = 0; // L: 2269 - destinationY = 0; // L: 2270 - playerAttackOption = AttackOption.AttackOption_hidden; // L: 2271 - npcAttackOption = AttackOption.AttackOption_hidden; // L: 2272 - npcCount = 0; // L: 2273 - class90.method2191(); // L: 2274 - - for (var35 = 0; var35 < 2048; ++var35) { // L: 2275 - players[var35] = null; - } - - for (var35 = 0; var35 < 32768; ++var35) { // L: 2276 - npcs[var35] = null; - } - - combatTargetPlayerIndex = -1; // L: 2277 - projectiles.clear(); // L: 2278 - graphicsObjects.clear(); // L: 2279 - - int var18; - for (var35 = 0; var35 < 4; ++var35) { // L: 2280 - for (var13 = 0; var13 < 104; ++var13) { // L: 2281 - for (var18 = 0; var18 < 104; ++var18) { // L: 2282 - groundItems[var35][var13][var18] = null; // L: 2283 - } - } - } - - pendingSpawns = new NodeDeque(); // L: 2287 - InterfaceParent.friendSystem.clear(); // L: 2288 - - for (var35 = 0; var35 < class58.VarpDefinition_fileCount; ++var35) { // L: 2289 - VarpDefinition var31 = class204.VarpDefinition_get(var35); // L: 2290 - if (var31 != null) { // L: 2291 - Varps.Varps_temp[var35] = 0; // L: 2292 - Varps.Varps_main[var35] = 0; // L: 2293 - } - } - - GrandExchangeOffer.varcs.clearTransient(); // L: 2296 - followerIndex = -1; // L: 2297 - if (rootInterface != -1) { // L: 2298 - var35 = rootInterface; // L: 2299 - if (var35 != -1 && Widget.Widget_loadedInterfaces[var35]) { // L: 2301 2302 - FontName.Widget_archive.clearFilesGroup(var35); // L: 2303 - if (DefaultsGroup.Widget_interfaceComponents[var35] != null) { // L: 2304 - var36 = true; // L: 2305 - - for (var18 = 0; var18 < DefaultsGroup.Widget_interfaceComponents[var35].length; ++var18) { // L: 2306 - if (DefaultsGroup.Widget_interfaceComponents[var35][var18] != null) { // L: 2307 - if (DefaultsGroup.Widget_interfaceComponents[var35][var18].type != 2) { // L: 2308 - DefaultsGroup.Widget_interfaceComponents[var35][var18] = null; - } else { - var36 = false; // L: 2309 - } - } - } - - if (var36) { // L: 2312 - DefaultsGroup.Widget_interfaceComponents[var35] = null; - } - - Widget.Widget_loadedInterfaces[var35] = false; // L: 2313 - } - } - } - - for (InterfaceParent var24 = (InterfaceParent)interfaceParents.first(); var24 != null; var24 = (InterfaceParent)interfaceParents.next()) { // L: 2316 - GrandExchangeOffer.closeInterface(var24, true); // L: 2317 - } - - rootInterface = -1; // L: 2319 - interfaceParents = new NodeHashTable(8); // L: 2320 - meslayerContinueWidget = null; // L: 2321 - menuOptionsCount = 0; // L: 2323 - isMenuOpen = false; // L: 2324 - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2326 - - for (var35 = 0; var35 < 8; ++var35) { // L: 2327 - playerMenuActions[var35] = null; // L: 2328 - playerOptionsPriorities[var35] = false; // L: 2329 - } - - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2332 - isLoading = true; // L: 2334 - - for (var35 = 0; var35 < 100; ++var35) { // L: 2335 - field816[var35] = true; - } - - PacketBufferNode var25 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2290, packetWriter.isaacCipher); // L: 2338 - var25.packetBuffer.writeByte(BoundaryObject.getWindowedMode()); // L: 2339 - var25.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); // L: 2340 - var25.packetBuffer.writeShort(class25.canvasHeight); // L: 2341 - packetWriter.addNode(var25); // L: 2342 - WorldMapID.clanChat = null; // L: 2344 - - for (var35 = 0; var35 < 8; ++var35) { // L: 2345 - grandExchangeOffers[var35] = new GrandExchangeOffer(); - } - - WorldMapSectionType.grandExchangeEvents = null; // L: 2346 - class234.updatePlayer(var2); // L: 2348 - class3.field24 = -1; // L: 2349 - class105.loadRegions(false, var2); // L: 2350 - packetWriter.serverPacket = null; // L: 2351 - } - } } - } catch (IOException var22) { // L: 2408 - if (field786 < 1) { // L: 2409 - if (MouseRecorder.worldPort == DynamicObject.currentPort) { // L: 2410 - DynamicObject.currentPort = class171.js5Port; + } catch (IOException var22) { // L: 2166 + if (field634 < 1) { // L: 2167 + if (class5.currentPort == AttackOption.worldPort) { // L: 2168 + class5.currentPort = Calendar.js5Port; } else { - DynamicObject.currentPort = MouseRecorder.worldPort; // L: 2411 + class5.currentPort = AttackOption.worldPort; // L: 2169 } - ++field786; // L: 2412 - loginState = 0; // L: 2413 + ++field634; // L: 2170 + loginState = 0; // L: 2171 } else { - class52.getLoginError(-2); // L: 2416 + Messages.getLoginError(-2); // L: 2174 } } - } // L: 2153 2353 2393 2402 2405 2414 2417 2419 + } // L: 2002 2080 2151 2160 2163 2172 2175 2177 - @ObfuscatedName("fv") + @ObfuscatedName("ff") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1783037227" + descriptor = "(B)V", + garbageValue = "25" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { // L: 2668 + if (rebootTimer > 1) { // L: 2467 --rebootTimer; } - if (logoutTimer > 0) { // L: 2669 + if (logoutTimer > 0) { // L: 2468 --logoutTimer; } - if (field712) { // L: 2670 - field712 = false; // L: 2671 - class8.method90(); // L: 2672 + if (field737) { // L: 2469 + field737 = false; // L: 2470 + HealthBarUpdate.method2181(); // L: 2471 } else { - if (!isMenuOpen) { // L: 2675 - Player.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 2474 + VerticalAlignment.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1701(packetWriter); ++var1) { // L: 2676 2677 + for (var1 = 0; var1 < 100 && this.method1233(packetWriter); ++var1) { // L: 2475 2476 } - if (gameState == 30) { // L: 2679 + if (gameState == 30) { // L: 2478 int var2; - PacketBufferNode var14; - while (GrandExchangeOfferOwnWorldComparator.method1366()) { // L: 2680 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2315, packetWriter.isaacCipher); // L: 2681 - var14.packetBuffer.writeByte(0); // L: 2682 - var2 = var14.packetBuffer.offset; // L: 2683 - AbstractWorldMapData.performReflectionCheck(var14.packetBuffer); // L: 2684 - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 2685 - packetWriter.addNode(var14); // L: 2686 + PacketBufferNode var15; + while (class34.method415()) { // L: 2479 + var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2245, packetWriter.isaacCipher); // L: 2480 + var15.packetBuffer.writeByte(0); // L: 2481 + var2 = var15.packetBuffer.offset; // L: 2482 + class11.performReflectionCheck(var15.packetBuffer); // L: 2483 + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 2484 + packetWriter.addNode(var15); // L: 2485 } - if (timer.field3616) { // L: 2688 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2301, packetWriter.isaacCipher); // L: 2690 - var14.packetBuffer.writeByte(0); // L: 2691 - var2 = var14.packetBuffer.offset; // L: 2692 - timer.write(var14.packetBuffer); // L: 2693 - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 2694 - packetWriter.addNode(var14); // L: 2695 - timer.method5199(); // L: 2696 + if (timer.field3773) { // L: 2487 + var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); // L: 2489 + var15.packetBuffer.writeByte(0); // L: 2490 + var2 = var15.packetBuffer.offset; // L: 2491 + timer.write(var15.packetBuffer); // L: 2492 + var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var2); // L: 2493 + packetWriter.addNode(var15); // L: 2494 + timer.method5581(); // L: 2495 } int var3; @@ -3143,2845 +2838,2693 @@ public final class Client extends GameEngine implements Usernamed { int var10; int var11; int var12; - synchronized(Friend.mouseRecorder.lock) { // L: 2699 - if (!field863) { // L: 2700 - Friend.mouseRecorder.index = 0; // L: 2786 - } else if (MouseHandler.MouseHandler_lastButton != 0 || Friend.mouseRecorder.index >= 40) { // L: 2701 - PacketBufferNode var15 = null; // L: 2703 - var3 = 0; // L: 2704 - var4 = 0; // L: 2705 - var5 = 0; // L: 2706 - var6 = 0; // L: 2707 + PacketBuffer var10000; + synchronized(Language.mouseRecorder.lock) { // L: 2498 + if (!field867) { // L: 2499 + Language.mouseRecorder.index = 0; // L: 2585 + } else if (MouseHandler.MouseHandler_lastButton != 0 || Language.mouseRecorder.index >= 40) { // L: 2500 + PacketBufferNode var16 = null; // L: 2502 + var3 = 0; // L: 2503 + var4 = 0; // L: 2504 + var5 = 0; // L: 2505 + var6 = 0; // L: 2506 - for (var7 = 0; var7 < Friend.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 2708 2709 - var4 = var7; // L: 2710 - var8 = Friend.mouseRecorder.ys[var7]; // L: 2711 - if (var8 < -1) { // L: 2712 + for (var7 = 0; var7 < Language.mouseRecorder.index && (var16 == null || var16.packetBuffer.offset - var3 < 246); ++var7) { // L: 2507 2508 + var4 = var7; // L: 2509 + var8 = Language.mouseRecorder.ys[var7]; // L: 2510 + if (var8 < -1) { // L: 2511 var8 = -1; - } else if (var8 > 65534) { // L: 2713 + } else if (var8 > 65534) { // L: 2512 var8 = 65534; } - var9 = Friend.mouseRecorder.xs[var7]; // L: 2714 - if (var9 < -1) { // L: 2715 + var9 = Language.mouseRecorder.xs[var7]; // L: 2513 + if (var9 < -1) { // L: 2514 var9 = -1; - } else if (var9 > 65534) { // L: 2716 + } else if (var9 > 65534) { // L: 2515 var9 = 65534; } - if (var9 != field675 || var8 != field687) { // L: 2717 - if (var15 == null) { // L: 2720 - var15 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2240, packetWriter.isaacCipher); // L: 2721 - var15.packetBuffer.writeByte(0); // L: 2722 - var3 = var15.packetBuffer.offset; // L: 2723 - PacketBuffer var10000 = var15.packetBuffer; // L: 2724 + if (var9 != field875 || var8 != field759) { // L: 2516 + if (var16 == null) { // L: 2519 + var16 = ObjectComposition.getPacketBufferNode(ClientPacket.field2241, packetWriter.isaacCipher); // L: 2520 + var16.packetBuffer.writeByte(0); // L: 2521 + var3 = var16.packetBuffer.offset; // L: 2522 + var10000 = var16.packetBuffer; // L: 2523 var10000.offset += 2; - var5 = 0; // L: 2725 - var6 = 0; // L: 2726 + var5 = 0; // L: 2524 + var6 = 0; // L: 2525 } - if (-1L != field853) { // L: 2731 - var10 = var9 - field675; // L: 2732 - var11 = var8 - field687; // L: 2733 - var12 = (int)((Friend.mouseRecorder.millis[var7] - field853) / 20L); // L: 2734 - var5 = (int)((long)var5 + (Friend.mouseRecorder.millis[var7] - field853) % 20L); // L: 2735 + if (field851 != -1L) { // L: 2530 + var10 = var9 - field875; // L: 2531 + var11 = var8 - field759; // L: 2532 + var12 = (int)((Language.mouseRecorder.millis[var7] - field851) / 20L); // L: 2533 + var5 = (int)((long)var5 + (Language.mouseRecorder.millis[var7] - field851) % 20L); // L: 2534 } else { - var10 = var9; // L: 2738 - var11 = var8; // L: 2739 - var12 = Integer.MAX_VALUE; // L: 2740 + var10 = var9; // L: 2537 + var11 = var8; // L: 2538 + var12 = Integer.MAX_VALUE; // L: 2539 } - field675 = var9; // L: 2742 - field687 = var8; // L: 2743 - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2744 - var10 += 32; // L: 2745 - var11 += 32; // L: 2746 - var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2747 - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2749 - var10 += 128; // L: 2750 - var11 += 128; // L: 2751 - var15.packetBuffer.writeByte(var12 + 128); // L: 2752 - var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2753 - } else if (var12 < 32) { // L: 2755 - var15.packetBuffer.writeByte(var12 + 192); // L: 2756 - if (var9 != -1 && var8 != -1) { // L: 2757 - var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2758 + field875 = var9; // L: 2541 + field759 = var8; // L: 2542 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2543 + var10 += 32; // L: 2544 + var11 += 32; // L: 2545 + var16.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2546 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2548 + var10 += 128; // L: 2549 + var11 += 128; // L: 2550 + var16.packetBuffer.writeByte(var12 + 128); // L: 2551 + var16.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2552 + } else if (var12 < 32) { // L: 2554 + var16.packetBuffer.writeByte(var12 + 192); // L: 2555 + if (var9 != -1 && var8 != -1) { // L: 2556 + var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 2557 } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); + var16.packetBuffer.writeInt(Integer.MIN_VALUE); } } else { - var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2761 - if (var9 != -1 && var8 != -1) { // L: 2762 - var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2763 + var16.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2560 + if (var9 != -1 && var8 != -1) { // L: 2561 + var16.packetBuffer.writeInt(var9 | var8 << 16); // L: 2562 } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); + var16.packetBuffer.writeInt(Integer.MIN_VALUE); } } - ++var6; // L: 2765 - field853 = Friend.mouseRecorder.millis[var7]; // L: 2766 + ++var6; // L: 2564 + field851 = Language.mouseRecorder.millis[var7]; // L: 2565 } } - if (var15 != null) { // L: 2768 - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); // L: 2769 - var7 = var15.packetBuffer.offset; // L: 2770 - var15.packetBuffer.offset = var3; // L: 2771 - var15.packetBuffer.writeByte(var5 / var6); // L: 2772 - var15.packetBuffer.writeByte(var5 % var6); // L: 2773 - var15.packetBuffer.offset = var7; // L: 2774 - packetWriter.addNode(var15); // L: 2775 + if (var16 != null) { // L: 2567 + var16.packetBuffer.writeLengthByte(var16.packetBuffer.offset - var3); // L: 2568 + var7 = var16.packetBuffer.offset; // L: 2569 + var16.packetBuffer.offset = var3; // L: 2570 + var16.packetBuffer.writeByte(var5 / var6); // L: 2571 + var16.packetBuffer.writeByte(var5 % var6); // L: 2572 + var16.packetBuffer.offset = var7; // L: 2573 + packetWriter.addNode(var16); // L: 2574 } - if (var4 >= Friend.mouseRecorder.index) { // L: 2777 - Friend.mouseRecorder.index = 0; + if (var4 >= Language.mouseRecorder.index) { // L: 2576 + Language.mouseRecorder.index = 0; } else { - MouseRecorder var42 = Friend.mouseRecorder; // L: 2779 - var42.index -= var4; - System.arraycopy(Friend.mouseRecorder.xs, var4, Friend.mouseRecorder.xs, 0, Friend.mouseRecorder.index); // L: 2780 - System.arraycopy(Friend.mouseRecorder.ys, var4, Friend.mouseRecorder.ys, 0, Friend.mouseRecorder.index); // L: 2781 - System.arraycopy(Friend.mouseRecorder.millis, var4, Friend.mouseRecorder.millis, 0, Friend.mouseRecorder.index); // L: 2782 + MouseRecorder var47 = Language.mouseRecorder; // L: 2578 + var47.index -= var4; + System.arraycopy(Language.mouseRecorder.xs, var4, Language.mouseRecorder.xs, 0, Language.mouseRecorder.index); // L: 2579 + System.arraycopy(Language.mouseRecorder.ys, var4, Language.mouseRecorder.ys, 0, Language.mouseRecorder.index); // L: 2580 + System.arraycopy(Language.mouseRecorder.millis, var4, Language.mouseRecorder.millis, 0, Language.mouseRecorder.index); // L: 2581 } } } - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2788 - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2789 - if (var16 > 32767L) { // L: 2790 - var16 = 32767L; + PacketBufferNode var19; + if (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2587 + long var17 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2588 + if (var17 > 32767L) { // L: 2589 + var17 = 32767L; } - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2791 - var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2792 - if (var3 < 0) { // L: 2793 + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2590 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2591 + if (var3 < 0) { // L: 2592 var3 = 0; - } else if (var3 > class25.canvasHeight) { // L: 2794 - var3 = class25.canvasHeight; + } else if (var3 > GameEngine.canvasHeight) { // L: 2593 + var3 = GameEngine.canvasHeight; } - var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2795 - if (var4 < 0) { // L: 2796 + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2594 + if (var4 < 0) { // L: 2595 var4 = 0; - } else if (var4 > GrandExchangeOfferTotalQuantityComparator.canvasWidth) { // L: 2797 - var4 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; + } else if (var4 > InterfaceParent.canvasWidth) { // L: 2596 + var4 = InterfaceParent.canvasWidth; } - var5 = (int)var16; // L: 2798 - var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2276, packetWriter.isaacCipher); // L: 2799 - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 2800 - var18.packetBuffer.writeShort(var4); // L: 2801 - var18.packetBuffer.writeShort(var3); // L: 2802 - packetWriter.addNode(var18); // L: 2803 + var5 = (int)var17; // L: 2597 + var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2216, packetWriter.isaacCipher); // L: 2598 + var19.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2599 + var19.packetBuffer.writeShort(var4); // L: 2600 + var19.packetBuffer.writeShort(var3); // L: 2601 + packetWriter.addNode(var19); // L: 2602 } - if (KeyHandler.field421 > 0) { // L: 2805 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); // L: 2806 - var14.packetBuffer.writeShort(0); // L: 2807 - var2 = var14.packetBuffer.offset; // L: 2808 - long var19 = Tiles.currentTimeMillis(); // L: 2809 + if (KeyHandler.field263 > 0) { // L: 2604 + var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2226, packetWriter.isaacCipher); // L: 2605 + var15.packetBuffer.writeShort(0); // L: 2606 + var2 = var15.packetBuffer.offset; // L: 2607 + long var20 = ObjectSound.currentTimeMillis(); // L: 2608 - for (var5 = 0; var5 < KeyHandler.field421; ++var5) { // L: 2810 - long var21 = var19 - field888; // L: 2811 - if (var21 > 16777215L) { // L: 2812 - var21 = 16777215L; + for (var5 = 0; var5 < KeyHandler.field263; ++var5) { // L: 2609 + long var22 = var20 - field678; // L: 2610 + if (var22 > 16777215L) { // L: 2611 + var22 = 16777215L; } - field888 = var19; // L: 2813 - var14.packetBuffer.method5732((int)var21); // L: 2814 - var14.packetBuffer.method5883(KeyHandler.field420[var5]); // L: 2815 + field678 = var20; // L: 2612 + var15.packetBuffer.writeMedium((int)var22); // L: 2613 + var15.packetBuffer.method6639(KeyHandler.field262[var5]); // L: 2614 } - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 2817 - packetWriter.addNode(var14); // L: 2818 + var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var2); // L: 2616 + packetWriter.addNode(var15); // L: 2617 } - if (field926 > 0) { // L: 2820 - --field926; + if (field826 > 0) { // L: 2619 + --field826; } - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2821 - field678 = true; + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2620 + field687 = true; } - if (field678 && field926 <= 0) { // L: 2822 - field926 = 20; // L: 2823 - field678 = false; // L: 2824 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2334, packetWriter.isaacCipher); // L: 2826 - var14.packetBuffer.writeShortLE(camAngleY); // L: 2827 - var14.packetBuffer.writeIntME(camAngleX); // L: 2828 - packetWriter.addNode(var14); // L: 2829 + if (field687 && field826 <= 0) { // L: 2621 + field826 = 20; // L: 2622 + field687 = false; // L: 2623 + var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2293, packetWriter.isaacCipher); // L: 2625 + var15.packetBuffer.method6614(camAngleX); // L: 2626 + var15.packetBuffer.writeIntME(camAngleY); // L: 2627 + packetWriter.addNode(var15); // L: 2628 } - if (PcmPlayer.hasFocus && !hadFocus) { // L: 2831 - hadFocus = true; // L: 2832 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); // L: 2834 - var14.packetBuffer.writeByte(1); // L: 2835 - packetWriter.addNode(var14); // L: 2836 + if (GrandExchangeOfferAgeComparator.hasFocus && !hadFocus) { // L: 2630 + hadFocus = true; // L: 2631 + var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2272, packetWriter.isaacCipher); // L: 2633 + var15.packetBuffer.writeByte(1); // L: 2634 + packetWriter.addNode(var15); // L: 2635 } - if (!PcmPlayer.hasFocus && hadFocus) { // L: 2838 - hadFocus = false; // L: 2839 - var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); // L: 2841 - var14.packetBuffer.writeByte(0); // L: 2842 - packetWriter.addNode(var14); // L: 2843 + if (!GrandExchangeOfferAgeComparator.hasFocus && hadFocus) { // L: 2637 + hadFocus = false; // L: 2638 + var15 = ObjectComposition.getPacketBufferNode(ClientPacket.field2272, packetWriter.isaacCipher); // L: 2640 + var15.packetBuffer.writeByte(0); // L: 2641 + packetWriter.addNode(var15); // L: 2642 } - if (SoundSystem.worldMap != null) { // L: 2846 - SoundSystem.worldMap.method6584(); + if (UserComparator4.worldMap != null) { // L: 2645 + UserComparator4.worldMap.method6148(); } - if (KeyHandler.ClanChat_inClanChat) { // L: 2848 - if (WorldMapID.clanChat != null) { // L: 2849 - WorldMapID.clanChat.sort(); // L: 2850 + if (WorldMapSection2.ClanChat_inClanChat) { // L: 2647 + if (InterfaceParent.clanChat != null) { // L: 2648 + InterfaceParent.clanChat.sort(); // L: 2649 } - for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 2853 - Player var34 = players[Players.Players_indices[var1]]; // L: 2854 - var34.clearIsInClanChat(); // L: 2855 - } - - KeyHandler.ClanChat_inClanChat = false; // L: 2858 + class157.method3112(); // L: 2651 + WorldMapSection2.ClanChat_inClanChat = false; // L: 2652 } - Renderable.method3417(); // L: 2861 - if (gameState == 30) { // L: 2862 - WorldMapSectionType.method319(); // L: 2863 - WorldMapLabel.method502(); // L: 2864 - ++packetWriter.field1330; // L: 2865 - if (packetWriter.field1330 > 750) { // L: 2866 - class8.method90(); // L: 2867 + if (field833 != class26.Client_plane) { // L: 2656 + field833 = class26.Client_plane; // L: 2657 + class14.createMinimapSprite(class26.Client_plane); // L: 2658 + } + + if (gameState == 30) { // L: 2661 + PacketBufferNode.method3888(); // L: 2662 + + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2664 + var10002 = queuedSoundEffectDelays[var1]--; // L: 2665 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 2666 + SoundEffect var35 = soundEffects[var1]; // L: 2678 + if (var35 == null) { // L: 2679 + var10000 = null; // L: 2680 + var35 = SoundEffect.readSoundEffect(ItemContainer.archive4, soundEffectIds[var1], 0); + if (var35 == null) { // L: 2681 + continue; + } + + int[] var48 = queuedSoundEffectDelays; // L: 2682 + var48[var1] += var35.calculateDelay(); + soundEffects[var1] = var35; // L: 2683 + } + + if (queuedSoundEffectDelays[var1] < 0) { // L: 2689 + if (soundLocations[var1] != 0) { // L: 2691 + var4 = (soundLocations[var1] & 255) * 128; // L: 2692 + var5 = soundLocations[var1] >> 16 & 255; // L: 2693 + var6 = var5 * 128 + 64 - Varcs.localPlayer.x; // L: 2694 + if (var6 < 0) { // L: 2695 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 2696 + var8 = var7 * 128 + 64 - Varcs.localPlayer.y; // L: 2697 + if (var8 < 0) { // L: 2698 + var8 = -var8; + } + + var9 = var6 + var8 - 128; // L: 2699 + if (var9 > var4) { // L: 2700 + queuedSoundEffectDelays[var1] = -100; // L: 2701 + continue; // L: 2702 + } + + if (var9 < 0) { // L: 2704 + var9 = 0; + } + + var3 = (var4 - var9) * Login.clientPreferences.areaSoundEffectsVolume / var4; // L: 2705 + } else { + var3 = Login.clientPreferences.soundEffectsVolume; // L: 2707 + } + + if (var3 > 0) { // L: 2708 + RawSound var24 = var35.toRawSound().resample(class34.decimator); // L: 2709 + RawPcmStream var25 = RawPcmStream.createRawPcmStream(var24, 100, var3); // L: 2710 + var25.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 2711 + Huffman.pcmStreamMixer.addSubStream(var25); // L: 2712 + } + + queuedSoundEffectDelays[var1] = -100; // L: 2714 + } + } else { + --soundEffectCount; // L: 2667 + + for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 2668 + soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 2669 + soundEffects[var2] = soundEffects[var2 + 1]; // L: 2670 + queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 2671 + queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 2672 + soundLocations[var2] = soundLocations[var2 + 1]; // L: 2673 + } + + --var1; // L: 2675 + } + } + + if (field842) { // L: 2717 + boolean var30; + if (class210.musicPlayerStatus != 0) { // L: 2720 + var30 = true; // L: 2721 + } else { + var30 = class210.midiPcmStream.isReady(); // L: 2724 + } + + if (!var30) { // L: 2726 + if (Login.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 2727 + PacketBufferNode.method3898(class8.archive6, currentTrackGroupId, 0, Login.clientPreferences.musicVolume, false); + } + + field842 = false; // L: 2728 + } + } + + ++packetWriter.field1391; // L: 2732 + if (packetWriter.field1391 > 750) { // L: 2733 + HealthBarUpdate.method2181(); // L: 2734 } else { - WorldMapRectangle.method354(); // L: 2870 + var1 = Players.Players_count; // L: 2738 + int[] var36 = Players.Players_indices; // L: 2739 - for (var1 = 0; var1 < npcCount; ++var1) { // L: 2872 - var2 = npcIndices[var1]; // L: 2873 - NPC var23 = npcs[var2]; // L: 2874 - if (var23 != null) { // L: 2875 - class171.updateActorSequence(var23, var23.definition.size); // L: 2876 + for (var3 = 0; var3 < var1; ++var3) { // L: 2740 + Player var40 = players[var36[var3]]; // L: 2741 + if (var40 != null) { // L: 2742 + class137.updateActorSequence(var40, 1); // L: 2743 } } - Actor.method1868(); // L: 2880 - ++field808; // L: 2881 - if (mouseCrossColor != 0) { // L: 2882 - mouseCrossState += 20; // L: 2883 - if (mouseCrossState >= 400) { // L: 2884 + WorldMapCacheName.method3188(); // L: 2747 + int[] var33 = Players.Players_indices; // L: 2749 + + for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 2750 + Player var26 = players[var33[var2]]; // L: 2751 + if (var26 != null && var26.overheadTextCyclesRemaining > 0) { // L: 2752 + --var26.overheadTextCyclesRemaining; // L: 2753 + if (var26.overheadTextCyclesRemaining == 0) { // L: 2754 + var26.overheadText = null; + } + } + } + + for (var2 = 0; var2 < npcCount; ++var2) { // L: 2757 + var3 = npcIndices[var2]; // L: 2758 + NPC var41 = npcs[var3]; // L: 2759 + if (var41 != null && var41.overheadTextCyclesRemaining > 0) { // L: 2760 + --var41.overheadTextCyclesRemaining; // L: 2761 + if (var41.overheadTextCyclesRemaining == 0) { // L: 2762 + var41.overheadText = null; + } + } + } + + ++field799; // L: 2766 + if (mouseCrossColor != 0) { // L: 2767 + mouseCrossState += 20; // L: 2768 + if (mouseCrossState >= 400) { // L: 2769 mouseCrossColor = 0; } } - if (WorldMapSprite.field260 != null) { // L: 2886 - ++field770; // L: 2887 - if (field770 >= 15) { // L: 2888 - IsaacCipher.invalidateWidget(WorldMapSprite.field260); // L: 2889 - WorldMapSprite.field260 = null; // L: 2890 + if (PacketWriter.field1394 != null) { // L: 2771 + ++field708; // L: 2772 + if (field708 >= 15) { // L: 2773 + class29.invalidateWidget(PacketWriter.field1394); // L: 2774 + PacketWriter.field1394 = null; // L: 2775 } } - Widget var33 = Canvas.mousedOverWidgetIf1; // L: 2893 - Widget var35 = GrandExchangeOffer.field100; // L: 2894 - Canvas.mousedOverWidgetIf1 = null; // L: 2895 - GrandExchangeOffer.field100 = null; // L: 2896 - draggedOnWidget = null; // L: 2897 - field754 = false; // L: 2898 - field912 = false; // L: 2899 - field885 = 0; // L: 2900 + Widget var34 = Varps.mousedOverWidgetIf1; // L: 2778 + Widget var37 = Player.field1192; // L: 2779 + Varps.mousedOverWidgetIf1 = null; // L: 2780 + Player.field1192 = null; // L: 2781 + draggedOnWidget = null; // L: 2782 + field783 = false; // L: 2783 + field780 = false; // L: 2784 + field827 = 0; // L: 2785 - while (Varcs.isKeyDown() && field885 < 128) { // L: 2901 - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ModeWhere.field2417 == 66) { // L: 2902 - String var24 = ""; // L: 2905 + while (class231.isKeyDown() && field827 < 128) { // L: 2786 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class19.field146 == 66) { // L: 2787 + String var42 = ""; // L: 2790 - Message var36; - for (Iterator var25 = Messages.Messages_hashTable.iterator(); var25.hasNext(); var24 = var24 + var36.sender + ':' + var36.text + '\n') { // L: 2906 2909 - var36 = (Message)var25.next(); // L: 2907 + Message var38; + for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var42 = var42 + var38.sender + ':' + var38.text + '\n') { // L: 2791 2794 + var38 = (Message)var43.next(); // L: 2792 } - class1.client.clipboardSetString(var24); // L: 2915 - } else if (oculusOrbState != 1 || WorldMapID.field299 <= 0) { // L: 2918 - field738[field885] = ModeWhere.field2417; // L: 2921 - field886[field885] = WorldMapID.field299; // L: 2922 - ++field885; // L: 2923 + class10.client.clipboardSetString(var42); // L: 2800 + } else if (oculusOrbState != 1 || Message.field591 <= 0) { // L: 2803 + field792[field827] = class19.field146; // L: 2806 + field828[field827] = Message.field591; // L: 2807 + ++field827; // L: 2808 } } - if (TriBool.method5372() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 2925 - var3 = UserComparator9.localPlayer.plane - mouseWheelRotation; // L: 2926 - if (var3 < 0) { // L: 2927 - var3 = 0; - } else if (var3 > 3) { // L: 2928 - var3 = 3; + boolean var31 = staffModLevel >= 2; // L: 2812 + if (var31 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 2814 + var4 = Varcs.localPlayer.plane - mouseWheelRotation; // L: 2815 + if (var4 < 0) { // L: 2816 + var4 = 0; + } else if (var4 > 3) { // L: 2817 + var4 = 3; } - if (var3 != UserComparator9.localPlayer.plane) { // L: 2929 - var4 = UserComparator9.localPlayer.pathX[0] + GrandExchangeOfferNameComparator.baseX; // L: 2930 - var5 = UserComparator9.localPlayer.pathY[0] + NetCache.baseY; // L: 2931 - var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2230, packetWriter.isaacCipher); // L: 2934 - var18.packetBuffer.writeShortLE(var5); // L: 2935 - var18.packetBuffer.method5883(var3); // L: 2936 - var18.packetBuffer.method5736(0); // L: 2937 - var18.packetBuffer.writeIntME(var4); // L: 2938 - packetWriter.addNode(var18); // L: 2939 + if (var4 != Varcs.localPlayer.plane) { // L: 2818 + class9.method123(Varcs.localPlayer.pathX[0] + ItemLayer.baseX, Varcs.localPlayer.pathY[0] + Tile.baseY, var4, false); // L: 2819 } - mouseWheelRotation = 0; // L: 2942 + mouseWheelRotation = 0; // L: 2821 } - if (rootInterface != -1) { // L: 2944 - class22.updateRootInterface(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 2823 + class5.updateRootInterface(rootInterface, 0, 0, InterfaceParent.canvasWidth, GameEngine.canvasHeight, 0, 0); } - ++cycleCntr; // L: 2945 + ++cycleCntr; // L: 2824 while (true) { - ScriptEvent var37; Widget var39; - Widget var40; + ScriptEvent var44; + Widget var45; do { - var37 = (ScriptEvent)field660.removeLast(); // L: 2947 - if (var37 == null) { // L: 2948 + var44 = (ScriptEvent)field806.removeLast(); // L: 2826 + if (var44 == null) { // L: 2827 while (true) { do { - var37 = (ScriptEvent)field865.removeLast(); // L: 2959 - if (var37 == null) { // L: 2960 + var44 = (ScriptEvent)field688.removeLast(); // L: 2838 + if (var44 == null) { // L: 2839 while (true) { do { - var37 = (ScriptEvent)scriptEvents.removeLast(); // L: 2971 - if (var37 == null) { // L: 2972 - this.menu(); // L: 2982 - class2.method27(); // L: 2983 - if (clickedWidget != null) { // L: 2984 - this.method1403(); + var44 = (ScriptEvent)scriptEvents.removeLast(); // L: 2850 + if (var44 == null) { // L: 2851 + this.menu(); // L: 2861 + if (UserComparator4.worldMap != null) { // L: 2863 + UserComparator4.worldMap.method6116(class26.Client_plane, (Varcs.localPlayer.x >> 7) + ItemLayer.baseX, (Varcs.localPlayer.y >> 7) + Tile.baseY, false); // L: 2864 + UserComparator4.worldMap.loadCache(); // L: 2865 } - PacketBufferNode var41; - if (JagexCache.dragInventoryWidget != null) { // L: 2985 - IsaacCipher.invalidateWidget(JagexCache.dragInventoryWidget); // L: 2986 - ++itemDragDuration; // L: 2987 - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 2988 - if (field776) { // L: 2989 - if (JagexCache.dragInventoryWidget == HorizontalAlignment.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 2990 - Widget var38 = JagexCache.dragInventoryWidget; // L: 2991 - byte var30 = 0; // L: 2992 - if (field829 == 1 && var38.contentType == 206) { // L: 2993 - var30 = 1; + if (clickedWidget != null) { // L: 2868 + this.method1239(); + } + + if (ClientPacket.dragInventoryWidget != null) { // L: 2869 + class29.invalidateWidget(ClientPacket.dragInventoryWidget); // L: 2870 + ++itemDragDuration; // L: 2871 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 2872 + if (field714) { // L: 2873 + if (ClientPacket.dragInventoryWidget == ScriptFrame.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 2874 + Widget var46 = ClientPacket.dragInventoryWidget; // L: 2875 + byte var32 = 0; // L: 2876 + if (field767 == 1 && var46.contentType == 206) { // L: 2877 + var32 = 1; } - if (var38.itemIds[dragItemSlotDestination] <= 0) { // L: 2994 - var30 = 0; + if (var46.itemIds[dragItemSlotDestination] <= 0) { // L: 2878 + var32 = 0; } - if (ModeWhere.method3867(class60.getWidgetFlags(var38))) { // L: 2995 - var5 = dragItemSlotSource; // L: 2996 - var6 = dragItemSlotDestination; // L: 2997 - var38.itemIds[var6] = var38.itemIds[var5]; // L: 2998 - var38.itemQuantities[var6] = var38.itemQuantities[var5]; // L: 2999 - var38.itemIds[var5] = -1; // L: 3000 - var38.itemQuantities[var5] = 0; // L: 3001 - } else if (var30 == 1) { // L: 3003 - var5 = dragItemSlotSource; // L: 3004 - var6 = dragItemSlotDestination; // L: 3005 + if (class69.method1165(DirectByteArrayCopier.getWidgetFlags(var46))) { // L: 2879 + var6 = dragItemSlotSource; // L: 2880 + var7 = dragItemSlotDestination; // L: 2881 + var46.itemIds[var7] = var46.itemIds[var6]; // L: 2882 + var46.itemQuantities[var7] = var46.itemQuantities[var6]; // L: 2883 + var46.itemIds[var6] = -1; // L: 2884 + var46.itemQuantities[var6] = 0; // L: 2885 + } else if (var32 == 1) { // L: 2887 + var6 = dragItemSlotSource; // L: 2888 + var7 = dragItemSlotDestination; // L: 2889 - while (var5 != var6) { // L: 3006 - if (var5 > var6) { // L: 3007 - var38.swapItems(var5 - 1, var5); // L: 3008 - --var5; // L: 3009 - } else if (var5 < var6) { // L: 3011 - var38.swapItems(var5 + 1, var5); // L: 3012 - ++var5; // L: 3013 + while (var6 != var7) { // L: 2890 + if (var6 > var7) { // L: 2891 + var46.swapItems(var6 - 1, var6); // L: 2892 + --var6; // L: 2893 + } else if (var6 < var7) { // L: 2895 + var46.swapItems(var6 + 1, var6); // L: 2896 + ++var6; // L: 2897 } } } else { - var38.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3018 + var46.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 2902 } - var41 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2243, packetWriter.isaacCipher); // L: 3021 - var41.packetBuffer.method5725(dragItemSlotSource); // L: 3022 - var41.packetBuffer.method5876(JagexCache.dragInventoryWidget.id); // L: 3023 - var41.packetBuffer.writeShortLE(dragItemSlotDestination); // L: 3024 - var41.packetBuffer.writeByte(var30); // L: 3025 - packetWriter.addNode(var41); // L: 3026 + var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2230, packetWriter.isaacCipher); // L: 2905 + var19.packetBuffer.method6625(ClientPacket.dragInventoryWidget.id); // L: 2906 + var19.packetBuffer.method6614(dragItemSlotSource); // L: 2907 + var19.packetBuffer.method6606(var32); // L: 2908 + var19.packetBuffer.method6614(dragItemSlotDestination); // L: 2909 + packetWriter.addNode(var19); // L: 2910 } - } else if (this.shouldLeftClickOpenMenu()) { // L: 3030 - this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3031 - } else if (menuOptionsCount > 0) { // L: 3033 - LoginPacket.method3812(draggedWidgetX, draggedWidgetY); // L: 3034 + } else if (this.shouldLeftClickOpenMenu()) { // L: 2914 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 2915 + } else if (menuOptionsCount > 0) { // L: 2917 + class26.method357(draggedWidgetX, draggedWidgetY); // L: 2918 } - field770 = 10; // L: 3037 - MouseHandler.MouseHandler_lastButton = 0; // L: 3038 - JagexCache.dragInventoryWidget = null; // L: 3039 - } 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: 3042 3043 - field776 = true; // L: 3044 + field708 = 10; // L: 2921 + MouseHandler.MouseHandler_lastButton = 0; // L: 2922 + ClientPacket.dragInventoryWidget = null; // L: 2923 + } 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: 2926 2927 + field714 = true; // L: 2928 } } - if (Scene.shouldSendWalk()) { // L: 3049 - var3 = Scene.Scene_selectedX; // L: 3050 - var4 = Scene.Scene_selectedY; // L: 3051 - var41 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2263, packetWriter.isaacCipher); // L: 3053 - var41.packetBuffer.writeByte(5); // L: 3054 - var41.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3055 - var41.packetBuffer.writeIntME(var4 + NetCache.baseY); // L: 3056 - var41.packetBuffer.writeShort(var3 + GrandExchangeOfferNameComparator.baseX); // L: 3057 - packetWriter.addNode(var41); // L: 3058 - Scene.method3281(); // L: 3059 - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3060 - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3061 - mouseCrossColor = 1; // L: 3062 - mouseCrossState = 0; // L: 3063 - destinationX = var3; // L: 3064 - destinationY = var4; // L: 3065 + if (Scene.shouldSendWalk()) { // L: 2933 + var4 = Scene.Scene_selectedX; // L: 2934 + var5 = Scene.Scene_selectedY; // L: 2935 + var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2267, packetWriter.isaacCipher); // L: 2937 + var19.packetBuffer.writeByte(5); // L: 2938 + var19.packetBuffer.method6771(var5 + Tile.baseY); // L: 2939 + var19.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 2940 + var19.packetBuffer.writeIntME(var4 + ItemLayer.baseX); // L: 2941 + packetWriter.addNode(var19); // L: 2942 + Scene.method3476(); // L: 2943 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 2944 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 2945 + mouseCrossColor = 1; // L: 2946 + mouseCrossState = 0; // L: 2947 + destinationX = var4; // L: 2948 + destinationY = var5; // L: 2949 } - if (var33 != Canvas.mousedOverWidgetIf1) { // L: 3067 - if (var33 != null) { // L: 3068 - IsaacCipher.invalidateWidget(var33); + if (var34 != Varps.mousedOverWidgetIf1) { // L: 2951 + if (var34 != null) { // L: 2952 + class29.invalidateWidget(var34); } - if (Canvas.mousedOverWidgetIf1 != null) { // L: 3069 - IsaacCipher.invalidateWidget(Canvas.mousedOverWidgetIf1); + if (Varps.mousedOverWidgetIf1 != null) { // L: 2953 + class29.invalidateWidget(Varps.mousedOverWidgetIf1); } } - if (var35 != GrandExchangeOffer.field100 && field925 == field815) { // L: 3071 - if (var35 != null) { // L: 3072 - IsaacCipher.invalidateWidget(var35); + if (var37 != Player.field1192 && field696 == field753) { // L: 2955 + if (var37 != null) { // L: 2956 + class29.invalidateWidget(var37); } - if (GrandExchangeOffer.field100 != null) { // L: 3073 - IsaacCipher.invalidateWidget(GrandExchangeOffer.field100); + if (Player.field1192 != null) { // L: 2957 + class29.invalidateWidget(Player.field1192); } } - if (GrandExchangeOffer.field100 != null) { // L: 3075 - if (field815 < field925) { // L: 3076 - ++field815; // L: 3077 - if (field815 == field925) { // L: 3078 - IsaacCipher.invalidateWidget(GrandExchangeOffer.field100); + if (Player.field1192 != null) { // L: 2959 + if (field753 < field696) { // L: 2960 + ++field753; // L: 2961 + if (field696 == field753) { // L: 2962 + class29.invalidateWidget(Player.field1192); } } - } else if (field815 > 0) { // L: 3081 - --field815; + } else if (field753 > 0) { // L: 2965 + --field753; } - if (oculusOrbState == 0) { // L: 3083 - var3 = UserComparator9.localPlayer.x; // L: 3084 - var4 = UserComparator9.localPlayer.y; // L: 3085 - if (HealthBarUpdate.oculusOrbFocalPointX - var3 < -500 || HealthBarUpdate.oculusOrbFocalPointX - var3 > 500 || ApproximateRouteStrategy.oculusOrbFocalPointY - var4 < -500 || ApproximateRouteStrategy.oculusOrbFocalPointY - var4 > 500) { // L: 3086 - HealthBarUpdate.oculusOrbFocalPointX = var3; // L: 3087 - ApproximateRouteStrategy.oculusOrbFocalPointY = var4; // L: 3088 - } - - if (var3 != HealthBarUpdate.oculusOrbFocalPointX) { // L: 3090 - HealthBarUpdate.oculusOrbFocalPointX += (var3 - HealthBarUpdate.oculusOrbFocalPointX) / 16; - } - - if (var4 != ApproximateRouteStrategy.oculusOrbFocalPointY) { // L: 3091 - ApproximateRouteStrategy.oculusOrbFocalPointY += (var4 - ApproximateRouteStrategy.oculusOrbFocalPointY) / 16; - } - - var5 = HealthBarUpdate.oculusOrbFocalPointX >> 7; // L: 3092 - var6 = ApproximateRouteStrategy.oculusOrbFocalPointY >> 7; // L: 3093 - var7 = WorldMapRegion.getTileHeight(HealthBarUpdate.oculusOrbFocalPointX, ApproximateRouteStrategy.oculusOrbFocalPointY, class90.Client_plane); // L: 3094 - var8 = 0; // L: 3095 - if (var5 > 3 && var6 > 3 && var5 < 100 && var6 < 100) { // L: 3096 - for (var9 = var5 - 4; var9 <= var5 + 4; ++var9) { // L: 3097 - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { // L: 3098 - var11 = class90.Client_plane; // L: 3099 - if (var11 < 3 && (Tiles.Tiles_renderFlags[1][var9][var10] & 2) == 2) { // L: 3100 - ++var11; - } - - var12 = var7 - Tiles.Tiles_heights[var11][var9][var10]; // L: 3101 - if (var12 > var8) { // L: 3102 - var8 = var12; - } - } + MusicPatchPcmStream.method4122(); // L: 2966 + if (isCameraLocked) { // L: 2967 + var4 = class5.field40 * 128 + 64; // L: 2968 + var5 = ApproximateRouteStrategy.field592 * 128 + 64; // L: 2969 + var6 = UserComparator7.getTileHeight(var4, var5, class26.Client_plane) - WorldMapLabelSize.field1569; // L: 2970 + if (ModeWhere.cameraX < var4) { // L: 2971 + ModeWhere.cameraX = (var4 - ModeWhere.cameraX) * UserComparator9.field1435 / 1000 + ModeWhere.cameraX + Skeleton.field1927; // L: 2972 + if (ModeWhere.cameraX > var4) { // L: 2973 + ModeWhere.cameraX = var4; } } - var9 = var8 * 192; // L: 3106 - if (var9 > 98048) { // L: 3107 - var9 = 98048; - } - - if (var9 < 32768) { // L: 3108 - var9 = 32768; - } - - if (var9 > field880) { // L: 3109 - field880 += (var9 - field880) / 24; - } else if (var9 < field880) { // L: 3110 - field880 += (var9 - field880) / 80; - } - - ModelData0.field1882 = WorldMapRegion.getTileHeight(UserComparator9.localPlayer.x, UserComparator9.localPlayer.y, class90.Client_plane) - camFollowHeight; // L: 3111 - } else if (oculusOrbState == 1) { // L: 3113 - class13.method122(); // L: 3114 - short var31 = -1; // L: 3115 - if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3116 - var31 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3117 - var31 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3118 - if (var31 == 0) { // L: 3119 - var31 = 1792; - } else if (var31 == 1024) { // L: 3120 - var31 = 1280; - } else { - var31 = 1536; // L: 3121 - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3123 - if (var31 == 0) { // L: 3124 - var31 = 256; - } else if (var31 == 1024) { // L: 3125 - var31 = 768; - } else { - var31 = 512; // L: 3126 + if (ModeWhere.cameraX > var4) { // L: 2975 + ModeWhere.cameraX -= UserComparator9.field1435 * (ModeWhere.cameraX - var4) / 1000 + Skeleton.field1927; // L: 2976 + if (ModeWhere.cameraX < var4) { // L: 2977 + ModeWhere.cameraX = var4; } } - byte var32 = 0; // L: 3128 - if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3129 - var32 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3130 - var32 = 1; - } - - var5 = 0; // L: 3131 - if (var31 >= 0 || var32 != 0) { // L: 3132 - var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * -1685287515 * 537367085 : oculusOrbNormalSpeed * 27020565 * -1600677315; // L: 3133 - var5 *= 16; // L: 3134 - field742 = var31; // L: 3135 - field743 = var32; // L: 3136 - } - - if (field818 < var5) { // L: 3138 - field818 += var5 / 8; // L: 3139 - if (field818 > var5) { // L: 3140 - field818 = var5; + if (WorldMapRectangle.cameraY < var6) { // L: 2979 + WorldMapRectangle.cameraY = (var6 - WorldMapRectangle.cameraY) * UserComparator9.field1435 / 1000 + WorldMapRectangle.cameraY + Skeleton.field1927; // L: 2980 + if (WorldMapRectangle.cameraY > var6) { // L: 2981 + WorldMapRectangle.cameraY = var6; } - } else if (field818 > var5) { // L: 3142 - field818 = field818 * 9 / 10; } - if (field818 > 0) { // L: 3143 - var6 = field818 / 16; // L: 3144 - if (field742 >= 0) { // L: 3145 - var3 = field742 - class39.cameraYaw & 2047; // L: 3146 - var7 = Rasterizer3D.Rasterizer3D_sine[var3]; // L: 3147 - var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; // L: 3148 - HealthBarUpdate.oculusOrbFocalPointX += var7 * var6 / 65536; // L: 3149 - ApproximateRouteStrategy.oculusOrbFocalPointY += var8 * var6 / 65536; // L: 3150 + if (WorldMapRectangle.cameraY > var6) { // L: 2983 + WorldMapRectangle.cameraY -= UserComparator9.field1435 * (WorldMapRectangle.cameraY - var6) / 1000 + Skeleton.field1927; // L: 2984 + if (WorldMapRectangle.cameraY < var6) { // L: 2985 + WorldMapRectangle.cameraY = var6; } - - if (field743 != 0) { // L: 3152 - ModelData0.field1882 += var6 * field743; // L: 3153 - if (ModelData0.field1882 > 0) { // L: 3154 - ModelData0.field1882 = 0; - } - } - } else { - field742 = -1; // L: 3158 - field743 = -1; // L: 3159 } - if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3161 - packetWriter.addNode(WorldMapSprite.getPacketBufferNode(ClientPacket.field2296, packetWriter.isaacCipher)); // L: 3163 - oculusOrbState = 0; // L: 3164 + if (ReflectionCheck.cameraZ < var5) { // L: 2987 + ReflectionCheck.cameraZ = (var5 - ReflectionCheck.cameraZ) * UserComparator9.field1435 / 1000 + ReflectionCheck.cameraZ + Skeleton.field1927; // L: 2988 + if (ReflectionCheck.cameraZ > var5) { // L: 2989 + ReflectionCheck.cameraZ = var5; + } + } + + if (ReflectionCheck.cameraZ > var5) { // L: 2991 + ReflectionCheck.cameraZ -= UserComparator9.field1435 * (ReflectionCheck.cameraZ - var5) / 1000 + Skeleton.field1927; // L: 2992 + if (ReflectionCheck.cameraZ < var5) { // L: 2993 + ReflectionCheck.cameraZ = var5; + } + } + + var4 = ModeWhere.field3368 * 128 + 64; // L: 2995 + var5 = AttackOption.field1339 * 128 + 64; // L: 2996 + var6 = UserComparator7.getTileHeight(var4, var5, class26.Client_plane) - class2.field15; // L: 2997 + var7 = var4 - ModeWhere.cameraX; // L: 2998 + var8 = var6 - WorldMapRectangle.cameraY; // L: 2999 + var9 = var5 - ReflectionCheck.cameraZ; // L: 3000 + var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 3001 + var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 3002 + var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 3003 + if (var11 < 128) { // L: 3004 + var11 = 128; + } + + if (var11 > 383) { // L: 3005 + var11 = 383; + } + + if (WorldMapArea.cameraPitch < var11) { // L: 3006 + WorldMapArea.cameraPitch = (var11 - WorldMapArea.cameraPitch) * class0.field6 / 1000 + WorldMapArea.cameraPitch + Players.field1363; // L: 3007 + if (WorldMapArea.cameraPitch > var11) { // L: 3008 + WorldMapArea.cameraPitch = var11; + } + } + + if (WorldMapArea.cameraPitch > var11) { // L: 3010 + WorldMapArea.cameraPitch -= class0.field6 * (WorldMapArea.cameraPitch - var11) / 1000 + Players.field1363; // L: 3011 + if (WorldMapArea.cameraPitch < var11) { // L: 3012 + WorldMapArea.cameraPitch = var11; + } + } + + int var27 = var12 - class69.cameraYaw; // L: 3014 + if (var27 > 1024) { // L: 3015 + var27 -= 2048; + } + + if (var27 < -1024) { // L: 3016 + var27 += 2048; + } + + if (var27 > 0) { // L: 3017 + class69.cameraYaw = class69.cameraYaw + Players.field1363 + var27 * class0.field6 / 1000; // L: 3018 + class69.cameraYaw &= 2047; // L: 3019 + } + + if (var27 < 0) { // L: 3021 + class69.cameraYaw -= Players.field1363 + -var27 * class0.field6 / 1000; // L: 3022 + class69.cameraYaw &= 2047; // L: 3023 + } + + int var14 = var12 - class69.cameraYaw; // L: 3025 + if (var14 > 1024) { // L: 3026 + var14 -= 2048; + } + + if (var14 < -1024) { // L: 3027 + var14 += 2048; + } + + if (var14 < 0 && var27 > 0 || var14 > 0 && var27 < 0) { // L: 3028 + class69.cameraYaw = var12; } } - if (MouseHandler.MouseHandler_currentButton == 4 && class8.mouseCam) { // L: 3168 - var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; // L: 3169 - camAngleDX = var3 * 2; // L: 3170 - mouseCamClickedY = var3 != -1 && var3 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 1096028309 * 586562237; // L: 3171 - var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3172 - camAngleDY = var4 * 2; // L: 3173 - mouseCamClickedX = var4 != -1 && var4 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -1256373849 * -414755305; // L: 3174 - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3177 - camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3178 - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; // L: 3179 - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3180 - camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3181 - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; // L: 3182 - } - - mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3183 - mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3184 + for (var4 = 0; var4 < 5; ++var4) { // L: 3030 + var10002 = field854[var4]++; } - camAngleY = camAngleDY / 2 + camAngleY & 2047; // L: 3186 - camAngleX += camAngleDX / 2; // L: 3187 - if (camAngleX < 128) { // L: 3188 - camAngleX = 128; + TextureProvider.varcs.tryWrite(); // L: 3031 + var4 = MouseRecorder.method2107(); // L: 3032 + var5 = class9.method125(); // L: 3033 + if (var4 > 15000 && var5 > 15000) { // L: 3034 + logoutTimer = 250; // L: 3035 + MouseHandler.MouseHandler_idleCycles = 14500; // L: 3037 + var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2269, packetWriter.isaacCipher); // L: 3040 + packetWriter.addNode(var19); // L: 3041 } - if (camAngleX > 383) { // L: 3189 - camAngleX = 383; - } - - if (isCameraLocked) { // L: 3191 - var3 = WorldMapManager.field345 * 128 + 64; // L: 3192 - var4 = Decimator.field1475 * 128 + 64; // L: 3193 - var5 = WorldMapRegion.getTileHeight(var3, var4, class90.Client_plane) - Clock.field2079; // L: 3194 - if (SecureRandomFuture.cameraX < var3) { // L: 3195 - SecureRandomFuture.cameraX = (var3 - SecureRandomFuture.cameraX) * class228.field2740 / 1000 + SecureRandomFuture.cameraX + JagexCache.field2056; // L: 3196 - if (SecureRandomFuture.cameraX > var3) { // L: 3197 - SecureRandomFuture.cameraX = var3; - } - } - - if (SecureRandomFuture.cameraX > var3) { // L: 3199 - SecureRandomFuture.cameraX -= class228.field2740 * (SecureRandomFuture.cameraX - var3) / 1000 + JagexCache.field2056; // L: 3200 - if (SecureRandomFuture.cameraX < var3) { // L: 3201 - SecureRandomFuture.cameraX = var3; - } - } - - if (ArchiveLoader.cameraY < var5) { // L: 3203 - ArchiveLoader.cameraY = (var5 - ArchiveLoader.cameraY) * class228.field2740 / 1000 + ArchiveLoader.cameraY + JagexCache.field2056; // L: 3204 - if (ArchiveLoader.cameraY > var5) { // L: 3205 - ArchiveLoader.cameraY = var5; - } - } - - if (ArchiveLoader.cameraY > var5) { // L: 3207 - ArchiveLoader.cameraY -= class228.field2740 * (ArchiveLoader.cameraY - var5) / 1000 + JagexCache.field2056; // L: 3208 - if (ArchiveLoader.cameraY < var5) { // L: 3209 - ArchiveLoader.cameraY = var5; - } - } - - if (ObjectSound.cameraZ < var4) { // L: 3211 - ObjectSound.cameraZ = (var4 - ObjectSound.cameraZ) * class228.field2740 / 1000 + ObjectSound.cameraZ + JagexCache.field2056; // L: 3212 - if (ObjectSound.cameraZ > var4) { // L: 3213 - ObjectSound.cameraZ = var4; - } - } - - if (ObjectSound.cameraZ > var4) { // L: 3215 - ObjectSound.cameraZ -= class228.field2740 * (ObjectSound.cameraZ - var4) / 1000 + JagexCache.field2056; // L: 3216 - if (ObjectSound.cameraZ < var4) { // L: 3217 - ObjectSound.cameraZ = var4; - } - } - - var3 = class25.field138 * 128 + 64; // L: 3219 - var4 = GrandExchangeOfferUnitPriceComparator.field102 * 128 + 64; // L: 3220 - var5 = WorldMapRegion.getTileHeight(var3, var4, class90.Client_plane) - Skeleton.field1809; // L: 3221 - var6 = var3 - SecureRandomFuture.cameraX; // L: 3222 - var7 = var5 - ArchiveLoader.cameraY; // L: 3223 - var8 = var4 - ObjectSound.cameraZ; // L: 3224 - var9 = (int)Math.sqrt((double)(var6 * var6 + var8 * var8)); // L: 3225 - var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; // L: 3226 - var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; // L: 3227 - if (var10 < 128) { // L: 3228 - var10 = 128; - } - - if (var10 > 383) { // L: 3229 - var10 = 383; - } - - if (KeyHandler.cameraPitch < var10) { // L: 3230 - KeyHandler.cameraPitch = (var10 - KeyHandler.cameraPitch) * JagexCache.field2070 / 1000 + KeyHandler.cameraPitch + WorldMapEvent.field380; // L: 3231 - if (KeyHandler.cameraPitch > var10) { // L: 3232 - KeyHandler.cameraPitch = var10; - } - } - - if (KeyHandler.cameraPitch > var10) { // L: 3234 - KeyHandler.cameraPitch -= JagexCache.field2070 * (KeyHandler.cameraPitch - var10) / 1000 + WorldMapEvent.field380; // L: 3235 - if (KeyHandler.cameraPitch < var10) { // L: 3236 - KeyHandler.cameraPitch = var10; - } - } - - var12 = var11 - class39.cameraYaw; // L: 3238 - if (var12 > 1024) { // L: 3239 - var12 -= 2048; - } - - if (var12 < -1024) { // L: 3240 - var12 += 2048; - } - - if (var12 > 0) { // L: 3241 - class39.cameraYaw = class39.cameraYaw + WorldMapEvent.field380 + var12 * JagexCache.field2070 / 1000; // L: 3242 - class39.cameraYaw &= 2047; // L: 3243 - } - - if (var12 < 0) { // L: 3245 - class39.cameraYaw -= -var12 * JagexCache.field2070 / 1000 + WorldMapEvent.field380; // L: 3246 - class39.cameraYaw &= 2047; // L: 3247 - } - - int var26 = var11 - class39.cameraYaw; // L: 3249 - if (var26 > 1024) { // L: 3250 - var26 -= 2048; - } - - if (var26 < -1024) { // L: 3251 - var26 += 2048; - } - - if (var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) { // L: 3252 - class39.cameraYaw = var11; - } - } - - for (var3 = 0; var3 < 5; ++var3) { // L: 3254 - int var10002 = field911[var3]++; - } - - GrandExchangeOffer.varcs.tryWrite(); // L: 3255 - var3 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3258 - var5 = KeyHandler.KeyHandler_idleCycles; // L: 3263 - PacketBufferNode var27; - if (var3 > 15000 && var5 > 15000) { // L: 3266 - logoutTimer = 250; // L: 3267 - MouseHandler.MouseHandler_idleCycles = 14500; // L: 3269 - var27 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2298, packetWriter.isaacCipher); // L: 3272 - packetWriter.addNode(var27); // L: 3273 - } - - InterfaceParent.friendSystem.processFriendUpdates(); // L: 3275 - ++packetWriter.pendingWrites; // L: 3276 - if (packetWriter.pendingWrites > 50) { // L: 3277 - var27 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2305, packetWriter.isaacCipher); // L: 3279 - packetWriter.addNode(var27); // L: 3280 + class13.friendSystem.processFriendUpdates(); // L: 3043 + ++packetWriter.pendingWrites; // L: 3044 + if (packetWriter.pendingWrites > 50) { // L: 3045 + var19 = ObjectComposition.getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); // L: 3047 + packetWriter.addNode(var19); // L: 3048 } try { - packetWriter.flush(); // L: 3283 - } catch (IOException var28) { // L: 3285 - class8.method90(); // L: 3286 + packetWriter.flush(); // L: 3051 + } catch (IOException var28) { // L: 3053 + HealthBarUpdate.method2181(); // L: 3054 } - return; // L: 3288 + return; // L: 3056 } - var39 = var37.widget; // L: 2973 - if (var39.childIndex < 0) { // L: 2974 + var45 = var44.widget; // L: 2852 + if (var45.childIndex < 0) { // L: 2853 break; } - var40 = class237.getWidget(var39.parentId); // L: 2975 - } while(var40 == null || var40.children == null || var39.childIndex >= var40.children.length || var39 != var40.children[var39.childIndex]); // L: 2976 + var39 = class139.getWidget(var45.parentId); // L: 2854 + } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); // L: 2855 - PacketWriter.runScriptEvent(var37); // L: 2980 + class19.runScriptEvent(var44); // L: 2859 } } - var39 = var37.widget; // L: 2961 - if (var39.childIndex < 0) { // L: 2962 + var45 = var44.widget; // L: 2840 + if (var45.childIndex < 0) { // L: 2841 break; } - var40 = class237.getWidget(var39.parentId); // L: 2963 - } while(var40 == null || var40.children == null || var39.childIndex >= var40.children.length || var39 != var40.children[var39.childIndex]); // L: 2964 + var39 = class139.getWidget(var45.parentId); // L: 2842 + } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); // L: 2843 - PacketWriter.runScriptEvent(var37); // L: 2968 + class19.runScriptEvent(var44); // L: 2847 } } - var39 = var37.widget; // L: 2949 - if (var39.childIndex < 0) { // L: 2950 + var45 = var44.widget; // L: 2828 + if (var45.childIndex < 0) { // L: 2829 break; } - var40 = class237.getWidget(var39.parentId); // L: 2951 - } while(var40 == null || var40.children == null || var39.childIndex >= var40.children.length || var39 != var40.children[var39.childIndex]); // L: 2952 + var39 = class139.getWidget(var45.parentId); // L: 2830 + } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); // L: 2831 - PacketWriter.runScriptEvent(var37); // L: 2956 + class19.runScriptEvent(var44); // L: 2835 } } } } } - } // L: 2673 2868 + } // L: 2472 2735 - @ObfuscatedName("gt") + @ObfuscatedName("fb") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "647800205" + garbageValue = "-594125034" ) @Export("resizeJS") void resizeJS() { - int var1 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; // L: 3837 - int var2 = class25.canvasHeight; // L: 3838 - if (super.contentWidth < var1) { // L: 3839 + int var1 = InterfaceParent.canvasWidth; // L: 3627 + int var2 = GameEngine.canvasHeight; // L: 3628 + if (super.contentWidth < var1) { // L: 3629 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; // L: 3840 + var2 = super.contentHeight; // L: 3630 } - if (WorldMapSectionType.clientPreferences != null) { // L: 3841 + if (Login.clientPreferences != null) { // L: 3631 try { - class56.method923(class1.client, "resize", new Object[]{BoundaryObject.getWindowedMode()}); // L: 3843 - } catch (Throwable var4) { // L: 3845 + class42.method511(class10.client, "resize", new Object[]{WorldMapScaleHandler.getWindowedMode()}); // L: 3633 + } catch (Throwable var4) { // L: 3635 } } - } // L: 3847 + } // L: 3637 - @ObfuscatedName("gm") + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1573382643" + descriptor = "(S)V", + garbageValue = "-15264" ) @Export("drawLoggedIn") final void drawLoggedIn() { + if (rootInterface != -1) { // L: 3640 + Archive.method4471(rootInterface); + } + int var1; - if (rootInterface != -1) { // L: 3850 - var1 = rootInterface; // L: 3851 - if (WorldMapCacheName.loadInterface(var1)) { // L: 3853 - ApproximateRouteStrategy.drawModelComponents(DefaultsGroup.Widget_interfaceComponents[var1], -1); // L: 3854 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3641 + if (field811[var1]) { // L: 3642 + field812[var1] = true; + } + + field704[var1] = field811[var1]; // L: 3643 + field811[var1] = false; // L: 3644 + } + + field810 = cycle; // L: 3646 + viewportX = -1; // L: 3647 + viewportY = -1; // L: 3648 + ScriptFrame.hoveredItemContainer = null; // L: 3649 + if (rootInterface != -1) { // L: 3650 + rootWidgetCount = 0; // L: 3651 + Skeleton.drawWidgets(rootInterface, 0, 0, InterfaceParent.canvasWidth, GameEngine.canvasHeight, 0, 0, -1); // L: 3652 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 3654 + if (showMouseCross) { // L: 3655 + if (mouseCrossColor == 1) { // L: 3656 + class18.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3657 + } + + if (mouseCrossColor == 2) { // L: 3659 + class18.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3660 } } - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3857 - if (field816[var1]) { // L: 3858 - field827[var1] = true; - } - - field871[var1] = field816[var1]; // L: 3859 - field816[var1] = false; // L: 3860 - } - - field868 = cycle; // L: 3862 - viewportX = -1; // L: 3863 - viewportY = -1; // L: 3864 - HorizontalAlignment.hoveredItemContainer = null; // L: 3865 - if (rootInterface != -1) { // L: 3866 - rootWidgetCount = 0; // L: 3867 - ViewportMouse.drawWidgets(rootInterface, 0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight, 0, 0, -1); // L: 3868 - } - - Rasterizer2D.Rasterizer2D_resetClip(); // L: 3870 - if (showMouseCross) { // L: 3871 - if (mouseCrossColor == 1) { // L: 3872 - Frames.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3873 - } - - if (mouseCrossColor == 2) { // L: 3875 - Frames.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3876 - } - } - - int var2; - int var3; - if (!isMenuOpen) { // L: 3879 - if (viewportX != -1) { // L: 3880 - var1 = viewportX; // L: 3881 - var2 = viewportY; // L: 3882 - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 3884 3885 - var3 = menuOptionsCount - 1; // L: 3888 - String var13; - if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 3892 - var13 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { // L: 3893 - var13 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; - } else { - var13 = WorldMapLabel.method504(var3); // L: 3894 - } - - if (menuOptionsCount > 2) { // L: 3895 - var13 = var13 + FileSystem.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; - } - - ScriptEvent.fontBold12.drawRandomAlphaAndSpacing(var13, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 3896 - } + if (!isMenuOpen) { // L: 3663 + if (viewportX != -1) { // L: 3664 + WorldMapDecoration.method3105(viewportX, viewportY); } } else { - var1 = ApproximateRouteStrategy.menuX; // L: 3901 - var2 = AbstractUserComparator.menuY; // L: 3902 - var3 = CollisionMap.menuWidth; // L: 3903 - int var4 = GrandExchangeOfferTotalQuantityComparator.menuHeight; // L: 3904 - int var5 = 6116423; // L: 3905 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 3906 - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 3907 - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 3908 - ScriptEvent.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 3909 - int var6 = MouseHandler.MouseHandler_x; // L: 3910 - int var7 = MouseHandler.MouseHandler_y; // L: 3911 + BufferedSource.method5918(); // L: 3666 + } - int var8; - int var9; - int var10; - for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 3912 - var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 3913 - var10 = 16777215; // L: 3914 - if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 3915 - var10 = 16776960; - } - - ScriptEvent.fontBold12.draw(WorldMapLabel.method504(var8), var1 + 3, var9, var10, 0); // L: 3916 - } - - var8 = ApproximateRouteStrategy.menuX; // L: 3918 - var9 = AbstractUserComparator.menuY; // L: 3919 - var10 = CollisionMap.menuWidth; // L: 3920 - int var11 = GrandExchangeOfferTotalQuantityComparator.menuHeight; // L: 3921 - - for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 3923 - if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { // L: 3924 - field827[var12] = true; + if (gameDrawingMode == 3) { // L: 3667 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3668 + if (field704[var1]) { // L: 3669 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 3670 + } else if (field812[var1]) { // L: 3672 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 3673 } } } - if (gameDrawingMode == 3) { // L: 3928 - for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3929 - if (field871[var1]) { // L: 3930 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 3931 - } else if (field827[var1]) { // L: 3933 - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 3934 - } - } - } + class258.method4608(class26.Client_plane, Varcs.localPlayer.x, Varcs.localPlayer.y, field799); // L: 3677 + field799 = 0; // L: 3678 + } // L: 3679 - WorldMapSection0.method308(class90.Client_plane, UserComparator9.localPlayer.x, UserComparator9.localPlayer.y, field808); // L: 3938 - field808 = 0; // L: 3939 - } // L: 3940 - - @ObfuscatedName("hs") + @ObfuscatedName("gl") @ObfuscatedSignature( - descriptor = "(Ldx;B)Z", - garbageValue = "9" + descriptor = "(Ldn;I)Z", + garbageValue = "2074217891" ) - final boolean method1701(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); // L: 5949 - PacketBuffer var3 = var1.packetBuffer; // L: 5950 - if (var2 == null) { // L: 5951 + final boolean method1233(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5328 + PacketBuffer var3 = var1.packetBuffer; // L: 5329 + if (var2 == null) { // L: 5330 return false; } else { int var6; - String var20; + String var18; try { int var5; - if (var1.serverPacket == null) { // L: 5953 - if (var1.field1327) { // L: 5954 - if (!var2.isAvailable(1)) { // L: 5955 + if (var1.serverPacket == null) { // L: 5332 + if (var1.field1388) { // L: 5333 + if (!var2.isAvailable(1)) { // L: 5334 return false; } - var2.read(var1.packetBuffer.array, 0, 1); // L: 5956 - var1.field1330 = 0; // L: 5957 - var1.field1327 = false; // L: 5958 + var2.read(var1.packetBuffer.array, 0, 1); // L: 5335 + var1.field1391 = 0; // L: 5336 + var1.field1388 = false; // L: 5337 } - var3.offset = 0; // L: 5960 - if (var3.method5634()) { // L: 5961 - if (!var2.isAvailable(1)) { // L: 5962 + var3.offset = 0; // L: 5339 + if (var3.method6529()) { // L: 5340 + if (!var2.isAvailable(1)) { // L: 5341 return false; } - var2.read(var1.packetBuffer.array, 1, 1); // L: 5963 - var1.field1330 = 0; // L: 5964 + var2.read(var1.packetBuffer.array, 1, 1); // L: 5342 + var1.field1391 = 0; // L: 5343 } - var1.field1327 = true; // L: 5966 - ServerPacket[] var4 = WorldMapRegion.ServerPacket_values(); // L: 5967 - var5 = var3.readSmartByteShortIsaac(); // L: 5968 - if (var5 < 0 || var5 >= var4.length) { // L: 5969 + var1.field1388 = true; // L: 5345 + ServerPacket[] var4 = ItemLayer.ServerPacket_values(); // L: 5346 + var5 = var3.readSmartByteShortIsaac(); // L: 5347 + if (var5 < 0 || var5 >= var4.length) { // L: 5348 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; // L: 5970 - var1.serverPacketLength = var1.serverPacket.length; // L: 5971 + var1.serverPacket = var4[var5]; // L: 5349 + var1.serverPacketLength = var1.serverPacket.length; // L: 5350 } - if (var1.serverPacketLength == -1) { // L: 5973 - if (!var2.isAvailable(1)) { // L: 5974 + if (var1.serverPacketLength == -1) { // L: 5352 + if (!var2.isAvailable(1)) { // L: 5353 return false; } - var1.getSocket().read(var3.array, 0, 1); // L: 5975 - var1.serverPacketLength = var3.array[0] & 255; // L: 5976 + var1.getSocket().read(var3.array, 0, 1); // L: 5354 + var1.serverPacketLength = var3.array[0] & 255; // L: 5355 } - if (var1.serverPacketLength == -2) { // L: 5978 - if (!var2.isAvailable(2)) { // L: 5979 + if (var1.serverPacketLength == -2) { // L: 5357 + if (!var2.isAvailable(2)) { // L: 5358 return false; } - var1.getSocket().read(var3.array, 0, 2); // L: 5980 - var3.offset = 0; // L: 5981 - var1.serverPacketLength = var3.readUnsignedShort(); // L: 5982 + var1.getSocket().read(var3.array, 0, 2); // L: 5359 + var3.offset = 0; // L: 5360 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5361 } - if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5984 + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5363 return false; } - var3.offset = 0; // L: 5985 - var2.read(var3.array, 0, var1.serverPacketLength); // L: 5986 - var1.field1330 = 0; // L: 5987 - timer.method5212(); // L: 5988 - var1.field1334 = var1.field1333; // L: 5989 - var1.field1333 = var1.field1331; // L: 5990 - var1.field1331 = var1.serverPacket; // L: 5991 - int var16; - if (ServerPacket.field2164 == var1.serverPacket) { // L: 5992 - var16 = var3.readInt(); // L: 5993 - var5 = var3.method5727(); // L: 5994 - Varps.Varps_temp[var5] = var16; // L: 5995 - if (Varps.Varps_main[var5] != var16) { // L: 5996 - Varps.Varps_main[var5] = var16; // L: 5997 + var3.offset = 0; // L: 5364 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5365 + var1.field1391 = 0; // L: 5366 + timer.method5577(); // L: 5367 + var1.field1393 = var1.field1392; // L: 5368 + var1.field1392 = var1.field1381; // L: 5369 + var1.field1381 = var1.serverPacket; // L: 5370 + int var17; + Widget var57; + if (ServerPacket.field2412 == var1.serverPacket) { // L: 5371 + var17 = var3.method6629(); // L: 5372 + var57 = class139.getWidget(var17); // L: 5373 + + for (var6 = 0; var6 < var57.itemIds.length; ++var6) { // L: 5374 + var57.itemIds[var6] = -1; // L: 5375 + var57.itemIds[var6] = 0; // L: 5376 } - AbstractWorldMapIcon.changeGameOptions(var5); // L: 5999 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6000 - var1.serverPacket = null; // L: 6001 - return true; // L: 6002 + class29.invalidateWidget(var57); // L: 5378 + var1.serverPacket = null; // L: 5379 + return true; // L: 5380 } - if (ServerPacket.field2213 == var1.serverPacket) { // L: 6004 - PacketWriter.method2429(class194.field2350); // L: 6005 + Widget var19; + boolean var73; + if (ServerPacket.field2405 == var1.serverPacket) { // L: 5382 + var73 = var3.method6610() == 1; // L: 5383 + var5 = var3.readInt(); // L: 5384 + var19 = class139.getWidget(var5); // L: 5385 + if (var73 != var19.isHidden) { // L: 5386 + var19.isHidden = var73; // L: 5387 + class29.invalidateWidget(var19); // L: 5388 + } + + var1.serverPacket = null; // L: 5390 + return true; // L: 5391 + } + + if (ServerPacket.field2369 == var1.serverPacket) { // L: 5393 + class105.method2255(); // L: 5394 + runEnergy = var3.readUnsignedByte(); // L: 5395 + field803 = cycleCntr; // L: 5396 + var1.serverPacket = null; // L: 5397 + return true; // L: 5398 + } + + if (ServerPacket.field2370 == var1.serverPacket) { // L: 5400 + MusicPatchPcmStream.method4148(class203.field2327); // L: 5401 + var1.serverPacket = null; // L: 5402 + return true; // L: 5403 + } + + String var45; + if (ServerPacket.field2435 == var1.serverPacket) { // L: 5405 + var45 = var3.readStringCp1252NullTerminated(); // L: 5406 + var18 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 5407 + class69.addGameMessage(6, var45, var18); // L: 5408 + var1.serverPacket = null; // L: 5409 + return true; // L: 5410 + } + + if (ServerPacket.field2394 == var1.serverPacket) { // L: 5412 + var17 = var3.readInt(); // L: 5413 + var5 = var3.readUnsignedShort(); // L: 5414 + var19 = class139.getWidget(var17); // L: 5415 + if (var19.modelType != 1 || var5 != var19.modelId) { // L: 5416 + var19.modelType = 1; // L: 5417 + var19.modelId = var5; // L: 5418 + class29.invalidateWidget(var19); // L: 5419 + } + + var1.serverPacket = null; // L: 5421 + return true; // L: 5422 + } + + if (ServerPacket.field2432 == var1.serverPacket) { // L: 5424 + MusicPatchPcmStream.method4148(class203.field2335); // L: 5425 + var1.serverPacket = null; // L: 5426 + return true; // L: 5427 + } + + if (ServerPacket.field2378 == var1.serverPacket) { // L: 5429 + var17 = var3.readUnsignedByte(); // L: 5430 + if (var3.readUnsignedByte() == 0) { // L: 5431 + grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 5432 + var3.offset += 18; // L: 5433 + } else { + --var3.offset; // L: 5436 + grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 5437 + } + + field801 = cycleCntr; // L: 5439 + var1.serverPacket = null; // L: 5440 + return true; // L: 5441 + } + + byte var56; + if (ServerPacket.field2440 == var1.serverPacket) { // L: 5443 + field800 = cycleCntr; // L: 5444 + var56 = var3.readByte(); // L: 5445 + class19 var66 = new class19(var3); // L: 5446 + class3 var71; + if (var56 >= 0) { // L: 5448 + var71 = field820[var56]; + } else { + var71 = IsaacCipher.field4266; // L: 5449 + } + + var66.method286(var71); // L: 5450 + var1.serverPacket = null; // L: 5451 + return true; // L: 5452 + } + + long var7; + long var20; + String var22; + int var53; + if (ServerPacket.field2376 == var1.serverPacket) { // L: 5454 + var45 = var3.readStringCp1252NullTerminated(); // L: 5455 + var20 = (long)var3.readUnsignedShort(); // L: 5456 + var7 = (long)var3.readMedium(); // L: 5457 + PlayerType var9 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var3.readUnsignedByte()); // L: 5458 + long var10 = var7 + (var20 << 32); // L: 5459 + boolean var12 = false; // L: 5460 + + for (var53 = 0; var53 < 100; ++var53) { // L: 5461 + if (field689[var53] == var10) { // L: 5462 + var12 = true; // L: 5463 + break; // L: 5464 + } + } + + if (class13.friendSystem.isIgnored(new Username(var45, AbstractUserComparator.loginType))) { // L: 5467 + var12 = true; + } + + if (!var12 && field716 == 0) { // L: 5468 + field689[field760] = var10; // L: 5469 + field760 = (field760 + 1) % 100; // L: 5470 + var22 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 5471 + byte var55; + if (var9.isPrivileged) { // L: 5473 + var55 = 7; + } else { + var55 = 3; // L: 5474 + } + + if (var9.modIcon != -1) { // L: 5475 + class69.addGameMessage(var55, class337.method5986(var9.modIcon) + var45, var22); + } else { + class69.addGameMessage(var55, var45, var22); // L: 5476 + } + } + + var1.serverPacket = null; // L: 5478 + return true; // L: 5479 + } + + if (ServerPacket.field2401 == var1.serverPacket) { // L: 5481 + isCameraLocked = false; // L: 5482 + + for (var17 = 0; var17 < 5; ++var17) { // L: 5483 + field850[var17] = false; + } + + var1.serverPacket = null; // L: 5484 + return true; // L: 5485 + } + + if (ServerPacket.field2411 == var1.serverPacket) { // L: 5487 + var56 = var3.method6678(); // L: 5488 + var5 = var3.method6766(); // L: 5489 + Varps.Varps_temp[var5] = var56; // L: 5490 + if (Varps.Varps_main[var5] != var56) { // L: 5491 + Varps.Varps_main[var5] = var56; // L: 5492 + } + + class27.changeGameOptions(var5); // L: 5494 + changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 5495 + var1.serverPacket = null; // L: 5496 + return true; // L: 5497 + } + + if (ServerPacket.field2416 == var1.serverPacket) { // L: 5499 + ClanChat.field3818 = var3.method6609(); // L: 5500 + class18.field145 = var3.method6623(); // L: 5501 + + while (var3.offset < var1.serverPacketLength) { // L: 5502 + var17 = var3.readUnsignedByte(); // L: 5503 + class203 var65 = AbstractWorldMapData.method3099()[var17]; // L: 5504 + MusicPatchPcmStream.method4148(var65); // L: 5505 + } + + var1.serverPacket = null; // L: 5507 + return true; // L: 5508 + } + + if (ServerPacket.field2380 == var1.serverPacket) { // L: 5510 + var45 = var3.readStringCp1252NullTerminated(); // L: 5511 + Object[] var64 = new Object[var45.length() + 1]; // L: 5512 + + for (var6 = var45.length() - 1; var6 >= 0; --var6) { // L: 5513 + if (var45.charAt(var6) == 's') { // L: 5514 + var64[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var64[var6 + 1] = new Integer(var3.readInt()); // L: 5515 + } + } + + var64[0] = new Integer(var3.readInt()); // L: 5517 + ScriptEvent var70 = new ScriptEvent(); // L: 5518 + var70.args = var64; // L: 5519 + class19.runScriptEvent(var70); // L: 5520 + var1.serverPacket = null; // L: 5521 + return true; // L: 5522 + } + + if (ServerPacket.field2385 == var1.serverPacket) { // L: 5524 + var45 = var3.readStringCp1252NullTerminated(); // L: 5525 + var5 = var3.method6609(); // L: 5526 + var6 = var3.readUnsignedByte(); // L: 5527 + if (var5 >= 1 && var5 <= 8) { // L: 5528 + if (var45.equalsIgnoreCase("null")) { // L: 5529 + var45 = null; + } + + playerMenuActions[var5 - 1] = var45; // L: 5530 + playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 5531 + } + + var1.serverPacket = null; // L: 5533 + return true; // L: 5534 + } + + String var68; + if (ServerPacket.field2377 == var1.serverPacket) { // L: 5536 + byte[] var49 = new byte[var1.serverPacketLength]; // L: 5537 + var3.method6530(var49, 0, var49.length); // L: 5538 + Buffer var63 = new Buffer(var49); // L: 5539 + var68 = var63.readStringCp1252NullTerminated(); // L: 5540 + class302.openURL(var68, true, false); // L: 5541 + var1.serverPacket = null; // L: 5542 + return true; // L: 5543 + } + + if (ServerPacket.field2363 == var1.serverPacket) { // L: 5545 + for (var17 = 0; var17 < players.length; ++var17) { // L: 5546 + if (players[var17] != null) { // L: 5547 + players[var17].sequence = -1; + } + } + + for (var17 = 0; var17 < npcs.length; ++var17) { // L: 5549 + if (npcs[var17] != null) { // L: 5550 + npcs[var17].sequence = -1; + } + } + + var1.serverPacket = null; // L: 5552 + return true; // L: 5553 + } + + if (ServerPacket.field2419 == var1.serverPacket) { // L: 5555 + for (var17 = 0; var17 < VarpDefinition.VarpDefinition_fileCount; ++var17) { // L: 5556 + VarpDefinition var61 = class303.VarpDefinition_get(var17); // L: 5557 + if (var61 != null) { // L: 5558 + Varps.Varps_temp[var17] = 0; // L: 5559 + Varps.Varps_main[var17] = 0; // L: 5560 + } + } + + class105.method2255(); // L: 5563 + changedVarpCount += 32; // L: 5564 + var1.serverPacket = null; // L: 5565 + return true; // L: 5566 + } + + if (ServerPacket.field2382 == var1.serverPacket) { // L: 5568 + var17 = var3.readUShortSmart(); // L: 5569 + boolean var58 = var3.readUnsignedByte() == 1; // L: 5570 + var68 = ""; // L: 5571 + boolean var76 = false; // L: 5572 + if (var58) { // L: 5573 + var68 = var3.readStringCp1252NullTerminated(); // L: 5574 + if (class13.friendSystem.isIgnored(new Username(var68, AbstractUserComparator.loginType))) { // L: 5575 + var76 = true; + } + } + + String var51 = var3.readStringCp1252NullTerminated(); // L: 5577 + if (!var76) { // L: 5578 + class69.addGameMessage(var17, var68, var51); + } + + var1.serverPacket = null; // L: 5579 + return true; // L: 5580 + } + + if (ServerPacket.field2352 == var1.serverPacket) { // L: 5582 + hintArrowType = var3.readUnsignedByte(); // L: 5583 + if (hintArrowType == 1) { // L: 5584 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 5585 + if (hintArrowType == 2) { // L: 5586 + hintArrowSubX = 64; // L: 5587 + hintArrowSubY = 64; // L: 5588 + } + + if (hintArrowType == 3) { // L: 5590 + hintArrowSubX = 0; // L: 5591 + hintArrowSubY = 64; // L: 5592 + } + + if (hintArrowType == 4) { // L: 5594 + hintArrowSubX = 128; // L: 5595 + hintArrowSubY = 64; // L: 5596 + } + + if (hintArrowType == 5) { // L: 5598 + hintArrowSubX = 64; // L: 5599 + hintArrowSubY = 0; // L: 5600 + } + + if (hintArrowType == 6) { // L: 5602 + hintArrowSubX = 64; // L: 5603 + hintArrowSubY = 128; // L: 5604 + } + + hintArrowType = 2; // L: 5606 + hintArrowX = var3.readUnsignedShort(); // L: 5607 + hintArrowY = var3.readUnsignedShort(); // L: 5608 + hintArrowHeight = var3.readUnsignedByte(); // L: 5609 + } + + if (hintArrowType == 10) { // L: 5611 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 5612 + return true; // L: 5613 + } + + if (ServerPacket.field2441 == var1.serverPacket) { // L: 5615 + Coord.field2591 = new class338(FriendSystem.field910); // L: 5616 + var1.serverPacket = null; // L: 5617 + return true; // L: 5618 + } + + if (ServerPacket.field2425 == var1.serverPacket) { // L: 5620 + MusicPatchPcmStream.method4148(class203.field2334); // L: 5621 + var1.serverPacket = null; // L: 5622 + return true; // L: 5623 + } + + if (ServerPacket.field2365 == var1.serverPacket) { // L: 5625 + var73 = var3.readBoolean(); // L: 5626 + if (var73) { // L: 5627 + if (class105.field1331 == null) { // L: 5628 + class105.field1331 = new class263(); + } + } else { + class105.field1331 = null; // L: 5630 + } + + var1.serverPacket = null; // L: 5631 + return true; // L: 5632 + } + + if (ServerPacket.field2353 == var1.serverPacket) { // L: 5634 + rebootTimer = var3.method6766() * 30; // L: 5635 + field803 = cycleCntr; // L: 5636 + var1.serverPacket = null; // L: 5637 + return true; // L: 5638 + } + + int var23; + Widget var50; + if (ServerPacket.field2395 == var1.serverPacket) { // L: 5640 + var17 = var3.readUnsignedShort(); // L: 5641 + var5 = var3.method6617(); // L: 5642 + var6 = var3.method6628(); // L: 5643 + var23 = var3.method6766(); // L: 5644 + var50 = class139.getWidget(var6); // L: 5645 + if (var23 != var50.modelAngleX || var5 != var50.modelAngleY || var17 != var50.modelZoom) { // L: 5646 + var50.modelAngleX = var23; // L: 5647 + var50.modelAngleY = var5; // L: 5648 + var50.modelZoom = var17; // L: 5649 + class29.invalidateWidget(var50); // L: 5650 + } + + var1.serverPacket = null; // L: 5652 + return true; // L: 5653 + } + + if (ServerPacket.field2387 == var1.serverPacket) { // L: 5655 + var17 = var3.readInt(); // L: 5656 + var5 = var3.readInt(); // L: 5657 + var6 = class80.getGcDuration(); // L: 5658 + PacketBufferNode var72 = ObjectComposition.getPacketBufferNode(ClientPacket.field2297, packetWriter.isaacCipher); // L: 5660 + var72.packetBuffer.writeShortLE(GameEngine.fps); // L: 5661 + var72.packetBuffer.method6624(var17); // L: 5662 + var72.packetBuffer.writeInt(var5); // L: 5663 + var72.packetBuffer.method6606(var6); // L: 5664 + packetWriter.addNode(var72); // L: 5665 + var1.serverPacket = null; // L: 5666 + return true; // L: 5667 + } + + if (ServerPacket.field2354 == var1.serverPacket) { // L: 5669 + class13.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 5670 + class1.FriendSystem_invalidateIgnoreds(); // L: 5671 + field797 = cycleCntr; // L: 5672 + var1.serverPacket = null; // L: 5673 + return true; // L: 5674 + } + + if (ServerPacket.field2361 == var1.serverPacket) { // L: 5676 + class11.updatePlayers(var3, var1.serverPacketLength); // L: 5677 + TaskHandler.method2523(); // L: 5678 + var1.serverPacket = null; // L: 5679 + return true; // L: 5680 + } + + if (ServerPacket.field2384 == var1.serverPacket) { // L: 5682 + var17 = var3.method6766(); // L: 5683 + var5 = var3.method6629(); // L: 5684 + var19 = class139.getWidget(var5); // L: 5685 + if (var19.modelType != 2 || var17 != var19.modelId) { // L: 5686 + var19.modelType = 2; // L: 5687 + var19.modelId = var17; // L: 5688 + class29.invalidateWidget(var19); // L: 5689 + } + + var1.serverPacket = null; // L: 5691 + return true; // L: 5692 + } + + if (ServerPacket.field2355 == var1.serverPacket) { // L: 5694 + MusicPatchPcmStream.method4148(class203.field2331); // L: 5695 + var1.serverPacket = null; // L: 5696 + return true; // L: 5697 + } + + if (ServerPacket.field2442 == var1.serverPacket) { // L: 5699 + Coord.field2591 = null; // L: 5700 + var1.serverPacket = null; // L: 5701 + return true; // L: 5702 + } + + Widget var24; + if (ServerPacket.field2364 == var1.serverPacket) { // L: 5704 + var17 = var3.method6621(); // L: 5705 + var5 = var3.method6622(); // L: 5706 + var6 = var3.method6629(); // L: 5707 + var24 = class139.getWidget(var6); // L: 5708 + if (var17 != var24.rawX || var5 != var24.rawY || var24.xAlignment != 0 || var24.yAlignment != 0) { // L: 5709 + var24.rawX = var17; // L: 5710 + var24.rawY = var5; // L: 5711 + var24.xAlignment = 0; // L: 5712 + var24.yAlignment = 0; // L: 5713 + class29.invalidateWidget(var24); // L: 5714 + this.alignWidget(var24); // L: 5715 + if (var24.type == 0) { // L: 5716 + UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var6 >> 16], var24, false); + } + } + + var1.serverPacket = null; // L: 5718 + return true; // L: 5719 + } + + if (ServerPacket.field2445 == var1.serverPacket) { // L: 5721 + field800 = cycleCntr; // L: 5722 + var56 = var3.readByte(); // L: 5723 + if (var1.serverPacketLength == 1) { // L: 5724 + if (var56 >= 0) { // L: 5725 + field820[var56] = null; + } else { + IsaacCipher.field4266 = null; // L: 5726 + } + + var1.serverPacket = null; // L: 5727 + return true; // L: 5728 + } + + if (var56 >= 0) { // L: 5730 + field820[var56] = new class3(var3); // L: 5731 + } else { + IsaacCipher.field4266 = new class3(var3); // L: 5734 + } + + var1.serverPacket = null; // L: 5736 + return true; // L: 5737 + } + + if (ServerPacket.field2430 == var1.serverPacket) { // L: 5739 + var17 = var3.readUnsignedShort(); // L: 5740 + var5 = var3.readUnsignedByte(); // L: 5741 + var6 = var3.readUnsignedShort(); // L: 5742 + ArchiveDiskAction.queueSoundEffect(var17, var5, var6); // L: 5743 + var1.serverPacket = null; // L: 5744 + return true; // L: 5745 + } + + if (ServerPacket.field2396 == var1.serverPacket) { // L: 5747 + var17 = var3.readInt(); // L: 5748 + InterfaceParent var60 = (InterfaceParent)interfaceParents.get((long)var17); // L: 5749 + if (var60 != null) { // L: 5750 + WorldMapData_1.closeInterface(var60, true); + } + + if (meslayerContinueWidget != null) { // L: 5751 + class29.invalidateWidget(meslayerContinueWidget); // L: 5752 + meslayerContinueWidget = null; // L: 5753 + } + + var1.serverPacket = null; // L: 5755 + return true; // L: 5756 + } + + InterfaceParent var69; + if (ServerPacket.field2448 == var1.serverPacket) { // L: 5758 + var17 = var3.method6629(); // L: 5759 + var5 = var3.method6766(); // L: 5760 + var6 = var3.method6623(); // L: 5761 + var69 = (InterfaceParent)interfaceParents.get((long)var17); // L: 5762 + if (var69 != null) { // L: 5763 + WorldMapData_1.closeInterface(var69, var5 != var69.group); + } + + Player.method2151(var17, var5, var6); // L: 5764 + var1.serverPacket = null; // L: 5765 + return true; // L: 5766 + } + + if (ServerPacket.field2362 == var1.serverPacket) { // L: 5768 + class13.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5769 + field797 = cycleCntr; // L: 5770 + var1.serverPacket = null; // L: 5771 + return true; // L: 5772 + } + + if (ServerPacket.field2402 == var1.serverPacket) { // L: 5774 + var3.offset += 28; // L: 5775 + if (var3.checkCrc()) { // L: 5776 + WorldMapLabelSize.method2679(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 5777 + return true; // L: 5778 + } + + if (ServerPacket.field2351 == var1.serverPacket) { // L: 5780 + for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 5781 + if (Varps.Varps_main[var17] != Varps.Varps_temp[var17]) { // L: 5782 + Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 5783 + class27.changeGameOptions(var17); // L: 5784 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 5785 + } + } + + var1.serverPacket = null; // L: 5788 + return true; // L: 5789 + } + + if (ServerPacket.field2422 == var1.serverPacket) { // L: 5791 + Canvas.privateChatMode = MidiPcmStream.method3952(var3.readUnsignedByte()); // L: 5792 + var1.serverPacket = null; // L: 5793 + return true; // L: 5794 + } + + int var25; + int var26; + int var28; + long var29; + if (ServerPacket.field2408 == var1.serverPacket) { // L: 5796 + var17 = var3.offset + var1.serverPacketLength; // L: 5797 + var5 = var3.readUnsignedShort(); // L: 5798 + var6 = var3.readUnsignedShort(); // L: 5799 + if (var5 != rootInterface) { // L: 5800 + rootInterface = var5; // L: 5801 + this.resizeRoot(false); // L: 5802 + PlayerComposition.Widget_resetModelFrames(rootInterface); // L: 5803 + AbstractSocket.runWidgetOnLoadListener(rootInterface); // L: 5804 + + for (var23 = 0; var23 < 100; ++var23) { // L: 5805 + field811[var23] = true; + } + } + + InterfaceParent var75; + for (; var6-- > 0; var75.field1136 = true) { // L: 5807 5817 + var23 = var3.readInt(); // L: 5808 + var25 = var3.readUnsignedShort(); // L: 5809 + var26 = var3.readUnsignedByte(); // L: 5810 + var75 = (InterfaceParent)interfaceParents.get((long)var23); // L: 5811 + if (var75 != null && var25 != var75.group) { // L: 5812 + WorldMapData_1.closeInterface(var75, true); // L: 5813 + var75 = null; // L: 5814 + } + + if (var75 == null) { // L: 5816 + var75 = Player.method2151(var23, var25, var26); + } + } + + for (var69 = (InterfaceParent)interfaceParents.first(); var69 != null; var69 = (InterfaceParent)interfaceParents.next()) { // L: 5819 + if (var69.field1136) { // L: 5820 + var69.field1136 = false; + } else { + WorldMapData_1.closeInterface(var69, true); // L: 5822 + } + } + + widgetFlags = new NodeHashTable(512); // L: 5825 + + while (var3.offset < var17) { // L: 5826 + var23 = var3.readInt(); // L: 5827 + var25 = var3.readUnsignedShort(); // L: 5828 + var26 = var3.readUnsignedShort(); // L: 5829 + var28 = var3.readInt(); // L: 5830 + + for (int var52 = var25; var52 <= var26; ++var52) { // L: 5831 + var29 = ((long)var23 << 32) + (long)var52; // L: 5832 + widgetFlags.put(new IntegerNode(var28), var29); // L: 5833 + } + } + + var1.serverPacket = null; // L: 5836 + return true; // L: 5837 + } + + if (ServerPacket.field2357 == var1.serverPacket) { // L: 5839 + if (rootInterface != -1) { // L: 5840 + class379.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 5841 + return true; // L: 5842 + } + + if (ServerPacket.field2434 == var1.serverPacket) { // L: 5844 + World var48 = new World(); // L: 5845 + var48.host = var3.readStringCp1252NullTerminated(); // L: 5846 + var48.id = var3.readUnsignedShort(); // L: 5847 + var5 = var3.readInt(); // L: 5848 + var48.properties = var5; // L: 5849 + class20.updateGameState(45); // L: 5850 + var2.close(); // L: 5851 + var2 = null; // L: 5852 + class148.changeWorld(var48); // L: 5853 + var1.serverPacket = null; // L: 5854 + return false; // L: 5855 + } + + long var31; + if (ServerPacket.field2439 == var1.serverPacket) { // L: 5857 + var56 = var3.readByte(); // L: 5858 + var20 = (long)var3.readUnsignedShort(); // L: 5859 + var7 = (long)var3.readMedium(); // L: 5860 + var31 = (var20 << 32) + var7; // L: 5861 + boolean var11 = false; // L: 5862 + class3 var33 = var56 >= 0 ? field820[var56] : IsaacCipher.field4266; // L: 5863 + if (var33 == null) { // L: 5864 + var11 = true; + } else { + for (var53 = 0; var53 < 100; ++var53) { // L: 5866 + if (field689[var53] == var31) { // L: 5867 + var11 = true; // L: 5868 + break; // L: 5869 + } + } + } + + if (!var11) { // L: 5873 + field689[field760] = var31; // L: 5874 + field760 = (field760 + 1) % 100; // L: 5875 + var22 = class16.method258(var3); // L: 5876 + int var54 = var56 >= 0 ? 43 : 46; // L: 5877 + Projectile.addChatMessage(var54, "", var22, var33.field25); // L: 5878 + } + + var1.serverPacket = null; // L: 5880 + return true; // L: 5881 + } + + if (ServerPacket.field2415 == var1.serverPacket) { // L: 5883 + isCameraLocked = true; // L: 5884 + ModeWhere.field3368 = var3.readUnsignedByte(); // L: 5885 + AttackOption.field1339 = var3.readUnsignedByte(); // L: 5886 + class2.field15 = var3.readUnsignedShort(); // L: 5887 + Players.field1363 = var3.readUnsignedByte(); // L: 5888 + class0.field6 = var3.readUnsignedByte(); // L: 5889 + if (class0.field6 >= 100) { // L: 5890 + var17 = ModeWhere.field3368 * 128 + 64; // L: 5891 + var5 = AttackOption.field1339 * 128 + 64; // L: 5892 + var6 = UserComparator7.getTileHeight(var17, var5, class26.Client_plane) - class2.field15; // L: 5893 + var23 = var17 - ModeWhere.cameraX; // L: 5894 + var25 = var6 - WorldMapRectangle.cameraY; // L: 5895 + var26 = var5 - ReflectionCheck.cameraZ; // L: 5896 + var28 = (int)Math.sqrt((double)(var26 * var26 + var23 * var23)); // L: 5897 + WorldMapArea.cameraPitch = (int)(Math.atan2((double)var25, (double)var28) * 325.949D) & 2047; // L: 5898 + class69.cameraYaw = (int)(Math.atan2((double)var23, (double)var26) * -325.949D) & 2047; // L: 5899 + if (WorldMapArea.cameraPitch < 128) { // L: 5900 + WorldMapArea.cameraPitch = 128; + } + + if (WorldMapArea.cameraPitch > 383) { // L: 5901 + WorldMapArea.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 5903 + return true; // L: 5904 + } + + if (ServerPacket.field2358 == var1.serverPacket) { // L: 5906 + minimapState = var3.readUnsignedByte(); // L: 5907 + var1.serverPacket = null; // L: 5908 + return true; // L: 5909 + } + + if (ServerPacket.field2392 == var1.serverPacket) { // L: 5911 + var17 = var3.method6629(); // L: 5912 + var5 = var3.method6718(); // L: 5913 + var19 = class139.getWidget(var17); // L: 5914 + if (var5 != var19.sequenceId || var5 == -1) { // L: 5915 + var19.sequenceId = var5; // L: 5916 + var19.modelFrame = 0; // L: 5917 + var19.modelFrameCycle = 0; // L: 5918 + class29.invalidateWidget(var19); // L: 5919 + } + + var1.serverPacket = null; // L: 5921 + return true; // L: 5922 + } + + if (ServerPacket.field2424 == var1.serverPacket) { // L: 5924 + var73 = var3.readUnsignedByte() == 1; // L: 5925 + if (var73) { // L: 5926 + HealthBarUpdate.field1272 = ObjectSound.currentTimeMillis() - var3.readLong(); // L: 5927 + Calendar.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 5928 + } else { + Calendar.grandExchangeEvents = null; // L: 5930 + } + + field802 = cycleCntr; // L: 5931 + var1.serverPacket = null; // L: 5932 + return true; // L: 5933 + } + + if (ServerPacket.field2404 == var1.serverPacket) { // L: 5935 + MusicPatchPcmStream.method4148(class203.field2328); // L: 5936 + var1.serverPacket = null; // L: 5937 + return true; // L: 5938 + } + + if (ServerPacket.field2393 == var1.serverPacket) { // L: 5940 + if (InterfaceParent.clanChat != null) { // L: 5941 + InterfaceParent.clanChat.method5653(var3); // L: 5942 + } + + class159.method3121(); // L: 5944 + var1.serverPacket = null; // L: 5945 + return true; // L: 5946 + } + + if (ServerPacket.field2390 == var1.serverPacket) { // L: 5948 + var17 = var3.method6617(); // L: 5949 + if (var17 == 65535) { // L: 5950 + var17 = -1; + } + + var5 = var3.method6628(); // L: 5951 + var6 = var3.method6748(); // L: 5952 + if (var6 == 65535) { // L: 5953 + var6 = -1; + } + + var23 = var3.readInt(); // L: 5954 + + for (var25 = var17; var25 <= var6; ++var25) { // L: 5955 + var31 = ((long)var5 << 32) + (long)var25; // L: 5956 + Node var77 = widgetFlags.get(var31); // L: 5957 + if (var77 != null) { // L: 5958 + var77.remove(); + } + + widgetFlags.put(new IntegerNode(var23), var31); // L: 5959 + } + + var1.serverPacket = null; // L: 5961 + return true; // L: 5962 + } + + if (ServerPacket.field2418 == var1.serverPacket) { // L: 5964 + Players.loadRegions(true, var1.packetBuffer); // L: 5965 + var1.serverPacket = null; // L: 5966 + return true; // L: 5967 + } + + if (ServerPacket.field2413 == var1.serverPacket) { // L: 5969 + var17 = var3.method6628(); // L: 5970 + var5 = var3.readUnsignedShort(); // L: 5971 + var6 = var3.readUnsignedShort(); // L: 5972 + var24 = class139.getWidget(var17); // L: 5973 + var24.field2680 = var5 + (var6 << 16); // L: 5974 + var1.serverPacket = null; // L: 5975 + return true; // L: 5976 + } + + if (ServerPacket.field2366 == var1.serverPacket) { // L: 5978 + var45 = var3.readStringCp1252NullTerminated(); // L: 5979 + var5 = var3.method6627(); // L: 5980 + var19 = class139.getWidget(var5); // L: 5981 + if (!var45.equals(var19.text)) { // L: 5982 + var19.text = var45; // L: 5983 + class29.invalidateWidget(var19); // L: 5984 + } + + var1.serverPacket = null; // L: 5986 + return true; // L: 5987 + } + + if (ServerPacket.field2427 == var1.serverPacket) { // L: 5989 + MusicPatchPcmStream.method4148(class203.field2332); // L: 5990 + var1.serverPacket = null; // L: 5991 + return true; // L: 5992 + } + + if (ServerPacket.field2446 == var1.serverPacket) { // L: 5994 + var17 = var3.method6748(); // L: 5995 + if (var17 == 65535) { // L: 5996 + var17 = -1; + } + + class4.playSong(var17); // L: 5997 + var1.serverPacket = null; // L: 5998 + return true; // L: 5999 + } + + if (ServerPacket.field2428 == var1.serverPacket) { // L: 6001 + var17 = var3.method6642(); // L: 6002 + var5 = var3.method6766(); // L: 6003 + if (var5 == 65535) { // L: 6004 + var5 = -1; + } + + HealthBarUpdate.method2175(var5, var17); // L: 6005 var1.serverPacket = null; // L: 6006 return true; // L: 6007 } - if (ServerPacket.field2214 == var1.serverPacket) { // L: 6009 - ClientPacket.method3811(var3.readStringCp1252NullTerminated()); // L: 6010 + if (ServerPacket.field2437 == var1.serverPacket) { // L: 6009 + UserComparator4.updateNpcs(true, var3, true); // L: 6010 var1.serverPacket = null; // L: 6011 return true; // L: 6012 } - if (ServerPacket.field2183 == var1.serverPacket) { // L: 6014 - PacketWriter.method2429(class194.field2346); // L: 6015 + if (ServerPacket.field2386 == var1.serverPacket) { // L: 6014 + MusicPatchPcmStream.method4148(class203.field2330); // L: 6015 var1.serverPacket = null; // L: 6016 return true; // L: 6017 } - if (ServerPacket.field2160 == var1.serverPacket) { // L: 6019 - InterfaceParent.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6020 - field857 = cycleCntr; // L: 6021 - var1.serverPacket = null; // L: 6022 - return true; // L: 6023 + if (ServerPacket.field2372 == var1.serverPacket) { // L: 6019 + MusicPatchPcmStream.method4148(class203.field2329); // L: 6020 + var1.serverPacket = null; // L: 6021 + return true; // L: 6022 } - int var7; - int var8; - int var9; - int var10; - if (ServerPacket.field2205 == var1.serverPacket) { // L: 6025 - isCameraLocked = true; // L: 6026 - class25.field138 = var3.readUnsignedByte(); // L: 6027 - GrandExchangeOfferUnitPriceComparator.field102 = var3.readUnsignedByte(); // L: 6028 - Skeleton.field1809 = var3.readUnsignedShort(); // L: 6029 - WorldMapEvent.field380 = var3.readUnsignedByte(); // L: 6030 - JagexCache.field2070 = var3.readUnsignedByte(); // L: 6031 - if (JagexCache.field2070 >= 100) { // L: 6032 - var16 = class25.field138 * 128 + 64; // L: 6033 - var5 = GrandExchangeOfferUnitPriceComparator.field102 * 128 + 64; // L: 6034 - var6 = WorldMapRegion.getTileHeight(var16, var5, class90.Client_plane) - Skeleton.field1809; // L: 6035 - var7 = var16 - SecureRandomFuture.cameraX; // L: 6036 - var8 = var6 - ArchiveLoader.cameraY; // L: 6037 - var9 = var5 - ObjectSound.cameraZ; // L: 6038 - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 6039 - KeyHandler.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; // L: 6040 - class39.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 6041 - if (KeyHandler.cameraPitch < 128) { // L: 6042 - KeyHandler.cameraPitch = 128; - } + if (ServerPacket.field2356 == var1.serverPacket) { // L: 6024 + MusicPatchPcmStream.method4148(class203.field2339); // L: 6025 + var1.serverPacket = null; // L: 6026 + return true; // L: 6027 + } - if (KeyHandler.cameraPitch > 383) { // L: 6043 - KeyHandler.cameraPitch = 383; - } + if (ServerPacket.field2423 == var1.serverPacket) { // L: 6029 + var17 = var3.method6629(); // L: 6030 + var5 = var3.method6629(); // L: 6031 + InterfaceParent var67 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6032 + var69 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6033 + if (var69 != null) { // L: 6034 + WorldMapData_1.closeInterface(var69, var67 == null || var67.group != var69.group); } - var1.serverPacket = null; // L: 6045 - return true; // L: 6046 - } - - if (ServerPacket.field2206 == var1.serverPacket) { // L: 6048 - var16 = var3.readUnsignedShort(); // L: 6049 - var5 = var3.readUnsignedByte(); // L: 6050 - var6 = var3.readUnsignedShort(); // L: 6051 - class58.queueSoundEffect(var16, var5, var6); // L: 6052 - var1.serverPacket = null; // L: 6053 - return true; // L: 6054 - } - - Widget var17; - if (ServerPacket.field2170 == var1.serverPacket) { // L: 6056 - var16 = var3.method5729(); // L: 6057 - if (var16 == 65535) { // L: 6058 - var16 = -1; + if (var67 != null) { // L: 6035 + var67.remove(); // L: 6036 + interfaceParents.put(var67, (long)var17); // L: 6037 } - var5 = var3.method5895(); // L: 6059 - var6 = var3.readInt(); // L: 6060 - var17 = class237.getWidget(var6); // L: 6061 - ItemComposition var48; - if (!var17.isIf3) { // L: 6062 - if (var16 == -1) { // L: 6063 - var17.modelType = 0; // L: 6064 - var1.serverPacket = null; // L: 6065 - return true; // L: 6066 - } + var50 = class139.getWidget(var5); // L: 6039 + if (var50 != null) { // L: 6040 + class29.invalidateWidget(var50); + } - var48 = class281.ItemDefinition_get(var16); // L: 6068 - var17.modelType = 4; // L: 6069 - var17.modelId = var16; // L: 6070 - var17.modelAngleX = var48.xan2d; // L: 6071 - var17.modelAngleY = var48.yan2d; // L: 6072 - var17.modelZoom = var48.zoom2d * 100 / var5; // L: 6073 - IsaacCipher.invalidateWidget(var17); // L: 6074 + var50 = class139.getWidget(var17); // L: 6041 + if (var50 != null) { // L: 6042 + class29.invalidateWidget(var50); // L: 6043 + UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var50.id >>> 16], var50, true); // L: 6044 + } + + if (rootInterface != -1) { // L: 6046 + class379.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6047 + return true; // L: 6048 + } + + if (ServerPacket.field2429 == var1.serverPacket) { // L: 6050 + UserComparator4.updateNpcs(false, var3, true); // L: 6051 + var1.serverPacket = null; // L: 6052 + return true; // L: 6053 + } + + if (ServerPacket.field2367 == var1.serverPacket) { // L: 6055 + class23.logOut(); // L: 6056 + var1.serverPacket = null; // L: 6057 + return false; // L: 6058 + } + + int var15; + String var42; + if (ServerPacket.field2438 == var1.serverPacket) { // L: 6060 + var56 = var3.readByte(); // L: 6061 + var18 = var3.readStringCp1252NullTerminated(); // L: 6062 + long var35 = (long)var3.readUnsignedShort(); // L: 6063 + long var37 = (long)var3.readMedium(); // L: 6064 + PlayerType var74 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var3.readUnsignedByte()); // L: 6065 + long var39 = var37 + (var35 << 32); // L: 6066 + boolean var13 = false; // L: 6067 + class3 var41 = null; // L: 6068 + var41 = var56 >= 0 ? field820[var56] : IsaacCipher.field4266; // L: 6070 + if (var41 == null) { // L: 6071 + var13 = true; // L: 6072 } else { - var17.itemId = var16; // L: 6077 - var17.itemQuantity = var5; // L: 6078 - var48 = class281.ItemDefinition_get(var16); // L: 6079 - var17.modelAngleX = var48.xan2d; // L: 6080 - var17.modelAngleY = var48.yan2d; // L: 6081 - var17.modelAngleZ = var48.zan2d; // L: 6082 - var17.modelOffsetX = var48.offsetX2d; // L: 6083 - var17.modelOffsetY = var48.offsetY2d; // L: 6084 - var17.modelZoom = var48.zoom2d; // L: 6085 - if (var48.isStackable == 1) { // L: 6086 - var17.itemQuantityMode = 1; + var15 = 0; + + while (true) { + if (var15 >= 100) { + if (var74.isUser && class13.friendSystem.isIgnored(new Username(var18, AbstractUserComparator.loginType))) { // L: 6081 6082 + var13 = true; + } + break; + } + + if (var39 == field689[var15]) { // L: 6076 + var13 = true; // L: 6077 + break; // L: 6078 + } + + ++var15; // L: 6075 + } + } + + if (!var13) { // L: 6085 + field689[field760] = var39; // L: 6086 + field760 = (field760 + 1) % 100; // L: 6087 + var42 = AbstractFont.escapeBrackets(class16.method258(var3)); // L: 6088 + int var16 = var56 >= 0 ? 41 : 44; // L: 6089 + if (var74.modIcon != -1) { // L: 6090 + Projectile.addChatMessage(var16, class337.method5986(var74.modIcon) + var18, var42, var41.field25); } else { - var17.itemQuantityMode = 2; // L: 6087 - } - - if (var17.field2648 > 0) { // L: 6088 - var17.modelZoom = var17.modelZoom * 32 / var17.field2648; - } else if (var17.rawWidth > 0) { // L: 6089 - var17.modelZoom = var17.modelZoom * 32 / var17.rawWidth; - } - - IsaacCipher.invalidateWidget(var17); // L: 6090 - } - - var1.serverPacket = null; // L: 6092 - return true; // L: 6093 - } - - Widget var19; - boolean var44; - if (ServerPacket.field2153 == var1.serverPacket) { // L: 6095 - var44 = var3.method5720() == 1; // L: 6096 - var5 = var3.readInt(); // L: 6097 - var19 = class237.getWidget(var5); // L: 6098 - if (var44 != var19.isHidden) { // L: 6099 - var19.isHidden = var44; // L: 6100 - IsaacCipher.invalidateWidget(var19); // L: 6101 - } - - var1.serverPacket = null; // L: 6103 - return true; // L: 6104 - } - - Widget var18; - if (ServerPacket.field2149 == var1.serverPacket) { // L: 6106 - var16 = var3.method5728(); // L: 6107 - var5 = var3.method5727(); // L: 6108 - var6 = var3.method5727(); // L: 6109 - var7 = var3.method5895(); // L: 6110 - var18 = class237.getWidget(var7); // L: 6111 - if (var5 != var18.modelAngleX || var6 != var18.modelAngleY || var16 != var18.modelZoom) { // L: 6112 - var18.modelAngleX = var5; // L: 6113 - var18.modelAngleY = var6; // L: 6114 - var18.modelZoom = var16; // L: 6115 - IsaacCipher.invalidateWidget(var18); // L: 6116 - } - - var1.serverPacket = null; // L: 6118 - return true; // L: 6119 - } - - if (ServerPacket.field2158 == var1.serverPacket) { // L: 6121 - PacketWriter.method2429(class194.field2351); // L: 6122 - var1.serverPacket = null; // L: 6123 - return true; // L: 6124 - } - - if (ServerPacket.field2210 == var1.serverPacket) { // L: 6126 - var16 = var3.readShort(); // L: 6127 - var5 = var3.method5730(); // L: 6128 - var6 = var3.readInt(); // L: 6129 - var17 = class237.getWidget(var6); // L: 6130 - if (var5 != var17.rawX || var16 != var17.rawY || var17.xAlignment != 0 || var17.yAlignment != 0) { // L: 6131 - var17.rawX = var5; // L: 6132 - var17.rawY = var16; // L: 6133 - var17.xAlignment = 0; // L: 6134 - var17.yAlignment = 0; // L: 6135 - IsaacCipher.invalidateWidget(var17); // L: 6136 - this.alignWidget(var17); // L: 6137 - if (var17.type == 0) { // L: 6138 - class182.revalidateWidgetScroll(DefaultsGroup.Widget_interfaceComponents[var6 >> 16], var17, false); + Projectile.addChatMessage(var16, var18, var42, var41.field25); // L: 6091 } } - var1.serverPacket = null; // L: 6140 - return true; // L: 6141 + var1.serverPacket = null; // L: 6093 + return true; // L: 6094 } - InterfaceParent var45; - if (ServerPacket.field2175 == var1.serverPacket) { // L: 6143 - var16 = var3.readUnsignedShort(); // L: 6144 - var5 = var3.method5739(); // L: 6145 - var6 = var3.readUnsignedByte(); // L: 6146 - var45 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6147 - if (var45 != null) { // L: 6148 - GrandExchangeOffer.closeInterface(var45, var16 != var45.group); - } - - class219.method4172(var5, var16, var6); // L: 6149 - var1.serverPacket = null; // L: 6150 - return true; // L: 6151 + if (ServerPacket.field2414 == var1.serverPacket) { // L: 6096 + class18.field145 = var3.method6610(); // L: 6097 + ClanChat.field3818 = var3.method6623(); // L: 6098 + var1.serverPacket = null; // L: 6099 + return true; // L: 6100 } - if (ServerPacket.field2221 == var1.serverPacket) { // L: 6153 - class105.loadRegions(true, var1.packetBuffer); // L: 6154 - var1.serverPacket = null; // L: 6155 - return true; // L: 6156 + if (ServerPacket.field2374 == var1.serverPacket) { // L: 6102 + var17 = var3.readUnsignedByte(); // L: 6103 + ItemContainer.forceDisconnect(var17); // L: 6104 + var1.serverPacket = null; // L: 6105 + return false; // L: 6106 } - String var37; - if (ServerPacket.field2181 == var1.serverPacket) { // L: 6158 - var37 = var3.readStringCp1252NullTerminated(); // L: 6159 - var20 = AbstractFont.escapeBrackets(UrlRequester.method3467(JagexCache.method3683(var3))); // L: 6160 - AbstractWorldMapData.addGameMessage(6, var37, var20); // L: 6161 - var1.serverPacket = null; // L: 6162 - return true; // L: 6163 + if (ServerPacket.field2431 == var1.serverPacket) { // L: 6108 + UserComparator4.updateNpcs(true, var3, false); // L: 6109 + var1.serverPacket = null; // L: 6110 + return true; // L: 6111 } - String var54; - if (ServerPacket.field2171 == var1.serverPacket) { // L: 6165 - var16 = var3.readUShortSmart(); // L: 6166 - boolean var43 = var3.readUnsignedByte() == 1; // L: 6167 - var54 = ""; // L: 6168 - boolean var41 = false; // L: 6169 - if (var43) { // L: 6170 - var54 = var3.readStringCp1252NullTerminated(); // L: 6171 - if (InterfaceParent.friendSystem.isIgnored(new Username(var54, Message.loginType))) { // L: 6172 - var41 = true; + if (ServerPacket.field2379 == var1.serverPacket) { // L: 6113 + var17 = var3.readInt(); // L: 6114 + var5 = var3.method6617(); // L: 6115 + var19 = class139.getWidget(var17); // L: 6116 + if (var19 != null && var19.type == 0) { // L: 6117 + if (var5 > var19.scrollHeight - var19.height) { // L: 6118 + var5 = var19.scrollHeight - var19.height; + } + + if (var5 < 0) { // L: 6119 + var5 = 0; + } + + if (var5 != var19.scrollY) { // L: 6120 + var19.scrollY = var5; // L: 6121 + class29.invalidateWidget(var19); // L: 6122 } } - String var47 = var3.readStringCp1252NullTerminated(); // L: 6174 - if (!var41) { // L: 6175 - AbstractWorldMapData.addGameMessage(var16, var54, var47); + var1.serverPacket = null; // L: 6125 + return true; // L: 6126 + } + + if (ServerPacket.field2391 == var1.serverPacket) { // L: 6128 + var17 = var3.readUnsignedByte(); // L: 6129 + var5 = var3.readUnsignedByte(); // L: 6130 + var6 = var3.readUnsignedByte(); // L: 6131 + var23 = var3.readUnsignedByte(); // L: 6132 + field850[var17] = true; // L: 6133 + field601[var17] = var5; // L: 6134 + field698[var17] = var6; // L: 6135 + field853[var17] = var23; // L: 6136 + field854[var17] = 0; // L: 6137 + var1.serverPacket = null; // L: 6138 + return true; // L: 6139 + } + + if (ServerPacket.field2417 == var1.serverPacket) { // L: 6141 + isCameraLocked = true; // L: 6142 + class5.field40 = var3.readUnsignedByte(); // L: 6143 + ApproximateRouteStrategy.field592 = var3.readUnsignedByte(); // L: 6144 + WorldMapLabelSize.field1569 = var3.readUnsignedShort(); // L: 6145 + Skeleton.field1927 = var3.readUnsignedByte(); // L: 6146 + UserComparator9.field1435 = var3.readUnsignedByte(); // L: 6147 + if (UserComparator9.field1435 >= 100) { // L: 6148 + ModeWhere.cameraX = class5.field40 * 128 + 64; // L: 6149 + ReflectionCheck.cameraZ = ApproximateRouteStrategy.field592 * 128 + 64; // L: 6150 + WorldMapRectangle.cameraY = UserComparator7.getTileHeight(ModeWhere.cameraX, ReflectionCheck.cameraZ, class26.Client_plane) - WorldMapLabelSize.field1569; // L: 6151 } - var1.serverPacket = null; // L: 6176 - return true; // L: 6177 + var1.serverPacket = null; // L: 6153 + return true; // L: 6154 } - if (ServerPacket.field2196 == var1.serverPacket) { // L: 6179 - World var40 = new World(); // L: 6180 - var40.host = var3.readStringCp1252NullTerminated(); // L: 6181 - var40.id = var3.readUnsignedShort(); // L: 6182 - var5 = var3.readInt(); // L: 6183 - var40.properties = var5; // L: 6184 - ItemContainer.updateGameState(45); // L: 6185 - var2.close(); // L: 6186 - var2 = null; // L: 6187 - ChatChannel.changeWorld(var40); // L: 6188 - var1.serverPacket = null; // L: 6189 - return false; // L: 6190 - } + if (ServerPacket.field2400 == var1.serverPacket) { // L: 6156 + class105.method2255(); // L: 6157 + var17 = var3.method6609(); // L: 6158 + var5 = var3.method6628(); // L: 6159 + var6 = var3.method6623(); // L: 6160 + experience[var6] = var5; // L: 6161 + currentLevels[var6] = var17; // L: 6162 + levels[var6] = 1; // L: 6163 - if (ServerPacket.field2198 == var1.serverPacket) { // L: 6192 - var16 = var3.readUnsignedByte(); // L: 6193 - var5 = var3.readUnsignedByte(); // L: 6194 - var6 = var3.readUnsignedByte(); // L: 6195 - var7 = var3.readUnsignedByte(); // L: 6196 - field907[var16] = true; // L: 6197 - field908[var16] = var5; // L: 6198 - field909[var16] = var6; // L: 6199 - field799[var16] = var7; // L: 6200 - field911[var16] = 0; // L: 6201 - var1.serverPacket = null; // L: 6202 - return true; // L: 6203 - } - - if (ServerPacket.field2144 == var1.serverPacket) { // L: 6205 - for (var16 = 0; var16 < class58.VarpDefinition_fileCount; ++var16) { // L: 6206 - VarpDefinition var58 = class204.VarpDefinition_get(var16); // L: 6207 - if (var58 != null) { // L: 6208 - Varps.Varps_temp[var16] = 0; // L: 6209 - Varps.Varps_main[var16] = 0; // L: 6210 + for (var23 = 0; var23 < 98; ++var23) { // L: 6164 + if (var5 >= Skills.Skills_experienceTable[var23]) { + levels[var6] = var23 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var6; // L: 6165 + var1.serverPacket = null; // L: 6166 + return true; // L: 6167 + } + + if (ServerPacket.field2443 == var1.serverPacket) { // L: 6169 + field786 = cycleCntr; // L: 6170 + var56 = var3.readByte(); // L: 6171 + if (var1.serverPacketLength == 1) { // L: 6172 + if (var56 >= 0) { // L: 6173 + field831[var56] = null; + } else { + ObjectSound.field928 = null; // L: 6174 + } + + var1.serverPacket = null; // L: 6175 + return true; // L: 6176 + } + + if (var56 >= 0) { // L: 6178 + field831[var56] = new class11(var3); // L: 6179 + } else { + ObjectSound.field928 = new class11(var3); // L: 6182 + } + + var1.serverPacket = null; // L: 6184 + return true; // L: 6185 + } + + if (ServerPacket.field2375 == var1.serverPacket) { // L: 6187 + var17 = var3.method6766(); // L: 6188 + var5 = var3.method6627(); // L: 6189 + Varps.Varps_temp[var17] = var5; // L: 6190 + if (Varps.Varps_main[var17] != var5) { // L: 6191 + Varps.Varps_main[var17] = var5; // L: 6192 + } + + class27.changeGameOptions(var17); // L: 6194 + changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6195 + var1.serverPacket = null; // L: 6196 + return true; // L: 6197 + } + + if (ServerPacket.field2407 == var1.serverPacket) { // L: 6199 + class18.field145 = var3.method6609(); // L: 6200 + ClanChat.field3818 = var3.method6610(); // L: 6201 + + for (var17 = class18.field145; var17 < class18.field145 + 8; ++var17) { // L: 6202 + for (var5 = ClanChat.field3818; var5 < ClanChat.field3818 + 8; ++var5) { // L: 6203 + if (groundItems[class26.Client_plane][var17][var5] != null) { // L: 6204 + groundItems[class26.Client_plane][var17][var5] = null; // L: 6205 + class225.updateItemPile(var17, var5); // L: 6206 + } + } + } + + for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { // L: 6210 6211 6213 + if (var47.x >= class18.field145 && var47.x < class18.field145 + 8 && var47.y >= ClanChat.field3818 && var47.y < ClanChat.field3818 + 8 && var47.plane == class26.Client_plane) { // L: 6212 + var47.hitpoints = 0; } } - class219.method4171(); // L: 6213 - changedVarpCount += 32; // L: 6214 var1.serverPacket = null; // L: 6215 return true; // L: 6216 } - if (ServerPacket.field2224 == var1.serverPacket) { // L: 6218 - PacketWriter.method2429(class194.field2355); // L: 6219 - var1.serverPacket = null; // L: 6220 - return true; // L: 6221 - } - - if (ServerPacket.field2180 == var1.serverPacket) { // L: 6223 - GrandExchangeEvent.field82 = var3.readUnsignedByte(); // L: 6224 - GrandExchangeOfferUnitPriceComparator.field103 = var3.method5717(); // L: 6225 - var1.serverPacket = null; // L: 6226 - return true; // L: 6227 - } - - if (ServerPacket.field2219 == var1.serverPacket) { // L: 6229 - destinationX = var3.readUnsignedByte(); // L: 6230 - if (destinationX == 255) { // L: 6231 - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); // L: 6232 - if (destinationY == 255) { // L: 6233 - destinationY = 0; - } - - var1.serverPacket = null; // L: 6234 - return true; // L: 6235 - } - - if (ServerPacket.field2141 == var1.serverPacket) { // L: 6237 - var16 = var3.method5895(); // L: 6238 - var5 = var3.method5729(); // L: 6239 - var6 = var5 >> 10 & 31; // L: 6240 - var7 = var5 >> 5 & 31; // L: 6241 - var8 = var5 & 31; // L: 6242 - var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 6243 - Widget var56 = class237.getWidget(var16); // L: 6244 - if (var9 != var56.color) { // L: 6245 - var56.color = var9; // L: 6246 - IsaacCipher.invalidateWidget(var56); // L: 6247 - } - - var1.serverPacket = null; // L: 6249 - return true; // L: 6250 - } - - long var12; - if (ServerPacket.field2195 == var1.serverPacket) { // L: 6252 - var16 = var3.offset + var1.serverPacketLength; // L: 6253 - var5 = var3.readUnsignedShort(); // L: 6254 - var6 = var3.readUnsignedShort(); // L: 6255 - if (var5 != rootInterface) { // L: 6256 - rootInterface = var5; // L: 6257 - this.resizeRoot(false); // L: 6258 - GrandExchangeEvent.Widget_resetModelFrames(rootInterface); // L: 6259 - SoundSystem.runWidgetOnLoadListener(rootInterface); // L: 6260 - - for (var7 = 0; var7 < 100; ++var7) { // L: 6261 - field816[var7] = true; - } - } - - InterfaceParent var21; - for (; var6-- > 0; var21.field575 = true) { // L: 6263 6273 - var7 = var3.readInt(); // L: 6264 - var8 = var3.readUnsignedShort(); // L: 6265 - var9 = var3.readUnsignedByte(); // L: 6266 - var21 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6267 - if (var21 != null && var8 != var21.group) { // L: 6268 - GrandExchangeOffer.closeInterface(var21, true); // L: 6269 - var21 = null; // L: 6270 - } - - if (var21 == null) { // L: 6272 - var21 = class219.method4172(var7, var8, var9); - } - } - - for (var45 = (InterfaceParent)interfaceParents.first(); var45 != null; var45 = (InterfaceParent)interfaceParents.next()) { // L: 6275 - if (var45.field575) { // L: 6276 - var45.field575 = false; - } else { - GrandExchangeOffer.closeInterface(var45, true); // L: 6278 - } - } - - widgetFlags = new NodeHashTable(512); // L: 6281 - - while (var3.offset < var16) { // L: 6282 - var7 = var3.readInt(); // L: 6283 - var8 = var3.readUnsignedShort(); // L: 6284 - var9 = var3.readUnsignedShort(); // L: 6285 - var10 = var3.readInt(); // L: 6286 - - for (int var11 = var8; var11 <= var9; ++var11) { // L: 6287 - var12 = (long)var11 + ((long)var7 << 32); // L: 6288 - widgetFlags.put(new IntegerNode(var10), var12); // L: 6289 - } - } - - var1.serverPacket = null; // L: 6292 - return true; // L: 6293 - } - - if (ServerPacket.field2179 == var1.serverPacket) { // L: 6295 - GrandExchangeEvent.field82 = var3.method5776(); // L: 6296 - GrandExchangeOfferUnitPriceComparator.field103 = var3.readUnsignedByte(); // L: 6297 - - while (var3.offset < var1.serverPacketLength) { // L: 6298 - var16 = var3.readUnsignedByte(); // L: 6299 - class194 var57 = class7.method85()[var16]; // L: 6300 - PacketWriter.method2429(var57); // L: 6301 - } - - var1.serverPacket = null; // L: 6303 - return true; // L: 6304 - } - - if (ServerPacket.field2217 == var1.serverPacket) { // L: 6306 - var16 = var3.readInt(); // L: 6307 - InterfaceParent var55 = (InterfaceParent)interfaceParents.get((long)var16); // L: 6308 - if (var55 != null) { // L: 6309 - GrandExchangeOffer.closeInterface(var55, true); - } - - if (meslayerContinueWidget != null) { // L: 6310 - IsaacCipher.invalidateWidget(meslayerContinueWidget); // L: 6311 - meslayerContinueWidget = null; // L: 6312 - } - - var1.serverPacket = null; // L: 6314 - return true; // L: 6315 - } - - if (ServerPacket.field2201 == var1.serverPacket) { // L: 6317 - var16 = var3.readUnsignedByte(); // L: 6318 - WorldMapSprite.method496(var16); // L: 6319 - var1.serverPacket = null; // L: 6320 - return true; // L: 6321 - } - - if (ServerPacket.field2211 == var1.serverPacket) { // L: 6323 - SecureRandomCallable.logOut(); // L: 6324 - var1.serverPacket = null; // L: 6325 - return false; // L: 6326 - } - - if (ServerPacket.field2223 == var1.serverPacket) { // L: 6328 - minimapState = var3.readUnsignedByte(); // L: 6329 - var1.serverPacket = null; // L: 6330 - return true; // L: 6331 - } - - if (ServerPacket.field2151 == var1.serverPacket) { // L: 6333 - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { // L: 6334 - if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { // L: 6335 - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; // L: 6336 - AbstractWorldMapIcon.changeGameOptions(var16); // L: 6337 - changedVarps[++changedVarpCount - 1 & 31] = var16; // L: 6338 - } - } - - var1.serverPacket = null; // L: 6341 - return true; // L: 6342 - } - - if (ServerPacket.field2182 == var1.serverPacket) { // L: 6344 - GrandExchangeEvent.field82 = var3.method5717(); // L: 6345 - GrandExchangeOfferUnitPriceComparator.field103 = var3.method5720(); // L: 6346 - - for (var16 = GrandExchangeEvent.field82; var16 < GrandExchangeEvent.field82 + 8; ++var16) { // L: 6347 - for (var5 = GrandExchangeOfferUnitPriceComparator.field103; var5 < GrandExchangeOfferUnitPriceComparator.field103 + 8; ++var5) { // L: 6348 - if (groundItems[class90.Client_plane][var16][var5] != null) { // L: 6349 - groundItems[class90.Client_plane][var16][var5] = null; // L: 6350 - HitSplatDefinition.updateItemPile(var16, var5); // L: 6351 - } - } - } - - for (PendingSpawn var39 = (PendingSpawn)pendingSpawns.last(); var39 != null; var39 = (PendingSpawn)pendingSpawns.previous()) { // L: 6355 6356 6358 - if (var39.x >= GrandExchangeEvent.field82 && var39.x < GrandExchangeEvent.field82 + 8 && var39.y >= GrandExchangeOfferUnitPriceComparator.field103 && var39.y < GrandExchangeOfferUnitPriceComparator.field103 + 8 && var39.plane == class90.Client_plane) { // L: 6357 - var39.hitpoints = 0; - } - } - - var1.serverPacket = null; // L: 6360 - return true; // L: 6361 - } - - if (ServerPacket.field2178 == var1.serverPacket) { // L: 6363 - if (rootInterface != -1) { // L: 6364 - class228.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; // L: 6365 - return true; // L: 6366 - } - - if (ServerPacket.field2176 == var1.serverPacket) { // L: 6368 - var16 = var3.readInt(); // L: 6369 - var5 = var3.readUnsignedShort(); // L: 6370 - if (var16 < -70000) { // L: 6371 + if (ServerPacket.field2368 == var1.serverPacket) { // L: 6218 + var17 = var3.readInt(); // L: 6219 + var5 = var3.readUnsignedShort(); // L: 6220 + if (var17 < -70000) { // L: 6221 var5 += 32768; } - if (var16 >= 0) { // L: 6373 - var19 = class237.getWidget(var16); + if (var17 >= 0) { // L: 6223 + var19 = class139.getWidget(var17); } else { - var19 = null; // L: 6374 + var19 = null; // L: 6224 } - for (; var3.offset < var1.serverPacketLength; WorldMapLabel.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6375 6389 - var7 = var3.readUShortSmart(); // L: 6376 - var8 = var3.readUnsignedShort(); // L: 6377 - var9 = 0; // L: 6378 - if (var8 != 0) { // L: 6379 - var9 = var3.readUnsignedByte(); // L: 6380 - if (var9 == 255) { // L: 6381 - var9 = var3.readInt(); + for (; var3.offset < var1.serverPacketLength; SecureRandomFuture.itemContainerSetItem(var5, var23, var25 - 1, var26)) { // L: 6225 6239 + var23 = var3.readUShortSmart(); // L: 6226 + var25 = var3.readUnsignedShort(); // L: 6227 + var26 = 0; // L: 6228 + if (var25 != 0) { // L: 6229 + var26 = var3.readUnsignedByte(); // L: 6230 + if (var26 == 255) { // L: 6231 + var26 = var3.readInt(); } } - if (var19 != null && var7 >= 0 && var7 < var19.itemIds.length) { // L: 6383 6384 - var19.itemIds[var7] = var8; // L: 6385 - var19.itemQuantities[var7] = var9; // L: 6386 + if (var19 != null && var23 >= 0 && var23 < var19.itemIds.length) { // L: 6233 6234 + var19.itemIds[var23] = var25; // L: 6235 + var19.itemQuantities[var23] = var26; // L: 6236 } } - if (var19 != null) { // L: 6391 - IsaacCipher.invalidateWidget(var19); + if (var19 != null) { // L: 6241 + class29.invalidateWidget(var19); } - class219.method4171(); // L: 6392 - changedItemContainers[++field870 - 1 & 31] = var5 & 32767; // L: 6393 + class105.method2255(); // L: 6242 + changedItemContainers[++field791 - 1 & 31] = var5 & 32767; // L: 6243 + var1.serverPacket = null; // L: 6244 + return true; // L: 6245 + } + + if (ServerPacket.field2433 == var1.serverPacket) { // L: 6247 + var17 = var3.readInt(); // L: 6248 + if (var17 != field684) { // L: 6249 + field684 = var17; // L: 6250 + class9.method119(); // L: 6251 + } + + var1.serverPacket = null; // L: 6253 + return true; // L: 6254 + } + + if (ServerPacket.field2359 == var1.serverPacket) { // L: 6256 + publicChatMode = var3.method6623(); // L: 6257 + tradeChatMode = var3.readUnsignedByte(); // L: 6258 + var1.serverPacket = null; // L: 6259 + return true; // L: 6260 + } + + if (ServerPacket.field2403 == var1.serverPacket) { // L: 6262 + var17 = var3.readInt(); // L: 6263 + var5 = var3.readUnsignedShort(); // L: 6264 + if (var5 == 65535) { // L: 6265 + var5 = -1; + } + + var6 = var3.method6629(); // L: 6266 + var24 = class139.getWidget(var17); // L: 6267 + ItemComposition var8; + if (!var24.isIf3) { // L: 6268 + if (var5 == -1) { // L: 6269 + var24.modelType = 0; // L: 6270 + var1.serverPacket = null; // L: 6271 + return true; // L: 6272 + } + + var8 = class23.ItemDefinition_get(var5); // L: 6274 + var24.modelType = 4; // L: 6275 + var24.modelId = var5; // L: 6276 + var24.modelAngleX = var8.xan2d; // L: 6277 + var24.modelAngleY = var8.yan2d; // L: 6278 + var24.modelZoom = var8.zoom2d * 100 / var6; // L: 6279 + class29.invalidateWidget(var24); // L: 6280 + } else { + var24.itemId = var5; // L: 6283 + var24.itemQuantity = var6; // L: 6284 + var8 = class23.ItemDefinition_get(var5); // L: 6285 + var24.modelAngleX = var8.xan2d; // L: 6286 + var24.modelAngleY = var8.yan2d; // L: 6287 + var24.modelAngleZ = var8.zan2d; // L: 6288 + var24.modelOffsetX = var8.offsetX2d; // L: 6289 + var24.modelOffsetY = var8.offsetY2d; // L: 6290 + var24.modelZoom = var8.zoom2d; // L: 6291 + if (var8.isStackable == 1) { // L: 6292 + var24.itemQuantityMode = 1; + } else { + var24.itemQuantityMode = 2; // L: 6293 + } + + if (var24.field2720 > 0) { // L: 6294 + var24.modelZoom = var24.modelZoom * 32 / var24.field2720; + } else if (var24.rawWidth > 0) { // L: 6295 + var24.modelZoom = var24.modelZoom * 32 / var24.rawWidth; + } + + class29.invalidateWidget(var24); // L: 6296 + } + + var1.serverPacket = null; // L: 6298 + return true; // L: 6299 + } + + if (ServerPacket.field2383 == var1.serverPacket) { // L: 6301 + var17 = var3.readUnsignedByte(); // L: 6302 + Actor.method2174(var17); // L: 6303 + var1.serverPacket = null; // L: 6304 + return true; // L: 6305 + } + + if (ServerPacket.field2444 == var1.serverPacket) { // L: 6307 + field786 = cycleCntr; // L: 6308 + var56 = var3.readByte(); // L: 6309 + class2 var59 = new class2(var3); // L: 6310 + class11 var62; + if (var56 >= 0) { // L: 6312 + var62 = field831[var56]; + } else { + var62 = ObjectSound.field928; // L: 6313 + } + + var59.method29(var62); // L: 6314 + var1.serverPacket = null; // L: 6315 + return true; // L: 6316 + } + + if (ServerPacket.field2389 == var1.serverPacket) { // L: 6318 + if (Coord.field2591 == null) { // L: 6319 + Coord.field2591 = new class338(FriendSystem.field910); + } + + class389 var46 = FriendSystem.field910.method5996(var3); // L: 6320 + Coord.field2591.field3926.vmethod6336(var46.field4215, var46.field4216); // L: 6321 + field794[++field613 - 1 & 31] = var46.field4215; // L: 6322 + var1.serverPacket = null; // L: 6323 + return true; // L: 6324 + } + + if (ServerPacket.field2410 == var1.serverPacket) { // L: 6326 + class13.friendSystem.method1720(); // L: 6327 + field797 = cycleCntr; // L: 6328 + var1.serverPacket = null; // L: 6329 + return true; // L: 6330 + } + + if (ServerPacket.field2360 == var1.serverPacket) { // L: 6332 + var17 = var3.method6748(); // L: 6333 + rootInterface = var17; // L: 6334 + this.resizeRoot(false); // L: 6335 + PlayerComposition.Widget_resetModelFrames(var17); // L: 6336 + AbstractSocket.runWidgetOnLoadListener(rootInterface); // L: 6337 + + for (var5 = 0; var5 < 100; ++var5) { // L: 6338 + field811[var5] = true; + } + + var1.serverPacket = null; // L: 6339 + return true; // L: 6340 + } + + if (ServerPacket.field2398 == var1.serverPacket) { // L: 6342 + var45 = var3.readStringCp1252NullTerminated(); // L: 6343 + var20 = var3.readLong(); // L: 6344 + var7 = (long)var3.readUnsignedShort(); // L: 6345 + var31 = (long)var3.readMedium(); // L: 6346 + PlayerType var34 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var3.readUnsignedByte()); // L: 6347 + var29 = var31 + (var7 << 32); // L: 6348 + boolean var14 = false; // L: 6349 + + for (var15 = 0; var15 < 100; ++var15) { // L: 6350 + if (var29 == field689[var15]) { // L: 6351 + var14 = true; // L: 6352 + break; // L: 6353 + } + } + + if (var34.isUser && class13.friendSystem.isIgnored(new Username(var45, AbstractUserComparator.loginType))) { // L: 6356 6357 + var14 = true; + } + + if (!var14 && field716 == 0) { // L: 6359 + field689[field760] = var29; // L: 6360 + field760 = (field760 + 1) % 100; // L: 6361 + var42 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(var3))); // L: 6362 + if (var34.modIcon != -1) { // L: 6363 + Projectile.addChatMessage(9, class337.method5986(var34.modIcon) + var45, var42, Varcs.base37DecodeLong(var20)); + } else { + Projectile.addChatMessage(9, var45, var42, Varcs.base37DecodeLong(var20)); // L: 6364 + } + } + + var1.serverPacket = null; // L: 6366 + return true; // L: 6367 + } + + if (ServerPacket.field2421 == var1.serverPacket) { // L: 6369 + if (var1.serverPacketLength == 0) { // L: 6370 + InterfaceParent.clanChat = null; // L: 6371 + } else { + if (InterfaceParent.clanChat == null) { // L: 6374 + InterfaceParent.clanChat = new ClanChat(AbstractUserComparator.loginType, class10.client); // L: 6375 + } + + InterfaceParent.clanChat.readUpdate(var3); // L: 6377 + } + + class159.method3121(); // L: 6379 + var1.serverPacket = null; // L: 6380 + return true; // L: 6381 + } + + if (ServerPacket.field2399 == var1.serverPacket) { // L: 6383 + class105.method2255(); // L: 6384 + weight = var3.readShort(); // L: 6385 + field803 = cycleCntr; // L: 6386 + var1.serverPacket = null; // L: 6387 + return true; // L: 6388 + } + + if (ServerPacket.field2350 == var1.serverPacket) { // L: 6390 + var17 = var3.method6766(); // L: 6391 + class32.method393(var17); // L: 6392 + changedItemContainers[++field791 - 1 & 31] = var17 & 32767; // L: 6393 var1.serverPacket = null; // L: 6394 return true; // L: 6395 } - if (ServerPacket.field2193 == var1.serverPacket) { // L: 6397 - class219.method4171(); // L: 6398 - runEnergy = var3.readUnsignedByte(); // L: 6399 - field861 = cycleCntr; // L: 6400 - var1.serverPacket = null; // L: 6401 - return true; // L: 6402 - } - - if (ServerPacket.field2146 == var1.serverPacket) { // L: 6404 - class182.updateNpcs(true, var3); // L: 6405 - var1.serverPacket = null; // L: 6406 - return true; // L: 6407 - } - - if (ServerPacket.field2155 == var1.serverPacket) { // L: 6409 - var16 = var3.method5895(); // L: 6410 - var5 = var3.method5731(); // L: 6411 - var19 = class237.getWidget(var16); // L: 6412 - if (var5 != var19.sequenceId || var5 == -1) { // L: 6413 - var19.sequenceId = var5; // L: 6414 - var19.modelFrame = 0; // L: 6415 - var19.modelFrameCycle = 0; // L: 6416 - IsaacCipher.invalidateWidget(var19); // L: 6417 + if (ServerPacket.field2409 == var1.serverPacket) { // L: 6397 + var17 = var3.method6766(); // L: 6398 + var5 = var3.method6628(); // L: 6399 + var6 = var17 >> 10 & 31; // L: 6400 + var23 = var17 >> 5 & 31; // L: 6401 + var25 = var17 & 31; // L: 6402 + var26 = (var23 << 11) + (var6 << 19) + (var25 << 3); // L: 6403 + Widget var27 = class139.getWidget(var5); // L: 6404 + if (var26 != var27.color) { // L: 6405 + var27.color = var26; // L: 6406 + class29.invalidateWidget(var27); // L: 6407 } + var1.serverPacket = null; // L: 6409 + return true; // L: 6410 + } + + if (ServerPacket.field2397 == var1.serverPacket) { // L: 6412 + UserComparator4.updateNpcs(false, var3, false); // L: 6413 + var1.serverPacket = null; // L: 6414 + return true; // L: 6415 + } + + if (ServerPacket.field2381 == var1.serverPacket) { // L: 6417 + Players.loadRegions(false, var1.packetBuffer); // L: 6418 var1.serverPacket = null; // L: 6419 return true; // L: 6420 } - if (ServerPacket.field2226 == var1.serverPacket) { // L: 6422 - byte[] var38 = new byte[var1.serverPacketLength]; // L: 6423 - var3.method5642(var38, 0, var38.length); // L: 6424 - Buffer var53 = new Buffer(var38); // L: 6425 - var54 = var53.readStringCp1252NullTerminated(); // L: 6426 - WorldMapRectangle.openURL(var54, true, false); // L: 6427 - var1.serverPacket = null; // L: 6428 - return true; // L: 6429 + if (ServerPacket.field2371 == var1.serverPacket) { // L: 6422 + class4.method77(var3.readStringCp1252NullTerminated()); // L: 6423 + var1.serverPacket = null; // L: 6424 + return true; // L: 6425 } - if (ServerPacket.field2225 == var1.serverPacket) { // L: 6431 - var16 = var3.readUnsignedShort(); // L: 6432 - if (var16 == 65535) { // L: 6433 - var16 = -1; - } - - AbstractSocket.playSong(var16); // L: 6434 - var1.serverPacket = null; // L: 6435 - return true; // L: 6436 - } - - if (ServerPacket.field2167 == var1.serverPacket) { // L: 6438 - var16 = var3.method5788(); // L: 6439 - var5 = var3.method5728(); // L: 6440 - if (var5 == 65535) { // L: 6441 - var5 = -1; - } - - NPC.method2180(var5, var16); // L: 6442 - var1.serverPacket = null; // L: 6443 - return true; // L: 6444 - } - - if (ServerPacket.field2148 == var1.serverPacket) { // L: 6446 - rebootTimer = var3.method5729() * 30; // L: 6447 - field861 = cycleCntr; // L: 6448 - var1.serverPacket = null; // L: 6449 - return true; // L: 6450 - } - - if (ServerPacket.field2218 == var1.serverPacket) { // L: 6452 - PacketWriter.method2429(class194.field2352); // L: 6453 - var1.serverPacket = null; // L: 6454 - return true; // L: 6455 - } - - long var22; - if (ServerPacket.field2209 == var1.serverPacket) { // L: 6457 - var16 = var3.method5895(); // L: 6458 - var5 = var3.method5727(); // L: 6459 - if (var5 == 65535) { // L: 6460 - var5 = -1; - } - - var6 = var3.readUnsignedShort(); // L: 6461 - if (var6 == 65535) { // L: 6462 - var6 = -1; - } - - var7 = var3.method5738(); // L: 6463 - - for (var8 = var6; var8 <= var5; ++var8) { // L: 6464 - var22 = (long)var8 + ((long)var7 << 32); // L: 6465 - Node var60 = widgetFlags.get(var22); // L: 6466 - if (var60 != null) { // L: 6467 - var60.remove(); - } - - widgetFlags.put(new IntegerNode(var16), var22); // L: 6468 - } - - var1.serverPacket = null; // L: 6470 - return true; // L: 6471 - } - - if (ServerPacket.field2172 == var1.serverPacket) { // L: 6473 - PacketWriter.method2429(class194.field2348); // L: 6474 - var1.serverPacket = null; // L: 6475 - return true; // L: 6476 - } - - if (ServerPacket.field2220 == var1.serverPacket) { // L: 6478 - PacketWriter.method2429(class194.field2354); // L: 6479 - var1.serverPacket = null; // L: 6480 - return true; // L: 6481 - } - - if (ServerPacket.field2184 == var1.serverPacket) { // L: 6483 - var3.offset += 28; // L: 6484 - if (var3.checkCrc()) { // L: 6485 - ServerPacket.method3809(var3, var3.offset - 28); - } - - var1.serverPacket = null; // L: 6486 - return true; // L: 6487 - } - - long var25; - long var27; - if (ServerPacket.field2156 == var1.serverPacket) { // L: 6489 - var37 = var3.readStringCp1252NullTerminated(); // L: 6490 - var25 = (long)var3.readUnsignedShort(); // L: 6491 - var27 = (long)var3.readMedium(); // L: 6492 - PlayerType var29 = (PlayerType)InterfaceParent.findEnumerated(class69.PlayerType_values(), var3.readUnsignedByte()); // L: 6493 - long var30 = var27 + (var25 << 32); // L: 6494 - boolean var32 = false; // L: 6495 - - for (int var13 = 0; var13 < 100; ++var13) { // L: 6496 - if (var30 == field883[var13]) { // L: 6497 - var32 = true; // L: 6498 - break; // L: 6499 - } - } - - if (InterfaceParent.friendSystem.isIgnored(new Username(var37, Message.loginType))) { // L: 6502 - var32 = true; - } - - if (!var32 && field778 == 0) { // L: 6503 - field883[field884] = var30; // L: 6504 - field884 = (field884 + 1) % 100; // L: 6505 - String var33 = AbstractFont.escapeBrackets(UrlRequester.method3467(JagexCache.method3683(var3))); // L: 6506 - byte var42; - if (var29.isPrivileged) { // L: 6508 - var42 = 7; - } else { - var42 = 3; // L: 6509 - } - - if (var29.modIcon != -1) { // L: 6510 - AbstractWorldMapData.addGameMessage(var42, UserComparator10.method3580(var29.modIcon) + var37, var33); - } else { - AbstractWorldMapData.addGameMessage(var42, var37, var33); // L: 6511 - } - } - - var1.serverPacket = null; // L: 6513 - return true; // L: 6514 - } - - if (ServerPacket.field2200 == var1.serverPacket) { // L: 6516 - class182.updateNpcs(false, var3); // L: 6517 - var1.serverPacket = null; // L: 6518 - return true; // L: 6519 - } - - if (ServerPacket.field2202 == var1.serverPacket) { // L: 6521 - var16 = var3.readInt(); // L: 6522 - var5 = var3.readInt(); // L: 6523 - var6 = GrandExchangeOffer.getGcDuration(); // L: 6524 - PacketBufferNode var46 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2241, packetWriter.isaacCipher); // L: 6526 - var46.packetBuffer.method5883(GameEngine.fps); // L: 6527 - var46.packetBuffer.method5736(var16); // L: 6528 - var46.packetBuffer.method5781(var5); // L: 6529 - var46.packetBuffer.method5883(var6); // L: 6530 - packetWriter.addNode(var46); // L: 6531 - var1.serverPacket = null; // L: 6532 - return true; // L: 6533 - } - - if (ServerPacket.field2162 == var1.serverPacket) { // L: 6535 - var37 = var3.readStringCp1252NullTerminated(); // L: 6536 - var5 = var3.method5717(); // L: 6537 - var6 = var3.method5717(); // L: 6538 - if (var5 >= 1 && var5 <= 8) { // L: 6539 - if (var37.equalsIgnoreCase("null")) { // L: 6540 - var37 = null; - } - - playerMenuActions[var5 - 1] = var37; // L: 6541 - playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 6542 - } - - var1.serverPacket = null; // L: 6544 - return true; // L: 6545 - } - - if (ServerPacket.field2152 == var1.serverPacket) { // L: 6547 - var16 = var3.readUnsignedByte(); // L: 6548 - WorldMapSection2.forceDisconnect(var16); // L: 6549 - var1.serverPacket = null; // L: 6550 - return false; // L: 6551 - } - - if (ServerPacket.field2157 == var1.serverPacket) { // L: 6553 - hintArrowType = var3.readUnsignedByte(); // L: 6554 - if (hintArrowType == 1) { // L: 6555 - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6556 - if (hintArrowType == 2) { // L: 6557 - hintArrowSubX = 64; // L: 6558 - hintArrowSubY = 64; // L: 6559 - } - - if (hintArrowType == 3) { // L: 6561 - hintArrowSubX = 0; // L: 6562 - hintArrowSubY = 64; // L: 6563 - } - - if (hintArrowType == 4) { // L: 6565 - hintArrowSubX = 128; // L: 6566 - hintArrowSubY = 64; // L: 6567 - } - - if (hintArrowType == 5) { // L: 6569 - hintArrowSubX = 64; // L: 6570 - hintArrowSubY = 0; // L: 6571 - } - - if (hintArrowType == 6) { // L: 6573 - hintArrowSubX = 64; // L: 6574 - hintArrowSubY = 128; // L: 6575 - } - - hintArrowType = 2; // L: 6577 - hintArrowX = var3.readUnsignedShort(); // L: 6578 - hintArrowY = var3.readUnsignedShort(); // L: 6579 - hintArrowHeight = var3.readUnsignedByte(); // L: 6580 - } - - if (hintArrowType == 10) { // L: 6582 - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; // L: 6583 - return true; // L: 6584 - } - - if (ServerPacket.field2168 == var1.serverPacket) { // L: 6586 - class219.method4171(); // L: 6587 - weight = var3.readShort(); // L: 6588 - field861 = cycleCntr; // L: 6589 - var1.serverPacket = null; // L: 6590 - return true; // L: 6591 - } - - if (ServerPacket.field2192 == var1.serverPacket) { // L: 6593 - var16 = var3.readInt(); // L: 6594 - if (var16 != field746) { // L: 6595 - field746 = var16; // L: 6596 - WorldMapCacheName.method715(); // L: 6597 - } - - var1.serverPacket = null; // L: 6599 - return true; // L: 6600 - } - - Widget var51; - if (ServerPacket.field2174 == var1.serverPacket) { // L: 6602 - var16 = var3.method5739(); // L: 6603 - var51 = class237.getWidget(var16); // L: 6604 - var51.modelType = 3; // L: 6605 - var51.modelId = UserComparator9.localPlayer.appearance.getChatHeadId(); // L: 6606 - IsaacCipher.invalidateWidget(var51); // L: 6607 - var1.serverPacket = null; // L: 6608 - return true; // L: 6609 - } - - if (ServerPacket.field2203 == var1.serverPacket) { // L: 6611 - var16 = var3.method5729(); // L: 6612 - WorldMapLabel.method501(var16); // L: 6613 - changedItemContainers[++field870 - 1 & 31] = var16 & 32767; // L: 6614 - var1.serverPacket = null; // L: 6615 - return true; // L: 6616 - } - - if (ServerPacket.field2142 == var1.serverPacket) { // L: 6618 - var16 = var3.readInt(); // L: 6619 - var5 = var3.readUnsignedShort(); // L: 6620 - if (var16 < -70000) { // L: 6621 + if (ServerPacket.field2406 == var1.serverPacket) { // L: 6427 + var17 = var3.readInt(); // L: 6428 + var5 = var3.readUnsignedShort(); // L: 6429 + if (var17 < -70000) { // L: 6430 var5 += 32768; } - if (var16 >= 0) { // L: 6623 - var19 = class237.getWidget(var16); + if (var17 >= 0) { // L: 6432 + var19 = class139.getWidget(var17); } else { - var19 = null; // L: 6624 + var19 = null; // L: 6433 } - if (var19 != null) { // L: 6625 - for (var7 = 0; var7 < var19.itemIds.length; ++var7) { // L: 6626 - var19.itemIds[var7] = 0; // L: 6627 - var19.itemQuantities[var7] = 0; // L: 6628 + if (var19 != null) { // L: 6434 + for (var23 = 0; var23 < var19.itemIds.length; ++var23) { // L: 6435 + var19.itemIds[var23] = 0; // L: 6436 + var19.itemQuantities[var23] = 0; // L: 6437 } } - WorldMapID.clearItemContainer(var5); // L: 6631 - var7 = var3.readUnsignedShort(); // L: 6632 + UserComparator8.clearItemContainer(var5); // L: 6440 + var23 = var3.readUnsignedShort(); // L: 6441 - for (var8 = 0; var8 < var7; ++var8) { // L: 6633 - var9 = var3.readUnsignedByte(); // L: 6634 - if (var9 == 255) { // L: 6635 - var9 = var3.method5739(); + for (var25 = 0; var25 < var23; ++var25) { // L: 6442 + var26 = var3.method6617(); // L: 6443 + var28 = var3.method6623(); // L: 6444 + if (var28 == 255) { // L: 6445 + var28 = var3.method6628(); } - var10 = var3.method5729(); // L: 6636 - if (var19 != null && var8 < var19.itemIds.length) { // L: 6637 6638 - var19.itemIds[var8] = var10; // L: 6639 - var19.itemQuantities[var8] = var9; // L: 6640 + if (var19 != null && var25 < var19.itemIds.length) { // L: 6446 6447 + var19.itemIds[var25] = var26; // L: 6448 + var19.itemQuantities[var25] = var28; // L: 6449 } - WorldMapLabel.itemContainerSetItem(var5, var8, var10 - 1, var9); // L: 6643 + SecureRandomFuture.itemContainerSetItem(var5, var25, var26 - 1, var28); // L: 6452 } - if (var19 != null) { // L: 6645 - IsaacCipher.invalidateWidget(var19); + if (var19 != null) { // L: 6454 + class29.invalidateWidget(var19); } - class219.method4171(); // L: 6646 - changedItemContainers[++field870 - 1 & 31] = var5 & 32767; // L: 6647 - var1.serverPacket = null; // L: 6648 - return true; // L: 6649 + class105.method2255(); // L: 6455 + changedItemContainers[++field791 - 1 & 31] = var5 & 32767; // L: 6456 + var1.serverPacket = null; // L: 6457 + return true; // L: 6458 } - if (ServerPacket.field2166 == var1.serverPacket) { // L: 6651 - var16 = var3.method5738(); // L: 6652 - var5 = var3.method5895(); // L: 6653 - InterfaceParent var50 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6654 - var45 = (InterfaceParent)interfaceParents.get((long)var16); // L: 6655 - if (var45 != null) { // L: 6656 - GrandExchangeOffer.closeInterface(var45, var50 == null || var50.group != var45.group); + if (ServerPacket.field2426 == var1.serverPacket) { // L: 6460 + class1.readReflectionCheck(var3, var1.serverPacketLength); // L: 6461 + var1.serverPacket = null; // L: 6462 + return true; // L: 6463 + } + + if (ServerPacket.field2436 == var1.serverPacket) { // L: 6465 + var17 = var3.method6629(); // L: 6466 + var57 = class139.getWidget(var17); // L: 6467 + var57.modelType = 3; // L: 6468 + var57.modelId = Varcs.localPlayer.appearance.getChatHeadId(); // L: 6469 + class29.invalidateWidget(var57); // L: 6470 + var1.serverPacket = null; // L: 6471 + return true; // L: 6472 + } + + if (ServerPacket.field2373 == var1.serverPacket) { // L: 6474 + MusicPatchPcmStream.method4148(class203.field2333); // L: 6475 + var1.serverPacket = null; // L: 6476 + return true; // L: 6477 + } + + if (ServerPacket.field2388 == var1.serverPacket) { // L: 6479 + destinationX = var3.readUnsignedByte(); // L: 6480 + if (destinationX == 255) { // L: 6481 + destinationX = 0; } - if (var50 != null) { // L: 6657 - var50.remove(); // L: 6658 - interfaceParents.put(var50, (long)var16); // L: 6659 + destinationY = var3.readUnsignedByte(); // L: 6482 + if (destinationY == 255) { // L: 6483 + destinationY = 0; } - var18 = class237.getWidget(var5); // L: 6661 - if (var18 != null) { // L: 6662 - IsaacCipher.invalidateWidget(var18); - } - - var18 = class237.getWidget(var16); // L: 6663 - if (var18 != null) { // L: 6664 - IsaacCipher.invalidateWidget(var18); // L: 6665 - class182.revalidateWidgetScroll(DefaultsGroup.Widget_interfaceComponents[var18.id >>> 16], var18, true); // L: 6666 - } - - if (rootInterface != -1) { // L: 6668 - class228.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; // L: 6669 - return true; // L: 6670 + var1.serverPacket = null; // L: 6484 + return true; // L: 6485 } - if (ServerPacket.field2222 == var1.serverPacket) { // L: 6672 - byte var59 = var3.method5721(); // L: 6673 - var5 = var3.readUnsignedShort(); // L: 6674 - Varps.Varps_temp[var5] = var59; // L: 6675 - if (Varps.Varps_main[var5] != var59) { // L: 6676 - Varps.Varps_main[var5] = var59; // L: 6677 - } + class223.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 1862353257 * -634167591 : -1) + "," + (var1.field1392 != null ? var1.field1392.id * 1862353257 * -634167591 : -1) + "," + (var1.field1393 != null ? var1.field1393.id * 1862353257 * -634167591 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6487 + class23.logOut(); // L: 6488 + } catch (IOException var43) { // L: 6490 + HealthBarUpdate.method2181(); // L: 6491 + } catch (Exception var44) { + var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 1862353257 * -634167591 : -1) + "," + (var1.field1392 != null ? var1.field1392.id * 1862353257 * -634167591 : -1) + "," + (var1.field1393 != null ? var1.field1393.id * 1862353257 * -634167591 : -1) + "," + var1.serverPacketLength + "," + (Varcs.localPlayer.pathX[0] + ItemLayer.baseX) + "," + (Varcs.localPlayer.pathY[0] + Tile.baseY) + ","; // L: 6494 - AbstractWorldMapIcon.changeGameOptions(var5); // L: 6679 - changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6680 - var1.serverPacket = null; // L: 6681 - return true; // L: 6682 + for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6495 + var18 = var18 + var3.array[var6] + ","; } - if (ServerPacket.field2199 == var1.serverPacket) { // L: 6684 - var37 = var3.readStringCp1252NullTerminated(); // L: 6685 - Object[] var52 = new Object[var37.length() + 1]; // L: 6686 - - for (var6 = var37.length() - 1; var6 >= 0; --var6) { // L: 6687 - if (var37.charAt(var6) == 's') { // L: 6688 - var52[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var52[var6 + 1] = new Integer(var3.readInt()); // L: 6689 - } - } - - var52[0] = new Integer(var3.readInt()); // L: 6691 - ScriptEvent var49 = new ScriptEvent(); // L: 6692 - var49.args = var52; // L: 6693 - PacketWriter.runScriptEvent(var49); // L: 6694 - var1.serverPacket = null; // L: 6695 - return true; // L: 6696 - } - - if (ServerPacket.field2186 == var1.serverPacket) { // L: 6698 - for (var16 = 0; var16 < players.length; ++var16) { // L: 6699 - if (players[var16] != null) { // L: 6700 - players[var16].sequence = -1; - } - } - - for (var16 = 0; var16 < npcs.length; ++var16) { // L: 6702 - if (npcs[var16] != null) { // L: 6703 - npcs[var16].sequence = -1; - } - } - - var1.serverPacket = null; // L: 6705 - return true; // L: 6706 - } - - if (ServerPacket.field2150 == var1.serverPacket) { // L: 6708 - var16 = var3.method5895(); // L: 6709 - var51 = class237.getWidget(var16); // L: 6710 - - for (var6 = 0; var6 < var51.itemIds.length; ++var6) { // L: 6711 - var51.itemIds[var6] = -1; // L: 6712 - var51.itemIds[var6] = 0; // L: 6713 - } - - IsaacCipher.invalidateWidget(var51); // L: 6715 - var1.serverPacket = null; // L: 6716 - return true; // L: 6717 - } - - if (ServerPacket.field2207 == var1.serverPacket) { // L: 6719 - var16 = var3.method5729(); // L: 6720 - var5 = var3.method5895(); // L: 6721 - var19 = class237.getWidget(var5); // L: 6722 - if (var19 != null && var19.type == 0) { // L: 6723 - if (var16 > var19.scrollHeight - var19.height) { // L: 6724 - var16 = var19.scrollHeight - var19.height; - } - - if (var16 < 0) { // L: 6725 - var16 = 0; - } - - if (var16 != var19.scrollY) { // L: 6726 - var19.scrollY = var16; // L: 6727 - IsaacCipher.invalidateWidget(var19); // L: 6728 - } - } - - var1.serverPacket = null; // L: 6731 - return true; // L: 6732 - } - - if (ServerPacket.field2173 == var1.serverPacket) { // L: 6734 - if (var1.serverPacketLength == 0) { // L: 6735 - WorldMapID.clanChat = null; // L: 6736 - } else { - if (WorldMapID.clanChat == null) { // L: 6739 - WorldMapID.clanChat = new ClanChat(Message.loginType, class1.client); // L: 6740 - } - - WorldMapID.clanChat.readUpdate(var3); // L: 6742 - } - - KeyHandler.method911(); // L: 6744 - var1.serverPacket = null; // L: 6745 - return true; // L: 6746 - } - - if (ServerPacket.field2159 == var1.serverPacket) { // L: 6748 - class105.loadRegions(false, var1.packetBuffer); // L: 6749 - var1.serverPacket = null; // L: 6750 - return true; // L: 6751 - } - - if (ServerPacket.field2216 == var1.serverPacket) { // L: 6753 - var16 = var3.method5738(); // L: 6754 - var5 = var3.method5727(); // L: 6755 - var6 = var3.method5727(); // L: 6756 - var17 = class237.getWidget(var16); // L: 6757 - var17.field2649 = var6 + (var5 << 16); // L: 6758 - var1.serverPacket = null; // L: 6759 - return true; // L: 6760 - } - - if (ServerPacket.field2177 == var1.serverPacket) { // L: 6762 - PacketWriter.method2429(class194.field2353); // L: 6763 - var1.serverPacket = null; // L: 6764 - return true; // L: 6765 - } - - if (ServerPacket.field2145 == var1.serverPacket) { // L: 6767 - var44 = var3.readBoolean(); // L: 6768 - if (var44) { // L: 6769 - if (HealthBarUpdate.field1016 == null) { // L: 6770 - HealthBarUpdate.field1016 = new class248(); - } - } else { - HealthBarUpdate.field1016 = null; // L: 6772 - } - - var1.serverPacket = null; // L: 6773 - return true; // L: 6774 - } - - if (ServerPacket.field2185 == var1.serverPacket) { // L: 6776 - tradeChatMode = var3.method5720(); // L: 6777 - publicChatMode = var3.method5776(); // L: 6778 - var1.serverPacket = null; // L: 6779 - return true; // L: 6780 - } - - if (ServerPacket.field2215 == var1.serverPacket) { // L: 6782 - ModelData0.updatePlayers(var3, var1.serverPacketLength); // L: 6783 - FriendsList.method5386(); // L: 6784 - var1.serverPacket = null; // L: 6785 - return true; // L: 6786 - } - - if (ServerPacket.field2161 == var1.serverPacket) { // L: 6788 - ArchiveLoader.privateChatMode = UserComparator5.method3604(var3.readUnsignedByte()); // L: 6789 - var1.serverPacket = null; // L: 6790 - return true; // L: 6791 - } - - if (ServerPacket.field2212 == var1.serverPacket) { // L: 6793 - var16 = var3.method5728(); // L: 6794 - var5 = var3.method5739(); // L: 6795 - var19 = class237.getWidget(var5); // L: 6796 - if (var19.modelType != 2 || var16 != var19.modelId) { // L: 6797 - var19.modelType = 2; // L: 6798 - var19.modelId = var16; // L: 6799 - IsaacCipher.invalidateWidget(var19); // L: 6800 - } - - var1.serverPacket = null; // L: 6802 - return true; // L: 6803 - } - - if (ServerPacket.field2189 == var1.serverPacket) { // L: 6805 - var16 = var3.readUnsignedShort(); // L: 6806 - rootInterface = var16; // L: 6807 - this.resizeRoot(false); // L: 6808 - GrandExchangeEvent.Widget_resetModelFrames(var16); // L: 6809 - SoundSystem.runWidgetOnLoadListener(rootInterface); // L: 6810 - - for (var5 = 0; var5 < 100; ++var5) { // L: 6811 - field816[var5] = true; - } - - var1.serverPacket = null; // L: 6812 - return true; // L: 6813 - } - - if (ServerPacket.field2197 == var1.serverPacket) { // L: 6815 - var16 = var3.readUnsignedByte(); // L: 6816 - if (var3.readUnsignedByte() == 0) { // L: 6817 - grandExchangeOffers[var16] = new GrandExchangeOffer(); // L: 6818 - var3.offset += 18; // L: 6819 - } else { - --var3.offset; // L: 6822 - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); // L: 6823 - } - - field710 = cycleCntr; // L: 6825 - var1.serverPacket = null; // L: 6826 - return true; // L: 6827 - } - - if (ServerPacket.field2194 == var1.serverPacket) { // L: 6829 - InterfaceParent.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6830 - class51.FriendSystem_invalidateIgnoreds(); // L: 6831 - field857 = cycleCntr; // L: 6832 - var1.serverPacket = null; // L: 6833 - return true; // L: 6834 - } - - if (ServerPacket.field2208 == var1.serverPacket) { // L: 6836 - isCameraLocked = false; // L: 6837 - - for (var16 = 0; var16 < 5; ++var16) { // L: 6838 - field907[var16] = false; - } - - var1.serverPacket = null; // L: 6839 - return true; // L: 6840 - } - - if (ServerPacket.field2204 == var1.serverPacket) { // L: 6842 - class308.readReflectionCheck(var3, var1.serverPacketLength); // L: 6843 - var1.serverPacket = null; // L: 6844 - return true; // L: 6845 - } - - if (ServerPacket.field2169 == var1.serverPacket) { // L: 6847 - class219.method4171(); // L: 6848 - var16 = var3.method5895(); // L: 6849 - var5 = var3.method5717(); // L: 6850 - var6 = var3.readUnsignedByte(); // L: 6851 - experience[var6] = var16; // L: 6852 - currentLevels[var6] = var5; // L: 6853 - levels[var6] = 1; // L: 6854 - - for (var7 = 0; var7 < 98; ++var7) { // L: 6855 - if (var16 >= Skills.Skills_experienceTable[var7]) { - levels[var6] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var6; // L: 6856 - var1.serverPacket = null; // L: 6857 - return true; // L: 6858 - } - - if (ServerPacket.field2165 == var1.serverPacket) { // L: 6860 - isCameraLocked = true; // L: 6861 - WorldMapManager.field345 = var3.readUnsignedByte(); // L: 6862 - Decimator.field1475 = var3.readUnsignedByte(); // L: 6863 - Clock.field2079 = var3.readUnsignedShort(); // L: 6864 - JagexCache.field2056 = var3.readUnsignedByte(); // L: 6865 - class228.field2740 = var3.readUnsignedByte(); // L: 6866 - if (class228.field2740 >= 100) { // L: 6867 - SecureRandomFuture.cameraX = WorldMapManager.field345 * 128 + 64; // L: 6868 - ObjectSound.cameraZ = Decimator.field1475 * 128 + 64; // L: 6869 - ArchiveLoader.cameraY = WorldMapRegion.getTileHeight(SecureRandomFuture.cameraX, ObjectSound.cameraZ, class90.Client_plane) - Clock.field2079; // L: 6870 - } - - var1.serverPacket = null; // L: 6872 - return true; // L: 6873 - } - - if (ServerPacket.field2188 == var1.serverPacket) { // L: 6875 - InterfaceParent.friendSystem.method1975(); // L: 6876 - field857 = cycleCntr; // L: 6877 - var1.serverPacket = null; // L: 6878 - return true; // L: 6879 - } - - if (ServerPacket.field2143 == var1.serverPacket) { // L: 6881 - var44 = var3.readUnsignedByte() == 1; // L: 6882 - if (var44) { // L: 6883 - class9.field57 = Tiles.currentTimeMillis() - var3.readLong(); // L: 6884 - WorldMapSectionType.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6885 - } else { - WorldMapSectionType.grandExchangeEvents = null; // L: 6887 - } - - field860 = cycleCntr; // L: 6888 - var1.serverPacket = null; // L: 6889 - return true; // L: 6890 - } - - if (ServerPacket.field2154 == var1.serverPacket) { // L: 6892 - var16 = var3.method5739(); // L: 6893 - var20 = var3.readStringCp1252NullTerminated(); // L: 6894 - var19 = class237.getWidget(var16); // L: 6895 - if (!var20.equals(var19.text)) { // L: 6896 - var19.text = var20; // L: 6897 - IsaacCipher.invalidateWidget(var19); // L: 6898 - } - - var1.serverPacket = null; // L: 6900 - return true; // L: 6901 - } - - if (ServerPacket.field2191 == var1.serverPacket) { // L: 6903 - if (WorldMapID.clanChat != null) { // L: 6904 - WorldMapID.clanChat.method5428(var3); // L: 6905 - } - - KeyHandler.method911(); // L: 6907 - var1.serverPacket = null; // L: 6908 - return true; // L: 6909 - } - - if (ServerPacket.field2147 == var1.serverPacket) { // L: 6911 - PacketWriter.method2429(class194.field2347); // L: 6912 - var1.serverPacket = null; // L: 6913 - return true; // L: 6914 - } - - if (ServerPacket.field2190 == var1.serverPacket) { // L: 6916 - var16 = var3.method5895(); // L: 6917 - var5 = var3.method5727(); // L: 6918 - var19 = class237.getWidget(var16); // L: 6919 - if (var19.modelType != 1 || var5 != var19.modelId) { // L: 6920 - var19.modelType = 1; // L: 6921 - var19.modelId = var5; // L: 6922 - IsaacCipher.invalidateWidget(var19); // L: 6923 - } - - var1.serverPacket = null; // L: 6925 - return true; // L: 6926 - } - - if (ServerPacket.field2163 == var1.serverPacket) { // L: 6928 - PacketWriter.method2429(class194.field2356); // L: 6929 - var1.serverPacket = null; // L: 6930 - return true; // L: 6931 - } - - if (ServerPacket.field2187 == var1.serverPacket) { // L: 6933 - var37 = var3.readStringCp1252NullTerminated(); // L: 6934 - var25 = var3.readLong(); // L: 6935 - var27 = (long)var3.readUnsignedShort(); // L: 6936 - var22 = (long)var3.readMedium(); // L: 6937 - PlayerType var24 = (PlayerType)InterfaceParent.findEnumerated(class69.PlayerType_values(), var3.readUnsignedByte()); // L: 6938 - var12 = var22 + (var27 << 32); // L: 6939 - boolean var14 = false; // L: 6940 - - for (int var15 = 0; var15 < 100; ++var15) { // L: 6941 - if (var12 == field883[var15]) { // L: 6942 - var14 = true; // L: 6943 - break; // L: 6944 - } - } - - if (var24.isUser && InterfaceParent.friendSystem.isIgnored(new Username(var37, Message.loginType))) { // L: 6947 6948 - var14 = true; - } - - if (!var14 && field778 == 0) { // L: 6950 - field883[field884] = var12; // L: 6951 - field884 = (field884 + 1) % 100; // L: 6952 - String var34 = AbstractFont.escapeBrackets(UrlRequester.method3467(JagexCache.method3683(var3))); // L: 6953 - if (var24.modIcon != -1) { // L: 6954 - PlatformInfo.addChatMessage(9, UserComparator10.method3580(var24.modIcon) + var37, var34, Messages.base37DecodeLong(var25)); - } else { - PlatformInfo.addChatMessage(9, var37, var34, Messages.base37DecodeLong(var25)); // L: 6955 - } - } - - var1.serverPacket = null; // L: 6957 - return true; // L: 6958 - } - - SequenceDefinition.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * 2010770863 * 763595087 : -1) + "," + (var1.field1333 != null ? var1.field1333.id * 2010770863 * 763595087 : -1) + "," + (var1.field1334 != null ? var1.field1334.id * 2010770863 * 763595087 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6960 - SecureRandomCallable.logOut(); // L: 6961 - } catch (IOException var35) { // L: 6963 - class8.method90(); // L: 6964 - } catch (Exception var36) { - var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id * 2010770863 * 763595087 : -1) + "," + (var1.field1333 != null ? var1.field1333.id * 2010770863 * 763595087 : -1) + "," + (var1.field1334 != null ? var1.field1334.id * 2010770863 * 763595087 : -1) + "," + var1.serverPacketLength + "," + (UserComparator9.localPlayer.pathX[0] + GrandExchangeOfferNameComparator.baseX) + "," + (UserComparator9.localPlayer.pathY[0] + NetCache.baseY) + ","; // L: 6967 - - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6968 - var20 = var20 + var3.array[var6] + ","; - } - - SequenceDefinition.RunException_sendStackTrace(var20, var36); // L: 6969 - SecureRandomCallable.logOut(); // L: 6970 + class223.RunException_sendStackTrace(var18, var44); // L: 6496 + class23.logOut(); // L: 6497 } - return true; // L: 6972 + return true; // L: 6499 } } - @ObfuscatedName("hz") + @ObfuscatedName("hp") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-85" + garbageValue = "53" ) @Export("menu") final void menu() { - boolean var1 = false; // L: 7833 - - int var2; - int var5; - while (!var1) { // L: 7834 - var1 = true; // L: 7835 - - for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 7836 - if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 7837 - String var17 = menuTargets[var2]; // L: 7838 - menuTargets[var2] = menuTargets[var2 + 1]; // L: 7839 - menuTargets[var2 + 1] = var17; // L: 7840 - String var18 = menuActions[var2]; // L: 7841 - menuActions[var2] = menuActions[var2 + 1]; // L: 7842 - menuActions[var2 + 1] = var18; // L: 7843 - var5 = menuOpcodes[var2]; // L: 7844 - menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 7845 - menuOpcodes[var2 + 1] = var5; // L: 7846 - var5 = menuArguments1[var2]; // L: 7847 - menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 7848 - menuArguments1[var2 + 1] = var5; // L: 7849 - var5 = menuArguments2[var2]; // L: 7850 - menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 7851 - menuArguments2[var2 + 1] = var5; // L: 7852 - var5 = menuIdentifiers[var2]; // L: 7853 - menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 7854 - menuIdentifiers[var2 + 1] = var5; // L: 7855 - boolean var6 = menuShiftClick[var2]; // L: 7856 - menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 7857 - menuShiftClick[var2 + 1] = var6; // L: 7858 - var1 = false; // L: 7859 - } - } - } - - if (JagexCache.dragInventoryWidget == null) { // L: 7864 - if (clickedWidget == null) { // L: 7865 - int var19 = MouseHandler.MouseHandler_lastButton; // L: 7866 + PlayerType.method4410(); // L: 7823 + if (ClientPacket.dragInventoryWidget == null) { // L: 7824 + if (clickedWidget == null) { // L: 7825 + int var1 = MouseHandler.MouseHandler_lastButton; // L: 7826 + int var2; int var4; - int var9; + int var5; + int var6; int var14; - int var20; - if (isMenuOpen) { // L: 7867 + if (isMenuOpen) { // L: 7827 int var3; - if (var19 != 1 && (class8.mouseCam || var19 != 4)) { // L: 7868 - var2 = MouseHandler.MouseHandler_x; // L: 7869 - var3 = MouseHandler.MouseHandler_y; // L: 7870 - if (var2 < ApproximateRouteStrategy.menuX - 10 || var2 > ApproximateRouteStrategy.menuX + CollisionMap.menuWidth + 10 || var3 < AbstractUserComparator.menuY - 10 || var3 > GrandExchangeOfferTotalQuantityComparator.menuHeight + AbstractUserComparator.menuY + 10) { // L: 7871 - isMenuOpen = false; // L: 7872 - Projectile.method2262(ApproximateRouteStrategy.menuX, AbstractUserComparator.menuY, CollisionMap.menuWidth, GrandExchangeOfferTotalQuantityComparator.menuHeight); // L: 7873 + int var15; + if (var1 != 1 && (MouseHandler.mouseCam || var1 != 4)) { // L: 7828 + var2 = MouseHandler.MouseHandler_x; // L: 7829 + var3 = MouseHandler.MouseHandler_y; // L: 7830 + if (var2 < class16.menuX - 10 || var2 > class16.menuX + Player.menuWidth + 10 || var3 < FontName.menuY - 10 || var3 > class11.menuHeight + FontName.menuY + 10) { // L: 7831 + isMenuOpen = false; // L: 7832 + var4 = class16.menuX; // L: 7833 + var5 = FontName.menuY; // L: 7834 + var6 = Player.menuWidth; // L: 7835 + var14 = class11.menuHeight; // L: 7836 + + for (var15 = 0; var15 < rootWidgetCount; ++var15) { // L: 7838 + if (rootWidgetXs[var15] + rootWidgetWidths[var15] > var4 && rootWidgetXs[var15] < var6 + var4 && rootWidgetYs[var15] + rootWidgetHeights[var15] > var5 && rootWidgetYs[var15] < var14 + var5) { // L: 7839 + field811[var15] = true; + } + } } } - if (var19 == 1 || !class8.mouseCam && var19 == 4) { // L: 7876 - var2 = ApproximateRouteStrategy.menuX; // L: 7877 - var3 = AbstractUserComparator.menuY; // L: 7878 - var4 = CollisionMap.menuWidth; // L: 7879 - var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7880 - var20 = MouseHandler.MouseHandler_lastPressedY; // L: 7881 - var14 = -1; // L: 7882 + if (var1 == 1 || !MouseHandler.mouseCam && var1 == 4) { // L: 7844 + var2 = class16.menuX; // L: 7845 + var3 = FontName.menuY; // L: 7846 + var4 = Player.menuWidth; // L: 7847 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7848 + var6 = MouseHandler.MouseHandler_lastPressedY; // L: 7849 + var14 = -1; // L: 7850 - int var21; - for (var21 = 0; var21 < menuOptionsCount; ++var21) { // L: 7883 - var9 = var3 + (menuOptionsCount - 1 - var21) * 15 + 31; // L: 7884 - if (var5 > var2 && var5 < var4 + var2 && var20 > var9 - 13 && var20 < var9 + 3) { // L: 7885 - var14 = var21; + int var16; + for (var15 = 0; var15 < menuOptionsCount; ++var15) { // L: 7851 + var16 = var3 + (menuOptionsCount - 1 - var15) * 15 + 31; // L: 7852 + if (var5 > var2 && var5 < var2 + var4 && var6 > var16 - 13 && var6 < var16 + 3) { // L: 7853 + var14 = var15; } } - if (var14 != -1 && var14 >= 0) { // L: 7887 7888 - var21 = menuArguments1[var14]; // L: 7889 - var9 = menuArguments2[var14]; // L: 7890 - int var10 = menuOpcodes[var14]; // L: 7891 - int var11 = menuIdentifiers[var14]; // L: 7892 - String var12 = menuActions[var14]; // L: 7893 - String var13 = menuTargets[var14]; // L: 7894 - AbstractWorldMapIcon.menuAction(var21, var9, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7895 + int var10; + int var11; + if (var14 != -1 && var14 >= 0) { // L: 7855 7856 + var15 = menuArguments1[var14]; // L: 7857 + var16 = menuArguments2[var14]; // L: 7858 + var10 = menuOpcodes[var14]; // L: 7859 + var11 = menuIdentifiers[var14]; // L: 7860 + String var12 = menuActions[var14]; // L: 7861 + String var13 = menuTargets[var14]; // L: 7862 + UserComparator9.menuAction(var15, var16, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7863 } - isMenuOpen = false; // L: 7897 - Projectile.method2262(ApproximateRouteStrategy.menuX, AbstractUserComparator.menuY, CollisionMap.menuWidth, GrandExchangeOfferTotalQuantityComparator.menuHeight); // L: 7898 + isMenuOpen = false; // L: 7865 + var15 = class16.menuX; // L: 7866 + var16 = FontName.menuY; // L: 7867 + var10 = Player.menuWidth; // L: 7868 + var11 = class11.menuHeight; // L: 7869 + + for (int var17 = 0; var17 < rootWidgetCount; ++var17) { // L: 7871 + if (rootWidgetXs[var17] + rootWidgetWidths[var17] > var15 && rootWidgetXs[var17] < var15 + var10 && rootWidgetHeights[var17] + rootWidgetYs[var17] > var16 && rootWidgetYs[var17] < var11 + var16) { // L: 7872 + field811[var17] = true; + } + } } } else { - var2 = menuOptionsCount - 1; // L: 7904 - if ((var19 == 1 || !class8.mouseCam && var19 == 4) && var2 >= 0) { // L: 7907 - var4 = menuOpcodes[var2]; // L: 7908 - 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: 7909 - label260: { - var5 = menuArguments1[var2]; // L: 7910 - var20 = menuArguments2[var2]; // L: 7911 - Widget var7 = class237.getWidget(var20); // L: 7912 - var9 = class60.getWidgetFlags(var7); // L: 7914 - boolean var8 = (var9 >> 28 & 1) != 0; // L: 7916 - if (!var8) { // L: 7918 - Object var10000 = null; - if (!ModeWhere.method3867(class60.getWidgetFlags(var7))) { - break label260; - } + var2 = menuOptionsCount - 1; // L: 7880 + if ((var1 == 1 || !MouseHandler.mouseCam && var1 == 4) && var2 >= 0) { // L: 7883 + var4 = menuOpcodes[var2]; // L: 7884 + 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: 7885 + var5 = menuArguments1[var2]; // L: 7886 + var6 = menuArguments2[var2]; // L: 7887 + Widget var7 = class139.getWidget(var6); // L: 7888 + if (class2.method39(DirectByteArrayCopier.getWidgetFlags(var7)) || class69.method1165(DirectByteArrayCopier.getWidgetFlags(var7))) { // L: 7889 + if (ClientPacket.dragInventoryWidget != null && !field714 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7890 7891 + class26.method357(draggedWidgetX, draggedWidgetY); // L: 7892 } - if (JagexCache.dragInventoryWidget != null && !field776 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7919 7920 - LoginPacket.method3812(draggedWidgetX, draggedWidgetY); // L: 7921 + field714 = false; // L: 7895 + itemDragDuration = 0; // L: 7896 + if (ClientPacket.dragInventoryWidget != null) { // L: 7897 + class29.invalidateWidget(ClientPacket.dragInventoryWidget); } - field776 = false; // L: 7924 - itemDragDuration = 0; // L: 7925 - if (JagexCache.dragInventoryWidget != null) { // L: 7926 - IsaacCipher.invalidateWidget(JagexCache.dragInventoryWidget); + ClientPacket.dragInventoryWidget = class139.getWidget(var6); // L: 7898 + dragItemSlotSource = var5; // L: 7899 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7900 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7901 + if (var2 >= 0) { // L: 7902 + class25.tempMenuAction = new MenuAction(); // L: 7903 + class25.tempMenuAction.param0 = menuArguments1[var2]; // L: 7904 + class25.tempMenuAction.param1 = menuArguments2[var2]; // L: 7905 + class25.tempMenuAction.opcode = menuOpcodes[var2]; // L: 7906 + class25.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 7907 + class25.tempMenuAction.action = menuActions[var2]; // L: 7908 } - JagexCache.dragInventoryWidget = class237.getWidget(var20); // L: 7927 - dragItemSlotSource = var5; // L: 7928 - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7929 - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7930 - if (var2 >= 0) { // L: 7931 - class195.tempMenuAction = new MenuAction(); // L: 7932 - class195.tempMenuAction.param0 = menuArguments1[var2]; // L: 7933 - class195.tempMenuAction.param1 = menuArguments2[var2]; // L: 7934 - class195.tempMenuAction.opcode = menuOpcodes[var2]; // L: 7935 - class195.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 7936 - class195.tempMenuAction.action = menuActions[var2]; // L: 7937 - } - - IsaacCipher.invalidateWidget(JagexCache.dragInventoryWidget); // L: 7939 - return; // L: 7940 + class29.invalidateWidget(ClientPacket.dragInventoryWidget); // L: 7910 + return; // L: 7911 } } } - if ((var19 == 1 || !class8.mouseCam && var19 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7944 7945 - var19 = 2; // L: 7946 + if ((var1 == 1 || !MouseHandler.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7915 7916 + var1 = 2; // L: 7917 } - if ((var19 == 1 || !class8.mouseCam && var19 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7949 7951 - var4 = menuArguments1[var2]; // L: 7952 - var5 = menuArguments2[var2]; // L: 7953 - var20 = menuOpcodes[var2]; // L: 7954 - var14 = menuIdentifiers[var2]; // L: 7955 - String var15 = menuActions[var2]; // L: 7956 - String var16 = menuTargets[var2]; // L: 7957 - AbstractWorldMapIcon.menuAction(var4, var5, var20, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7958 + if ((var1 == 1 || !MouseHandler.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7920 7922 + var4 = menuArguments1[var2]; // L: 7923 + var5 = menuArguments2[var2]; // L: 7924 + var6 = menuOpcodes[var2]; // L: 7925 + var14 = menuIdentifiers[var2]; // L: 7926 + String var8 = menuActions[var2]; // L: 7927 + String var9 = menuTargets[var2]; // L: 7928 + UserComparator9.menuAction(var4, var5, var6, var14, var8, var9, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7929 } - if (var19 == 2 && menuOptionsCount > 0) { // L: 7961 + if (var1 == 2 && menuOptionsCount > 0) { // L: 7932 this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } } } - } // L: 7963 + } // L: 7934 - @ObfuscatedName("hm") + @ObfuscatedName("ht") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1283053066" + garbageValue = "-1310382933" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = menuOptionsCount - 1; // L: 7968 - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || HealthBarDefinition.method4677(var1)) && !menuShiftClick[var1]; // L: 7971 + int var1 = Skeleton.method3433(); // L: 7937 + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || Player.method2150(var1)) && !menuShiftClick[var1]; // L: 7938 } - @ObfuscatedName("hx") + @ObfuscatedName("hi") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1717736851" + garbageValue = "-1656231949" ) @Export("openMenu") final void openMenu(int var1, int var2) { - GrandExchangeOfferTotalQuantityComparator.method162(var1, var2); // L: 7975 - MilliClock.scene.menuOpen(class90.Client_plane, var1, var2, false); // L: 7976 - isMenuOpen = true; // L: 7977 - } // L: 7978 + SpriteMask.method4172(var1, var2); // L: 7942 + WorldMapArea.scene.menuOpen(class26.Client_plane, var1, var2, false); // L: 7943 + isMenuOpen = true; // L: 7944 + } // L: 7945 - @ObfuscatedName("il") + @ObfuscatedName("it") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "1112" + descriptor = "(ZI)V", + garbageValue = "230478005" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - int var2 = rootInterface; // L: 9914 - int var3 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; // L: 9915 - int var4 = class25.canvasHeight; // L: 9916 - if (WorldMapCacheName.loadInterface(var2)) { // L: 9918 - ObjectSound.resizeInterface(DefaultsGroup.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 9919 - } + ModelData0.method3784(rootInterface, InterfaceParent.canvasWidth, GameEngine.canvasHeight, var1); // L: 9940 + } // L: 9941 - } // L: 9921 - - @ObfuscatedName("ic") + @ObfuscatedName("if") @ObfuscatedSignature( - descriptor = "(Lhz;S)V", - garbageValue = "-12534" + descriptor = "(Lhu;I)V", + garbageValue = "2095666186" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : class237.getWidget(var1.parentId); // L: 9924 + Widget var2 = var1.parentId == -1 ? null : class139.getWidget(var1.parentId); // L: 9944 int var3; int var4; - if (var2 == null) { // L: 9927 - var3 = GrandExchangeOfferTotalQuantityComparator.canvasWidth; // L: 9928 - var4 = class25.canvasHeight; // L: 9929 + if (var2 == null) { // L: 9947 + var3 = InterfaceParent.canvasWidth; // L: 9948 + var4 = GameEngine.canvasHeight; // L: 9949 } else { - var3 = var2.width; // L: 9932 - var4 = var2.height; // L: 9933 + var3 = var2.width; // L: 9952 + var4 = var2.height; // L: 9953 } - WorldMapManager.alignWidgetSize(var1, var3, var4, false); // L: 9935 - ClientPreferences.alignWidgetPosition(var1, var3, var4); // L: 9936 - } // L: 9937 + class401.alignWidgetSize(var1, var3, var4, false); // L: 9955 + KeyHandler.alignWidgetPosition(var1, var3, var4); // L: 9956 + } // L: 9957 - @ObfuscatedName("jw") + @ObfuscatedName("jl") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "645040649" + garbageValue = "-2104011211" ) - final void method1403() { - IsaacCipher.invalidateWidget(clickedWidget); // L: 10916 - ++PlayerComposition.widgetDragDuration; // L: 10917 - if (field754 && field912) { // L: 10918 - int var1 = MouseHandler.MouseHandler_x; // L: 10924 - int var2 = MouseHandler.MouseHandler_y; // L: 10925 - var1 -= widgetClickX; // L: 10926 - var2 -= widgetClickY; // L: 10927 - if (var1 < field714) { // L: 10928 - var1 = field714; + final void method1239() { + class29.invalidateWidget(clickedWidget); // L: 10938 + ++class34.widgetDragDuration; // L: 10939 + if (field783 && field780) { // L: 10940 + int var1 = MouseHandler.MouseHandler_x; // L: 10946 + int var2 = MouseHandler.MouseHandler_y; // L: 10947 + var1 -= widgetClickX; // L: 10948 + var2 -= widgetClickY; // L: 10949 + if (var1 < field727) { // L: 10950 + var1 = field727; } - if (var1 + clickedWidget.width > field714 + clickedWidgetParent.width) { // L: 10929 - var1 = field714 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field727 + clickedWidgetParent.width) { // L: 10951 + var1 = field727 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field844) { // L: 10930 - var2 = field844; + if (var2 < field782) { // L: 10952 + var2 = field782; } - if (var2 + clickedWidget.height > field844 + clickedWidgetParent.height) { // L: 10931 - var2 = field844 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field782 + clickedWidgetParent.height) { // L: 10953 + var2 = field782 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field784; // L: 10932 - int var4 = var2 - field847; // L: 10933 - int var5 = clickedWidget.dragZoneSize; // L: 10934 - if (PlayerComposition.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10935 10936 - isDraggingWidget = true; // L: 10937 + int var3 = var1 - field784; // L: 10954 + int var4 = var2 - field845; // L: 10955 + int var5 = clickedWidget.dragZoneSize; // L: 10956 + if (class34.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10957 10958 + isDraggingWidget = true; // L: 10959 } - int var6 = var1 - field714 + clickedWidgetParent.scrollX; // L: 10940 - int var7 = var2 - field844 + clickedWidgetParent.scrollY; // L: 10941 + int var6 = var1 - field727 + clickedWidgetParent.scrollX; // L: 10962 + int var7 = var2 - field782 + clickedWidgetParent.scrollY; // L: 10963 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10942 - var8 = new ScriptEvent(); // L: 10943 - var8.widget = clickedWidget; // L: 10944 - var8.mouseX = var6; // L: 10945 - var8.mouseY = var7; // L: 10946 - var8.args = clickedWidget.onDrag; // L: 10947 - PacketWriter.runScriptEvent(var8); // L: 10948 + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10964 + var8 = new ScriptEvent(); // L: 10965 + var8.widget = clickedWidget; // L: 10966 + var8.mouseX = var6; // L: 10967 + var8.mouseY = var7; // L: 10968 + var8.args = clickedWidget.onDrag; // L: 10969 + class19.runScriptEvent(var8); // L: 10970 } - if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10950 - if (isDraggingWidget) { // L: 10951 - if (clickedWidget.onDragComplete != null) { // L: 10952 - var8 = new ScriptEvent(); // L: 10953 - var8.widget = clickedWidget; // L: 10954 - var8.mouseX = var6; // L: 10955 - var8.mouseY = var7; // L: 10956 - var8.dragTarget = draggedOnWidget; // L: 10957 - var8.args = clickedWidget.onDragComplete; // L: 10958 - PacketWriter.runScriptEvent(var8); // L: 10959 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10972 + if (isDraggingWidget) { // L: 10973 + if (clickedWidget.onDragComplete != null) { // L: 10974 + var8 = new ScriptEvent(); // L: 10975 + var8.widget = clickedWidget; // L: 10976 + var8.mouseX = var6; // L: 10977 + var8.mouseY = var7; // L: 10978 + var8.dragTarget = draggedOnWidget; // L: 10979 + var8.args = clickedWidget.onDragComplete; // L: 10980 + class19.runScriptEvent(var8); // L: 10981 } - if (draggedOnWidget != null && Strings.method4325(clickedWidget) != null) { // L: 10961 - PacketBufferNode var9 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2272, packetWriter.isaacCipher); // L: 10963 - var9.packetBuffer.method5736(draggedOnWidget.id); // L: 10964 - var9.packetBuffer.writeShort(clickedWidget.childIndex); // L: 10965 - var9.packetBuffer.writeIntME(clickedWidget.itemId); // L: 10966 - var9.packetBuffer.method5725(draggedOnWidget.childIndex); // L: 10967 - var9.packetBuffer.method5725(draggedOnWidget.itemId); // L: 10968 - var9.packetBuffer.method5736(clickedWidget.id); // L: 10969 - packetWriter.addNode(var9); // L: 10970 + if (draggedOnWidget != null) { // L: 10983 + Widget var9 = clickedWidget; // L: 10985 + int var10 = AbstractWorldMapData.method3079(DirectByteArrayCopier.getWidgetFlags(var9)); // L: 10987 + Widget var13; + if (var10 == 0) { // L: 10988 + var13 = null; // L: 10989 + } else { + int var11 = 0; + + while (true) { + if (var11 >= var10) { + var13 = var9; // L: 10999 + break; + } + + var9 = class139.getWidget(var9.parentId); // L: 10993 + if (var9 == null) { // L: 10994 + var13 = null; // L: 10995 + break; // L: 10996 + } + + ++var11; // L: 10992 + } + } + + if (var13 != null) { // L: 11001 + PacketBufferNode var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2307, packetWriter.isaacCipher); // L: 11003 + var12.packetBuffer.writeShort(clickedWidget.childIndex); // L: 11004 + var12.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 11005 + var12.packetBuffer.method6614(clickedWidget.itemId); // L: 11006 + var12.packetBuffer.method6624(draggedOnWidget.id); // L: 11007 + var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 11008 + var12.packetBuffer.method6624(clickedWidget.id); // L: 11009 + packetWriter.addNode(var12); // L: 11010 + } } - } else if (this.shouldLeftClickOpenMenu()) { // L: 10974 - this.openMenu(field784 + widgetClickX, widgetClickY + field847); // L: 10975 - } else if (menuOptionsCount > 0) { // L: 10977 - LoginPacket.method3812(field784 + widgetClickX, field847 + widgetClickY); // L: 10978 + } else if (this.shouldLeftClickOpenMenu()) { // L: 11015 + this.openMenu(field784 + widgetClickX, widgetClickY + field845); // L: 11016 + } else if (menuOptionsCount > 0) { // L: 11018 + class26.method357(widgetClickX + field784, field845 + widgetClickY); // L: 11019 } - clickedWidget = null; // L: 10981 + clickedWidget = null; // L: 11022 } } else { - if (PlayerComposition.widgetDragDuration > 1) { // L: 10919 - clickedWidget = null; // L: 10920 + if (class34.widgetDragDuration > 1) { // L: 10941 + clickedWidget = null; // L: 10942 } } - } // L: 10922 10983 + } // L: 10944 11024 - @ObfuscatedName("kd") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(B)Lkk;", - garbageValue = "75" + descriptor = "(I)Llw;", + garbageValue = "-447538147" ) @Export("username") public Username username() { - return UserComparator9.localPlayer != null ? UserComparator9.localPlayer.username : null; // L: 11612 + return Varcs.localPlayer != null ? Varcs.localPlayer.username : null; // L: 11682 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lit;", - garbageValue = "-1847774417" - ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33 - if (var1 != null) { // L: 34 - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 35 - var1 = new KitDefinition(); // L: 36 - if (var2 != null) { // L: 37 - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 - return var1; // L: 39 - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;IIB)Lls;", - garbageValue = "1" - ) - public static AbstractSocket method1841(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); // L: 10 - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILcl;ZS)I", - garbageValue = "-2260" - ) - static int method1839(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3353 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.loadWorlds() ? 1 : 0; // L: 3354 - return 1; // L: 3355 - } else { - World var9; - if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3357 - var9 = Occluder.worldListStart(); // L: 3358 - if (var9 != null) { // L: 3359 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3360 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3361 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3362 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3363 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3364 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3365 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3368 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3369 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3370 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3371 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3372 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3373 - } - - return 1; // L: 3375 - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3377 - var9 = Player.getNextWorldListWorld(); // L: 3378 - if (var9 != null) { // L: 3379 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3380 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3381 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3382 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3383 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3384 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3385 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3388 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3389 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3390 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3391 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3392 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3393 - } - - return 1; // L: 3395 - } else { - int var3; - World var7; - int var8; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3397 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3398 - var7 = null; // L: 3399 - - for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3400 - if (var3 == World.World_worlds[var8].id) { // L: 3401 - var7 = World.World_worlds[var8]; // L: 3402 - break; - } - } - - if (var7 != null) { // L: 3406 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3407 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3408 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3409 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3410 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3411 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3412 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3415 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3416 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3417 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3418 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3419 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3420 - } - - return 1; // L: 3422 - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3424 - Interpreter.Interpreter_intStackSize -= 4; // L: 3425 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3426 - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3427 - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3428 - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; // L: 3429 - Varps.sortWorldList(var3, var10, var8, var6); // L: 3430 - return 1; // L: 3431 - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3433 - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3454 - followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3455 - return 1; // L: 3456 - } else { - int var4; - ParamComposition var5; - if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3458 - Interpreter.Interpreter_intStackSize -= 2; // L: 3459 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3460 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3461 - var5 = AbstractArchive.getParamDefinition(var4); // L: 3462 - if (var5.isString()) { // L: 3463 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class90.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3464 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class90.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3467 - } - - return 1; // L: 3469 - } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3471 - Interpreter.Interpreter_intStackSize -= 2; // L: 3472 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3473 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3474 - var5 = AbstractArchive.getParamDefinition(var4); // L: 3475 - if (var5.isString()) { // L: 3476 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapAreaData.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3477 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapAreaData.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3480 - } - - return 1; // L: 3482 - } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3484 - Interpreter.Interpreter_intStackSize -= 2; // L: 3485 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3486 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3487 - var5 = AbstractArchive.getParamDefinition(var4); // L: 3488 - if (var5.isString()) { // L: 3489 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class281.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3490 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class281.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3493 - } - - return 1; // L: 3495 - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3497 - Interpreter.Interpreter_intStackSize -= 2; // L: 3498 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3499 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3500 - var5 = AbstractArchive.getParamDefinition(var4); // L: 3501 - if (var5.isString()) { // L: 3502 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = FloorUnderlayDefinition.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3503 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorUnderlayDefinition.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3506 - } - - return 1; // L: 3508 - } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3510 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = onMobile ? 1 : 0; // L: 3511 - return 1; // L: 3512 - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3514 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = clientType & 3; // L: 3515 - return 1; // L: 3516 - } else if (var0 == 6520) { // L: 3518 - return 1; // L: 3519 - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3521 - return 1; // L: 3522 - } else if (var0 == 6522) { // L: 3524 - --Interpreter.Interpreter_stringStackSize; // L: 3525 - --Interpreter.Interpreter_intStackSize; // L: 3526 - return 1; // L: 3527 - } else if (var0 == 6523) { // L: 3529 - --Interpreter.Interpreter_stringStackSize; // L: 3530 - --Interpreter.Interpreter_intStackSize; // L: 3531 - return 1; // L: 3532 - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3534 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3535 - return 1; // L: 3536 - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3538 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3539 - return 1; // L: 3540 - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3542 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3543 - return 1; // L: 3544 - } else if (var0 == 6527) { // L: 3546 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = field667; // L: 3547 - return 1; // L: 3548 - } else { - return 2; // L: 3550 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3434 - if (var3 >= 0 && var3 < World.World_count) { // L: 3435 - var7 = World.World_worlds[var3]; // L: 3436 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3437 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3438 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3439 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3440 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3441 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3442 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3445 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3446 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3447 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3448 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3449 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3450 - } - - return 1; // L: 3452 - } - } - } - } -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 5a72147ad1..11b80cf082 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -1,690 +1,727 @@ -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("gd") +@ObfuscatedName("gx") @Implements("ClientPacket") -public class ClientPacket implements class190 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - static final ClientPacket field2245; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2232; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2296; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2313; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2238; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2239; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2241; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2291; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2243; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2268; +public class ClientPacket implements class201 { @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2246; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2247; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2309; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2252; + static final ClientPacket field2279; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2253; + public static final ClientPacket field2229; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2236; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2216; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2217; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2218; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2219; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2220; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2247; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2213; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2223; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2224; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2215; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2226; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2254; - @ObfuscatedName("ay") + public static final ClientPacket field2227; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2255; - @ObfuscatedName("am") + public static final ClientPacket field2244; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2256; - @ObfuscatedName("ag") + static final ClientPacket field2221; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2257; - @ObfuscatedName("ae") + public static final ClientPacket field2230; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" + ) + public static final ClientPacket field2231; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2232; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lgx;" ) public static final ClientPacket field2258; - @ObfuscatedName("ac") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2250; - @ObfuscatedName("aq") + public static final ClientPacket field2243; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2292; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2261; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2262; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2263; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2289; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2334; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2267; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2302; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) public static final ClientPacket field2235; - @ObfuscatedName("ah") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2270; - @ObfuscatedName("ap") + public static final ClientPacket field2240; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2279; + public static final ClientPacket field2295; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2238; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2239; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2241; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2242; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2325; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2280; @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2333; - @ObfuscatedName("an") + public static final ClientPacket field2237; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - static final ClientPacket field2273; - @ObfuscatedName("ai") + public static final ClientPacket field2312; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2260; - @ObfuscatedName("ab") + public static final ClientPacket field2309; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2275; - @ObfuscatedName("au") + public static final ClientPacket field2248; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2276; + public static final ClientPacket field2249; @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2277; + public static final ClientPacket field2250; @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2278; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2233; + public static final ClientPacket field2251; @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2287; - @ObfuscatedName("bj") + public static final ClientPacket field2252; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2281; - @ObfuscatedName("bn") + public static final ClientPacket field2257; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2282; - @ObfuscatedName("bi") + public static final ClientPacket field2254; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2283; - @ObfuscatedName("bp") + public static final ClientPacket field2321; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2284; - @ObfuscatedName("br") + public static final ClientPacket field2256; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2285; - @ObfuscatedName("bq") + public static final ClientPacket field2234; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2286; - @ObfuscatedName("bx") + public static final ClientPacket field2317; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - static final ClientPacket field2317; - @ObfuscatedName("bc") + public static final ClientPacket field2259; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2328; - @ObfuscatedName("bw") + public static final ClientPacket field2260; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2318; - @ObfuscatedName("bv") + public static final ClientPacket field2261; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2290; - @ObfuscatedName("bt") + public static final ClientPacket field2262; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2269; - @ObfuscatedName("bl") + public static final ClientPacket field2263; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) public static final ClientPacket field2264; @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2293; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2294; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2295; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2229; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2297; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2298; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2299; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2300; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2240; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2312; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2303; - @ObfuscatedName("bk") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2304; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2305; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - static final ClientPacket field2306; - @ObfuscatedName("cv") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2307; - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2308; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2288; - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - static final ClientPacket field2310; - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2311; - @ObfuscatedName("cp") - @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) public static final ClientPacket field2265; - @ObfuscatedName("ck") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2266; - @ObfuscatedName("cn") + public static final ClientPacket field2246; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2271; - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2315; - @ObfuscatedName("cr") - @ObfuscatedSignature( - descriptor = "Lgd;" - ) - public static final ClientPacket field2316; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) public static final ClientPacket field2314; - @ObfuscatedName("cz") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2324; - @ObfuscatedName("cs") + public static final ClientPacket field2318; + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2319; - @ObfuscatedName("ce") + public static final ClientPacket field2269; + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2320; - @ObfuscatedName("cu") + public static final ClientPacket field2270; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2321; - @ObfuscatedName("ci") + public static final ClientPacket field2271; + @ObfuscatedName("ba") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2322; - @ObfuscatedName("cy") + public static final ClientPacket field2255; + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2323; - @ObfuscatedName("cm") + public static final ClientPacket field2273; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2249; - @ObfuscatedName("cc") + public static final ClientPacket field2274; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2325; + public static final ClientPacket field2275; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2276; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2278; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2245; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2302; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2281; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2283; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2284; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2285; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2286; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2287; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2288; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2289; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2290; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2291; + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2292; @ObfuscatedName("co") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2326; + public static final ClientPacket field2293; @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2327; + public static final ClientPacket field2294; + @ObfuscatedName("cp") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2303; @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" + ) + public static final ClientPacket field2296; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2297; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2272; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2299; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2300; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lgx;" ) public static final ClientPacket field2301; @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2329; + public static final ClientPacket field2225; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2228; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2304; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2305; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2306; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2307; + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2308; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2222; + @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2310; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2311; + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2267; @ObfuscatedName("cl") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2330; - @ObfuscatedName("cw") + public static final ClientPacket field2313; + @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) - public static final ClientPacket field2331; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -642512991 + public static final ClientPacket field2322; + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "Lgx;" ) - @Export("selectedItemWidget") - static int selectedItemWidget; + public static final ClientPacket field2315; @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2316; + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2214; + @ObfuscatedName("dm") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + public static final ClientPacket field2298; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2319; + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2320; + @ObfuscatedName("dq") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2253; + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "Lgx;" + ) + static final ClientPacket field2266; + @ObfuscatedName("jm") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = -1003574001 + intValue = 660062327 ) @Export("id") final int id; - @ObfuscatedName("dx") + @ObfuscatedName("dn") @ObfuscatedGetter( - intValue = 560784993 + intValue = -787874333 ) @Export("length") final int length; static { - field2245 = new ClientPacket(0, 7); // L: 5 - field2230 = new ClientPacket(1, 9); // L: 6 - field2231 = new ClientPacket(2, 3); // L: 7 - field2232 = new ClientPacket(3, 8); // L: 8 - field2296 = new ClientPacket(4, 0); // L: 9 - field2234 = new ClientPacket(5, 1); // L: 10 - field2313 = new ClientPacket(6, 3); // L: 11 - field2236 = new ClientPacket(7, 3); // L: 12 - field2237 = new ClientPacket(8, -1); // L: 13 - field2238 = new ClientPacket(9, 15); // L: 14 - field2239 = new ClientPacket(10, 3); // L: 15 - field2241 = new ClientPacket(11, 10); // L: 16 - field2291 = new ClientPacket(12, 8); // L: 17 - field2242 = new ClientPacket(13, 3); // L: 18 - field2243 = new ClientPacket(14, 9); // L: 19 - field2244 = new ClientPacket(15, 16); // L: 20 - field2268 = new ClientPacket(16, -1); // L: 21 - field2246 = new ClientPacket(17, 7); // L: 22 - field2247 = new ClientPacket(18, 15); // L: 23 - field2248 = new ClientPacket(19, 8); // L: 24 - field2309 = new ClientPacket(20, 13); // L: 25 - field2280 = new ClientPacket(21, 8); // L: 26 - field2251 = new ClientPacket(22, 8); // L: 27 - field2252 = new ClientPacket(23, -1); // L: 28 - field2253 = new ClientPacket(24, 8); // L: 29 - field2254 = new ClientPacket(25, 8); // L: 30 - field2255 = new ClientPacket(26, 8); // L: 31 - field2256 = new ClientPacket(27, 7); // L: 32 - field2257 = new ClientPacket(28, 6); // L: 33 - field2258 = new ClientPacket(29, 8); // L: 34 - field2250 = new ClientPacket(30, 7); // L: 35 - field2292 = new ClientPacket(31, 3); // L: 36 - field2261 = new ClientPacket(32, -1); // L: 37 - field2262 = new ClientPacket(33, 4); // L: 38 - field2263 = new ClientPacket(34, -1); // L: 39 - field2289 = new ClientPacket(35, -2); // L: 40 - field2272 = new ClientPacket(36, 16); // L: 41 - field2334 = new ClientPacket(37, 4); // L: 42 - field2267 = new ClientPacket(38, 9); // L: 43 - field2302 = new ClientPacket(39, -1); // L: 44 - field2235 = new ClientPacket(40, 3); // L: 45 - field2270 = new ClientPacket(41, -1); // L: 46 - field2279 = new ClientPacket(42, 2); // L: 47 - field2333 = new ClientPacket(43, 2); // L: 48 - field2273 = new ClientPacket(44, -1); // L: 49 - field2260 = new ClientPacket(45, -1); // L: 50 - field2275 = new ClientPacket(46, 3); // L: 51 - field2276 = new ClientPacket(47, 6); // L: 52 - field2277 = new ClientPacket(48, 0); // L: 53 - field2278 = new ClientPacket(49, 3); // L: 54 - field2233 = new ClientPacket(50, 3); // L: 55 - field2287 = new ClientPacket(51, 7); // L: 56 - field2281 = new ClientPacket(52, 8); // L: 57 - field2282 = new ClientPacket(53, 7); // L: 58 - field2283 = new ClientPacket(54, 0); // L: 59 - field2284 = new ClientPacket(55, 14); // L: 60 - field2285 = new ClientPacket(56, 4); // L: 61 - field2286 = new ClientPacket(57, 8); // L: 62 - field2317 = new ClientPacket(58, 2); // L: 63 - field2328 = new ClientPacket(59, 8); // L: 64 - field2318 = new ClientPacket(60, 8); // L: 65 - field2290 = new ClientPacket(61, 5); // L: 66 - field2269 = new ClientPacket(62, 2); // L: 67 - field2264 = new ClientPacket(63, 3); // L: 68 - field2293 = new ClientPacket(64, -1); // L: 69 - field2294 = new ClientPacket(65, 8); // L: 70 - field2295 = new ClientPacket(66, 4); // L: 71 - field2229 = new ClientPacket(67, 8); // L: 72 - field2297 = new ClientPacket(68, 8); // L: 73 - field2298 = new ClientPacket(69, 0); // L: 74 - field2299 = new ClientPacket(70, -2); // L: 75 - field2300 = new ClientPacket(71, 8); // L: 76 - field2240 = new ClientPacket(72, -1); // L: 77 - field2312 = new ClientPacket(73, 3); // L: 78 - field2303 = new ClientPacket(74, -1); // L: 79 - field2304 = new ClientPacket(75, 4); // L: 80 - field2305 = new ClientPacket(76, 0); // L: 81 - field2306 = new ClientPacket(77, -1); // L: 82 - field2307 = new ClientPacket(78, 7); // L: 83 - field2308 = new ClientPacket(79, 3); // L: 84 - field2288 = new ClientPacket(80, 7); // L: 85 - field2310 = new ClientPacket(81, -1); // L: 86 - field2311 = new ClientPacket(82, -1); // L: 87 - field2265 = new ClientPacket(83, 11); // L: 88 - field2266 = new ClientPacket(84, 13); // L: 89 - field2271 = new ClientPacket(85, 11); // L: 90 - field2315 = new ClientPacket(86, -1); // L: 91 - field2316 = new ClientPacket(87, 8); // L: 92 - field2314 = new ClientPacket(88, -1); // L: 93 - field2324 = new ClientPacket(89, 7); // L: 94 - field2319 = new ClientPacket(90, -2); // L: 95 - field2320 = new ClientPacket(91, 8); // L: 96 - field2321 = new ClientPacket(92, -1); // L: 97 - field2322 = new ClientPacket(93, 13); // L: 98 - field2323 = new ClientPacket(94, 7); // L: 99 - field2249 = new ClientPacket(95, 7); // L: 100 - field2325 = new ClientPacket(96, 9); // L: 101 - field2326 = new ClientPacket(97, 8); // L: 102 - field2327 = new ClientPacket(98, 3); // L: 103 - field2301 = new ClientPacket(99, -1); // L: 104 - field2329 = new ClientPacket(100, -1); // L: 105 - field2330 = new ClientPacket(101, 16); // L: 106 - field2331 = new ClientPacket(102, 2); // L: 107 + field2279 = new ClientPacket(0, 2); // L: 5 + field2229 = new ClientPacket(1, 13); // L: 6 + field2236 = new ClientPacket(2, 0); // L: 7 + field2216 = new ClientPacket(3, 6); // L: 8 + field2217 = new ClientPacket(4, 8); // L: 9 + field2218 = new ClientPacket(5, 7); // L: 10 + field2219 = new ClientPacket(6, 14); // L: 11 + field2220 = new ClientPacket(7, -1); // L: 12 + field2247 = new ClientPacket(8, -1); // L: 13 + field2213 = new ClientPacket(9, 4); + field2223 = new ClientPacket(10, 16); + field2224 = new ClientPacket(11, -1); // L: 16 + field2215 = new ClientPacket(12, 9); // L: 17 + field2226 = new ClientPacket(13, -2); // L: 18 + field2227 = new ClientPacket(14, 8); // L: 19 + field2244 = new ClientPacket(15, 3); // L: 20 + field2221 = new ClientPacket(16, -1); // L: 21 + field2230 = new ClientPacket(17, 9); // L: 22 + field2231 = new ClientPacket(18, 8); // L: 23 + field2232 = new ClientPacket(19, 7); // L: 24 + field2258 = new ClientPacket(20, 3); // L: 25 + field2243 = new ClientPacket(21, -1); // L: 26 + field2235 = new ClientPacket(22, -1); // L: 27 + field2240 = new ClientPacket(23, 4); // L: 28 + field2295 = new ClientPacket(24, 2); // L: 29 + field2238 = new ClientPacket(25, 9); // L: 30 + field2268 = new ClientPacket(26, 8); // L: 31 + field2239 = new ClientPacket(27, 8); // L: 32 + field2241 = new ClientPacket(28, -1); // L: 33 + field2242 = new ClientPacket(29, 3); // L: 34 + field2325 = new ClientPacket(30, 8); // L: 35 + field2280 = new ClientPacket(31, 8); // L: 36 + field2237 = new ClientPacket(32, 8); // L: 37 + field2312 = new ClientPacket(33, 4); // L: 38 + field2309 = new ClientPacket(34, 3); // L: 39 + field2248 = new ClientPacket(35, 11); // L: 40 + field2249 = new ClientPacket(36, -1); // L: 41 + field2250 = new ClientPacket(37, 3); // L: 42 + field2251 = new ClientPacket(38, 3); // L: 43 + field2252 = new ClientPacket(39, -1); // L: 44 + field2257 = new ClientPacket(40, 8); // L: 45 + field2254 = new ClientPacket(41, 7); // L: 46 + field2321 = new ClientPacket(42, 13); // L: 47 + field2256 = new ClientPacket(43, -1); // L: 48 + field2234 = new ClientPacket(44, -1); // L: 49 + field2317 = new ClientPacket(45, 8); // L: 50 + field2259 = new ClientPacket(46, 15); // L: 51 + field2260 = new ClientPacket(47, 7); // L: 52 + field2261 = new ClientPacket(48, 7); // L: 53 + field2262 = new ClientPacket(49, 0); // L: 54 + field2263 = new ClientPacket(50, 8); // L: 55 + field2264 = new ClientPacket(51, 8); // L: 56 + field2265 = new ClientPacket(52, 9); // L: 57 + field2246 = new ClientPacket(53, 2); // L: 58 + field2314 = new ClientPacket(54, -1); // L: 59 + field2318 = new ClientPacket(55, 3); // L: 60 + field2269 = new ClientPacket(56, 0); // L: 61 + field2270 = new ClientPacket(57, 8); // L: 62 + field2271 = new ClientPacket(58, 0); // L: 63 + field2255 = new ClientPacket(59, 8); // L: 64 + field2273 = new ClientPacket(60, -1); // L: 65 + field2274 = new ClientPacket(61, 16); // L: 66 + field2275 = new ClientPacket(62, 3); // L: 67 + field2276 = new ClientPacket(63, 3); // L: 68 + field2277 = new ClientPacket(64, 8); // L: 69 + field2278 = new ClientPacket(65, 3); // L: 70 + field2245 = new ClientPacket(66, -1); // L: 71 + field2302 = new ClientPacket(67, -1); // L: 72 + field2281 = new ClientPacket(68, 0); // L: 73 + field2282 = new ClientPacket(69, 3); // L: 74 + field2283 = new ClientPacket(70, -2); // L: 75 + field2284 = new ClientPacket(71, 4); // L: 76 + field2285 = new ClientPacket(72, 7); // L: 77 + field2286 = new ClientPacket(73, 6); // L: 78 + field2287 = new ClientPacket(74, 11); // L: 79 + field2288 = new ClientPacket(75, -1); // L: 80 + field2289 = new ClientPacket(76, 8); // L: 81 + field2290 = new ClientPacket(77, 2); // L: 82 + field2291 = new ClientPacket(78, 3); // L: 83 + field2292 = new ClientPacket(79, 7); // L: 84 + field2293 = new ClientPacket(80, 4); // L: 85 + field2294 = new ClientPacket(81, 5); // L: 86 + field2303 = new ClientPacket(82, 7); // L: 87 + field2296 = new ClientPacket(83, 7); // L: 88 + field2297 = new ClientPacket(84, 10); // L: 89 + field2272 = new ClientPacket(85, 1); // L: 90 + field2299 = new ClientPacket(86, 8); // L: 91 + field2300 = new ClientPacket(87, -1); // L: 92 + field2301 = new ClientPacket(88, -1); // L: 93 + field2225 = new ClientPacket(89, 13); // L: 94 + field2228 = new ClientPacket(90, 3); // L: 95 + field2304 = new ClientPacket(91, 2); // L: 96 + field2305 = new ClientPacket(92, 7); // L: 97 + field2306 = new ClientPacket(93, -2); // L: 98 + field2307 = new ClientPacket(94, 16); // L: 99 + field2308 = new ClientPacket(95, 3); // L: 100 + field2222 = new ClientPacket(96, 7); // L: 101 + field2310 = new ClientPacket(97, 8); // L: 102 + field2311 = new ClientPacket(98, 8); // L: 103 + field2267 = new ClientPacket(99, -1); // L: 104 + field2313 = new ClientPacket(100, -1); // L: 105 + field2322 = new ClientPacket(101, 15); // L: 106 + field2315 = new ClientPacket(102, 8); // L: 107 + field2316 = new ClientPacket(103, -1); // L: 108 + field2214 = new ClientPacket(104, -1); // L: 109 + field2298 = new ClientPacket(105, -1); // L: 110 + field2319 = new ClientPacket(106, 15); // L: 111 + field2320 = new ClientPacket(107, 11); // L: 112 + field2253 = new ClientPacket(108, 15); // L: 113 + field2266 = new ClientPacket(109, 11); // L: 114 } ClientPacket(int var1, int var2) { - this.id = var1; // L: 112 - this.length = var2; // L: 113 - } // L: 114 + this.id = var1; // L: 119 + this.length = var2; // L: 120 + } // L: 121 - @ObfuscatedName("kl") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "83" + descriptor = "(Lhx;I)V", + garbageValue = "1140208199" ) - static void method3811(String var0) { - AccessFile.field4100 = var0; // L: 11528 + public static void method3884(Huffman var0) { + class227.huffman = var0; // L: 14 + } // L: 15 - try { - String var1 = class1.client.getParameter(Integer.toString(18)); // L: 11530 - String var2 = class1.client.getParameter(Integer.toString(13)); // L: 11531 - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11532 - if (var0.length() == 0) { // L: 11533 - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; // L: 11535 - long var6 = Tiles.currentTimeMillis() + 94608000000L; // L: 11537 - Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11539 - int var8 = Calendar.Calendar_calendar.get(7); // L: 11540 - int var9 = Calendar.Calendar_calendar.get(5); // L: 11541 - int var10 = Calendar.Calendar_calendar.get(2); // L: 11542 - int var11 = Calendar.Calendar_calendar.get(1); // L: 11543 - int var12 = Calendar.Calendar_calendar.get(11); // L: 11544 - int var13 = Calendar.Calendar_calendar.get(12); // L: 11545 - int var14 = Calendar.Calendar_calendar.get(13); // L: 11546 - String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 11547 - var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11549 + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "9" + ) + static final void method3885(int var0, int var1) { + if (Client.field820[var0] != null) { // L: 11553 + if (var1 >= 0 && var1 < Client.field820[var0].method46()) { // L: 11554 + class9 var2 = (class9)Client.field820[var0].field27.get(var1); // L: 11555 + if (var2.field66 == -1) { + PacketWriter var3 = Client.packetWriter; // L: 11557 + PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(field2214, var3.isaacCipher); // L: 11558 + var4.packetBuffer.writeByte(3 + Friend.stringCp1252NullTerminatedByteSize(var2.field65)); // L: 11559 + var4.packetBuffer.writeByte(var0); // L: 11560 + var4.packetBuffer.writeShort(var1); // L: 11561 + var4.packetBuffer.writeStringCp1252NullTerminated(var2.field65); // L: 11562 + var3.addNode(var4); // L: 11563 + } } - - class56.method928(class1.client, "document.cookie=\"" + var3 + "\""); // L: 11551 - } catch (Throwable var15) { // L: 11553 } - - } // L: 11554 + } // L: 11556 11564 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index e310c8533e..f22c34e5eb 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,54 +7,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cm") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 921813781 + intValue = -2043822785 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1342258111 + intValue = 1525185657 ) @Export("windowMode") int windowMode; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("e") - double field1072; - @ObfuscatedName("q") + @ObfuscatedName("g") + double field1304; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1550375763 + intValue = -1506536185 ) @Export("musicVolume") int musicVolume; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 625718061 + intValue = 285061551 ) @Export("soundEffectsVolume") int soundEffectsVolume; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -429932721 + intValue = 1453902285 ) @Export("areaSoundEffectsVolume") int areaSoundEffectsVolume; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("parameters") LinkedHashMap parameters; @@ -66,22 +66,22 @@ public class ClientPreferences { this.windowMode = 1; this.rememberedUsername = null; this.hideUsername = false; - this.field1072 = 0.8D; + this.field1304 = 0.8D; this.musicVolume = 127; this.soundEffectsVolume = 127; this.areaSoundEffectsVolume = 127; this.parameters = new LinkedHashMap(); - this.method1963(true); // L: 25 + this.method2215(true); // L: 25 } // L: 26 @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; // L: 15 this.rememberedUsername = null; // L: 16 this.hideUsername = false; // L: 17 - this.field1072 = 0.8D; // L: 18 + this.field1304 = 0.8D; // L: 18 this.musicVolume = 127; // L: 19 this.soundEffectsVolume = 127; // L: 20 this.areaSoundEffectsVolume = 127; // L: 21 @@ -120,32 +120,32 @@ public class ClientPreferences { } if (var2 > 6) { // L: 59 - this.field1072 = (double)var1.readUnsignedByte() / 100.0D; // L: 60 + this.field1304 = (double)var1.readUnsignedByte() / 100.0D; // L: 60 this.musicVolume = var1.readUnsignedByte(); // L: 61 this.soundEffectsVolume = var1.readUnsignedByte(); // L: 62 this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 63 } } else { - this.method1963(true); // L: 35 + this.method2215(true); // L: 35 } } else { - this.method1963(true); // L: 30 + this.method2215(true); // L: 30 } } // L: 67 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-83879013" + garbageValue = "224718677" ) - void method1963(boolean var1) { + void method2215(boolean var1) { } // L: 69 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lkx;", - garbageValue = "241772586" + descriptor = "(I)Lnu;", + garbageValue = "787030147" ) @Export("toBuffer") Buffer toBuffer() { @@ -165,76 +165,19 @@ public class ClientPreferences { var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 85 var1.writeBoolean(this.hideUsername); // L: 86 - var1.writeByte((int)(this.field1072 * 100.0D)); // L: 87 + var1.writeByte((int)(100.0D * this.field1304)); // L: 87 var1.writeByte(this.musicVolume); // L: 88 var1.writeByte(this.soundEffectsVolume); // L: 89 var1.writeByte(this.areaSoundEffectsVolume); // L: 90 return var1; // L: 91 } - @ObfuscatedName("d") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Z", - garbageValue = "433818884" + descriptor = "(IB)I", + garbageValue = "58" ) - static boolean method1972(String var0, int var1) { - return class204.method3888(var0, var1, "openjs"); // L: 55 + static int method2221(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field934 - 7.0D) * 256.0D); // L: 3465 } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(II)Lel;", - garbageValue = "1792916984" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 187 - if (var1 != null) { // L: 188 - return var1; - } else { - var1 = class171.loadFrames(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 189 - if (var1 != null) { // L: 190 - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - - return var1; // L: 191 - } - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "(Lhz;III)V", - garbageValue = "1981013350" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { // L: 9991 - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { // L: 9992 - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { // L: 9993 - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { // L: 9994 - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { // L: 9995 - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9996 - } - - if (var0.yAlignment == 0) { // L: 9997 - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { // L: 9998 - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { // L: 9999 - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; // L: 10000 - } else if (var0.yAlignment == 4) { // L: 10001 - var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10002 - } - - } // L: 10003 -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 3c040340d5..d35382e5a1 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,47 +1,94 @@ import 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("fm") +@ObfuscatedName("et") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("rd") - @ObfuscatedGetter( - intValue = -1841661257 - ) - static int field2079; - Clock() { } // L: 4 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "46" + descriptor = "(S)V", + garbageValue = "-629" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1861957348" + garbageValue = "1172254968" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkx;Ljava/lang/String;B)I", - garbageValue = "-59" + descriptor = "(I)V", + garbageValue = "-1662768639" ) - public static int method3721(Buffer var0, String var1) { - int var2 = var0.offset; // L: 14 - byte[] var3 = class3.method40(var1); // L: 15 - var0.writeSmartByteShort(var3.length); // L: 16 - var0.offset += class219.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 17 - return var0.offset - var2; // L: 18 - } + public static void method2600() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 177 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 178 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 179 + } // L: 180 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "765268969" + ) + public static void method2610() { + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 578 + } // L: 579 + + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "([Lhu;II)V", + garbageValue = "974266875" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10884 + Widget var3 = var0[var2]; // L: 10885 + if (var3 != null) { // L: 10886 + if (var3.type == 0) { // L: 10887 + if (var3.children != null) { // L: 10888 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10889 + if (var4 != null) { // L: 10890 + class379.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 10892 + var5 = new ScriptEvent(); // L: 10893 + var5.widget = var3; // L: 10894 + var5.args = var3.onDialogAbort; // L: 10895 + class19.runScriptEvent(var5); // L: 10896 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 10898 + if (var3.childIndex >= 0) { // L: 10899 + Widget var6 = class139.getWidget(var3.id); // L: 10900 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10901 + continue; + } + } + + var5 = new ScriptEvent(); // L: 10905 + var5.widget = var3; // L: 10906 + var5.args = var3.onSubChange; // L: 10907 + class19.runScriptEvent(var5); // L: 10908 + } + } + } + + } // L: 10911 } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 3a2989c7c5..48f2d4bf73 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -1,214 +1,210 @@ +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("fe") +@ObfuscatedName("el") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("df") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("lt") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1808684023 + intValue = -1593965705 ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("ak") + public static int field1535; + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 406113531 + intValue = -1207023295 ) @Export("xInset") public int xInset; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 954576471 + intValue = 1514809971 ) @Export("yInset") public int yInset; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 359679375 + intValue = 1497188267 ) @Export("xSize") int xSize; - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1511754603 + intValue = 703180001 ) @Export("ySize") int ySize; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @Export("flags") public int[][] flags; public CollisionMap(int var1, int var2) { this.xInset = 0; // L: 44 - this.yInset = 0; // L: 45 - this.xSize = var1; // L: 46 + this.yInset = 0; + this.xSize = var1; this.ySize = var2; // L: 47 - this.flags = new int[this.xSize][this.ySize]; // L: 48 + this.flags = new int[this.xSize][this.ySize]; this.clear(); // L: 49 - } // L: 50 + } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "202465508" + garbageValue = "147847129" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.xSize; ++var1) { // L: 53 + for (int var1 = 0; var1 < this.xSize; ++var1) { 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 + if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { + this.flags[var1][var2] = 16777216; } else { this.flags[var1][var2] = 16777215; } } } - } // L: 59 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-1197529454" + garbageValue = "-1236206296" ) - public void method3749(int var1, int var2, int var3, int var4, boolean var5) { + public void method2613(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 + var2 -= this.yInset; + if (var3 == 0) { + if (var4 == 0) { + this.setFlag(var1, var2, 128); + this.setFlag(var1 - 1, var2, 8); } if (var4 == 1) { // L: 69 - this.setFlag(var1, var2, 2); // L: 70 - this.setFlag(var1, var2 + 1, 32); // L: 71 + this.setFlag(var1, var2, 2); + this.setFlag(var1, var2 + 1, 32); } - if (var4 == 2) { // L: 73 - this.setFlag(var1, var2, 8); // L: 74 - this.setFlag(var1 + 1, var2, 128); // L: 75 + if (var4 == 2) { + this.setFlag(var1, var2, 8); + this.setFlag(var1 + 1, var2, 128); } if (var4 == 3) { // L: 77 - this.setFlag(var1, var2, 32); // L: 78 - this.setFlag(var1, var2 - 1, 2); // L: 79 + this.setFlag(var1, var2, 32); + this.setFlag(var1, var2 - 1, 2); } } - if (var3 == 1 || var3 == 3) { // L: 82 - if (var4 == 0) { // L: 83 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { this.setFlag(var1, var2, 1); // L: 84 - this.setFlag(var1 - 1, var2 + 1, 16); // L: 85 + this.setFlag(var1 - 1, var2 + 1, 16); } - if (var4 == 1) { // L: 87 - this.setFlag(var1, var2, 4); // L: 88 - this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 + if (var4 == 1) { + this.setFlag(var1, var2, 4); + this.setFlag(var1 + 1, var2 + 1, 64); } - if (var4 == 2) { // L: 91 - this.setFlag(var1, var2, 16); // L: 92 + if (var4 == 2) { + this.setFlag(var1, var2, 16); this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 } - if (var4 == 3) { // L: 95 - this.setFlag(var1, var2, 64); // L: 96 + if (var4 == 3) { + this.setFlag(var1, var2, 64); this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 } } - if (var3 == 2) { // L: 100 - if (var4 == 0) { // L: 101 + if (var3 == 2) { + if (var4 == 0) { this.setFlag(var1, var2, 130); // L: 102 - this.setFlag(var1 - 1, var2, 8); // L: 103 - this.setFlag(var1, var2 + 1, 32); // L: 104 + this.setFlag(var1 - 1, var2, 8); + this.setFlag(var1, var2 + 1, 32); } - if (var4 == 1) { // L: 106 + if (var4 == 1) { this.setFlag(var1, var2, 10); // L: 107 this.setFlag(var1, var2 + 1, 32); // L: 108 - this.setFlag(var1 + 1, var2, 128); // L: 109 + this.setFlag(var1 + 1, var2, 128); } - if (var4 == 2) { // L: 111 - this.setFlag(var1, var2, 40); // L: 112 + if (var4 == 2) { + this.setFlag(var1, var2, 40); this.setFlag(var1 + 1, var2, 128); // L: 113 this.setFlag(var1, var2 - 1, 2); // L: 114 } - if (var4 == 3) { // L: 116 - this.setFlag(var1, var2, 160); // L: 117 - this.setFlag(var1, var2 - 1, 2); // L: 118 - this.setFlag(var1 - 1, var2, 8); // L: 119 + if (var4 == 3) { + this.setFlag(var1, var2, 160); + this.setFlag(var1, var2 - 1, 2); + this.setFlag(var1 - 1, var2, 8); } } - if (var5) { // L: 122 - if (var3 == 0) { // L: 123 - if (var4 == 0) { // L: 124 + if (var5) { + if (var3 == 0) { + if (var4 == 0) { this.setFlag(var1, var2, 65536); // L: 125 this.setFlag(var1 - 1, var2, 4096); // L: 126 } if (var4 == 1) { // L: 128 this.setFlag(var1, var2, 1024); // L: 129 - this.setFlag(var1, var2 + 1, 16384); // L: 130 + this.setFlag(var1, var2 + 1, 16384); } - if (var4 == 2) { // L: 132 + if (var4 == 2) { this.setFlag(var1, var2, 4096); // L: 133 - this.setFlag(var1 + 1, var2, 65536); // L: 134 + this.setFlag(var1 + 1, var2, 65536); } - if (var4 == 3) { // L: 136 + if (var4 == 3) { this.setFlag(var1, var2, 16384); // L: 137 - this.setFlag(var1, var2 - 1, 1024); // L: 138 + this.setFlag(var1, var2 - 1, 1024); } } - if (var3 == 1 || var3 == 3) { // L: 141 - if (var4 == 0) { // L: 142 + if (var3 == 1 || var3 == 3) { + if (var4 == 0) { this.setFlag(var1, var2, 512); // L: 143 - this.setFlag(var1 - 1, var2 + 1, 8192); // L: 144 + this.setFlag(var1 - 1, var2 + 1, 8192); } - if (var4 == 1) { // L: 146 + if (var4 == 1) { this.setFlag(var1, var2, 2048); // L: 147 this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148 } if (var4 == 2) { // L: 150 - this.setFlag(var1, var2, 8192); // L: 151 - this.setFlag(var1 + 1, var2 - 1, 512); // L: 152 + this.setFlag(var1, var2, 8192); + this.setFlag(var1 + 1, var2 - 1, 512); } - if (var4 == 3) { // L: 154 + if (var4 == 3) { this.setFlag(var1, var2, 32768); // L: 155 - this.setFlag(var1 - 1, var2 - 1, 2048); // L: 156 + this.setFlag(var1 - 1, var2 - 1, 2048); } } - if (var3 == 2) { // L: 159 - if (var4 == 0) { // L: 160 - this.setFlag(var1, var2, 66560); // L: 161 - this.setFlag(var1 - 1, var2, 4096); // L: 162 + if (var3 == 2) { + if (var4 == 0) { + this.setFlag(var1, var2, 66560); + this.setFlag(var1 - 1, var2, 4096); this.setFlag(var1, var2 + 1, 16384); // L: 163 } - if (var4 == 1) { // L: 165 - this.setFlag(var1, var2, 5120); // L: 166 + if (var4 == 1) { + this.setFlag(var1, var2, 5120); this.setFlag(var1, var2 + 1, 16384); // L: 167 - this.setFlag(var1 + 1, var2, 65536); // L: 168 + this.setFlag(var1 + 1, var2, 65536); } if (var4 == 2) { // L: 170 @@ -217,30 +213,30 @@ public class CollisionMap { this.setFlag(var1, var2 - 1, 1024); // L: 173 } - if (var4 == 3) { // L: 175 + if (var4 == 3) { this.setFlag(var1, var2, 81920); // L: 176 this.setFlag(var1, var2 - 1, 1024); // L: 177 - this.setFlag(var1 - 1, var2, 4096); // L: 178 + this.setFlag(var1 - 1, var2, 4096); } } } } // L: 182 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-524306614" + garbageValue = "-1542434714" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { - int var6 = 256; // L: 185 - if (var5) { // L: 186 + int var6 = 256; + if (var5) { var6 += 131072; } - var1 -= this.xInset; // L: 187 - var2 -= this.yInset; // L: 188 + var1 -= this.xInset; + var2 -= this.yInset; for (int var7 = var1; var7 < var3 + var1; ++var7) { // L: 189 if (var7 >= 0 && var7 < this.xSize) { // L: 190 @@ -252,57 +248,57 @@ public class CollisionMap { } } - } // L: 196 + } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-190427949" + descriptor = "(IIB)V", + garbageValue = "2" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { - var1 -= this.xInset; // L: 199 - var2 -= this.yInset; // L: 200 + var1 -= this.xInset; + var2 -= this.yInset; int[] var10000 = this.flags[var1]; // L: 201 var10000[var2] |= 2097152; } // L: 202 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1930968557" + garbageValue = "1437580764" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { - var1 -= this.xInset; // L: 205 - var2 -= this.yInset; // L: 206 - int[] var10000 = this.flags[var1]; // L: 207 + var1 -= this.xInset; + var2 -= this.yInset; + int[] var10000 = this.flags[var1]; var10000[var2] |= 262144; - } // L: 208 + } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "1183739500" + garbageValue = "-1947097076" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; // L: 211 + int[] var10000 = this.flags[var1]; var10000[var2] |= var3; - } // L: 212 + } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-118204308" + garbageValue = "1853032959" ) - public void method3755(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; // L: 215 - var2 -= this.yInset; // L: 216 + public void method2616(int var1, int var2, int var3, int var4, boolean var5) { + var1 -= this.xInset; + var2 -= this.yInset; 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 == 0) { + this.setFlagOff(var1, var2, 128); + this.setFlagOff(var1 - 1, var2, 8); } if (var4 == 1) { // L: 222 @@ -443,10 +439,10 @@ public class CollisionMap { } // L: 335 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIIIIZI)V", - garbageValue = "-60481417" + garbageValue = "792603684" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -476,10 +472,10 @@ public class CollisionMap { } // L: 354 - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1684469996" + descriptor = "(IIIB)V", + garbageValue = "7" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -487,24 +483,254 @@ public class CollisionMap { var10000[var2] &= ~var3; } // L: 358 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "50" + descriptor = "(III)V", + garbageValue = "-1556531543" ) - public void method3758(int var1, int var2) { + public void method2621(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("d") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-425631608" + descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-1545015307" ) - public static boolean method3781(int var0) { - return (var0 >> 20 & 1) != 0; // L: 17 + @Export("findAndLoadCache") + public static void findAndLoadCache(String var0, String var1, int var2, int var3) throws IOException { + JagexCache.idxCount = var3; // L: 40 + class20.cacheGamebuild = var2; // L: 41 + + try { + Varps.operatingSystemName = System.getProperty("os.name"); // L: 43 + } catch (Exception var29) { // L: 45 + Varps.operatingSystemName = "Unknown"; // L: 46 + } + + Decimator.formattedOperatingSystemName = Varps.operatingSystemName.toLowerCase(); // L: 48 + + try { + Canvas.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (Canvas.userHomeDirectory != null) { // L: 51 + Canvas.userHomeDirectory = Canvas.userHomeDirectory + "/"; + } + } catch (Exception var28) { // L: 53 + } + + try { + if (Decimator.formattedOperatingSystemName.startsWith("win")) { // L: 55 + if (Canvas.userHomeDirectory == null) { // L: 56 + Canvas.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (Canvas.userHomeDirectory == null) { // L: 59 + Canvas.userHomeDirectory = System.getenv("HOME"); + } + + if (Canvas.userHomeDirectory != null) { // L: 61 + Canvas.userHomeDirectory = Canvas.userHomeDirectory + "/"; + } + } catch (Exception var27) { // L: 63 + } + + if (Canvas.userHomeDirectory == null) { // L: 64 + Canvas.userHomeDirectory = "~/"; + } + + IntHashTable.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", Canvas.userHomeDirectory, "/tmp/", ""}; // L: 65 + class311.cacheSubPaths = new String[]{".jagex_cache_" + class20.cacheGamebuild, ".file_store_" + class20.cacheGamebuild}; // L: 66 + int var18 = 0; + + label277: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; // L: 70 + JagexCache.JagexCache_locationFile = new File(Canvas.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 var36; + if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 + try { + AccessFile var10 = new AccessFile(JagexCache.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 var32) { // L: 100 + var32.printStackTrace(); // L: 101 + } + + if (var7 != null) { // L: 103 + var36 = new File(var7); // L: 104 + if (!var36.exists()) { // L: 105 + var7 = null; // L: 106 + } + } + + if (var7 != null) { // L: 109 + var36 = new File(var7, "test.dat"); // L: 110 + if (!MouseHandler.isWriteable(var36, true)) { // L: 111 + var7 = null; // L: 112 + } + } + } + + if (var7 == null && var18 == 0) { // L: 116 + label252: + for (int var19 = 0; var19 < class311.cacheSubPaths.length; ++var19) { // L: 117 + for (int var20 = 0; var20 < IntHashTable.cacheParentPaths.length; ++var20) { // L: 118 + File var21 = new File(IntHashTable.cacheParentPaths[var20] + class311.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119 + if (var21.exists() && MouseHandler.isWriteable(new File(var21, "test.dat"), true)) { // L: 120 121 + var7 = var21.toString(); // L: 122 + var9 = true; // L: 123 + break label252; // L: 124 + } + } + } + } + + if (var7 == null) { // L: 130 + var7 = Canvas.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 var35 = new File(var8); // L: 135 + var36 = new File(var7); // L: 136 + + try { + File[] var39 = var35.listFiles(); // L: 138 + File[] var22 = var39; // L: 140 + + for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141 + File var15 = var22[var14]; // L: 142 + File var16 = new File(var36, var15.getName()); // L: 144 + boolean var17 = var15.renameTo(var16); // L: 145 + if (!var17) { // L: 146 + throw new IOException(); + } + } + } catch (Exception var31) { // L: 151 + var31.printStackTrace(); // L: 152 + } + + var9 = true; // L: 154 + } + + if (var9) { // L: 156 + BuddyRankComparator.method2475(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[] var34 = JagexCache.cacheDir.listFiles(); // L: 161 + if (var34 != null) { // L: 162 + File[] var37 = var34; // L: 164 + + for (int var23 = 0; var23 < var37.length; ++var23) { // L: 165 + File var24 = var37[var23]; // L: 166 + if (!MouseHandler.isWriteable(var24, false)) { // L: 168 + ++var18; // L: 67 + continue label277; + } + } + } + break; + } + + InvDefinition.assertCacheDirExists(JagexCache.cacheDir); // L: 175 + + try { + File var4 = new File(Canvas.userHomeDirectory, "random.dat"); // L: 178 + int var26; + if (var4.exists()) { // L: 179 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 180 + } else { + label205: + for (int var25 = 0; var25 < class311.cacheSubPaths.length; ++var25) { // L: 183 + for (var26 = 0; var26 < IntHashTable.cacheParentPaths.length; ++var26) { // L: 184 + File var38 = new File(IntHashTable.cacheParentPaths[var26] + class311.cacheSubPaths[var25] + File.separatorChar + "random.dat"); // L: 185 + if (var38.exists()) { // L: 186 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var38, "rw", 25L), 24, 0); // L: 187 + break label205; // L: 188 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 193 + RandomAccessFile var33 = new RandomAccessFile(var4, "rw"); // L: 194 + var26 = var33.read(); // L: 195 + var33.seek(0L); // L: 196 + var33.write(var26); // L: 197 + var33.seek(0L); // L: 198 + var33.close(); // L: 199 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var4, "rw", 25L), 24, 0); // L: 200 + } + } catch (IOException var30) { // L: 203 + } + + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class18.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 205 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class18.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 206 + PendingSpawn.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 207 + + for (var18 = 0; var18 < JagexCache.idxCount; ++var18) { // L: 208 + PendingSpawn.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(class18.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 209 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lig;IB)V", + garbageValue = "-121" + ) + static void method2622(Archive var0, int var1) { + if (BuddyRankComparator.NetCache_reference != null) { // L: 211 + BuddyRankComparator.NetCache_reference.offset = var1 * 8 + 5; // L: 212 + int var2 = BuddyRankComparator.NetCache_reference.readInt(); // L: 213 + int var3 = BuddyRankComparator.NetCache_reference.readInt(); // L: 214 + var0.loadIndex(var2, var3); // L: 215 + } else { + Canvas.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 218 + NetCache.NetCache_archives[var1] = var0; // L: 219 + } + } // L: 216 220 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 3800341775..d45348c4fc 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,32 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hk") @Implements("Coord") public class Coord { - @ObfuscatedName("q") - static int[] field2560; - @ObfuscatedName("n") + @ObfuscatedName("ov") + @ObfuscatedSignature( + descriptor = "Lmk;" + ) + static class338 field2591; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1010419141 + intValue = -227225909 ) @Export("plane") public int plane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1636543291 + intValue = -2147189971 ) @Export("x") public int x; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1486415971 + intValue = 5380173 ) @Export("y") public int y; @ObfuscatedSignature( - descriptor = "(Lhd;)V" + descriptor = "(Lhk;)V" ) public Coord(Coord var1) { this.plane = var1.plane; // L: 15 @@ -54,20 +57,20 @@ public class Coord { } // L: 27 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "71745539" + garbageValue = "-1365130911" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; // L: 30 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lhd;S)Z", - garbageValue = "144" + descriptor = "(Lhk;I)Z", + garbageValue = "-1711331725" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -80,14 +83,18 @@ public class Coord { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", - garbageValue = "31" + garbageValue = "-9" ) @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); + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 55 + } + + public int hashCode() { + return this.packed(); // L: 47 } public boolean equals(Object var1) { @@ -98,47 +105,7 @@ public class Coord { } } - public int hashCode() { - return this.packed(); // L: 47 - } - public String toString() { return this.toString(","); // L: 51 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1310695522" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; // L: 54 - if (var0 < 0 || var0 >= 65536) { // L: 55 - var0 >>>= 16; // L: 56 - var1 += 16; // L: 57 - } - - if (var0 >= 256) { // L: 59 - var0 >>>= 8; // L: 60 - var1 += 8; // L: 61 - } - - if (var0 >= 16) { // L: 63 - var0 >>>= 4; // L: 64 - var1 += 4; // L: 65 - } - - if (var0 >= 4) { // L: 67 - var0 >>>= 2; // L: 68 - var1 += 2; // L: 69 - } - - if (var0 >= 1) { // L: 71 - var0 >>>= 1; // L: 72 - ++var1; // L: 73 - } - - return var0 + var1; // L: 75 - } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index fa0bb17b02..41e5d5ec6c 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -4,218 +4,259 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("by") @Implements("Decimator") public class Decimator { - @ObfuscatedName("rl") - @ObfuscatedGetter( - intValue = -1699590005 + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Let;" ) - static int field1475; - @ObfuscatedName("eu") + @Export("clock") + protected static Clock clock; + @ObfuscatedName("z") + @Export("formattedOperatingSystemName") + public static String formattedOperatingSystemName; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 18883239 - ) - static int field1480; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 1921433287 + intValue = -1135278343 ) @Export("inputRate") int inputRate; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1053329407 + intValue = -463713673 ) @Export("outputRate") int outputRate; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { // L: 14 - int var4 = var1; // L: 16 - int var5 = var2; // L: 17 - if (var2 > var1) { // L: 19 - var4 = var2; // L: 21 - var5 = var1; // L: 22 - } + int var3 = GrandExchangeOfferUnitPriceComparator.method4652(var1, var2); // L: 15 + var1 /= var3; // L: 16 + var2 /= var3; // L: 17 + this.inputRate = var1; // L: 18 + this.outputRate = var2; + this.table = new int[var1][14]; - while (var5 != 0) { // L: 24 - int var6 = var4 % var5; // L: 25 - var4 = var5; // L: 26 - var5 = var6; // L: 27 - } - - var1 /= var4; // L: 32 - var2 /= var4; // L: 33 - this.inputRate = var1; // L: 34 - this.outputRate = var2; // L: 35 - this.table = new int[var1][14]; // L: 36 - - for (int var7 = 0; var7 < var1; ++var7) { // L: 37 - int[] var8 = this.table[var7]; // L: 38 - double var9 = (double)var7 / (double)var1 + 6.0D; // L: 39 - int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); // L: 40 - if (var11 < 0) { // L: 41 - var11 = 0; + for (int var4 = 0; var4 < var1; ++var4) { + int[] var5 = this.table[var4]; + double var6 = (double)var4 / (double)var1 + 6.0D; + int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); + if (var8 < 0) { + var8 = 0; } - int var12 = (int)Math.ceil(var9 + 7.0D); // L: 42 - if (var12 > 14) { // L: 43 - var12 = 14; + int var9 = (int)Math.ceil(7.0D + var6); + if (var9 > 14) { + var9 = 14; } - for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { // L: 44 45 - double var15 = ((double)var11 - var9) * 3.141592653589793D; // L: 46 - double var17 = var13; // L: 47 - if (var15 < -1.0E-4D || var15 > 1.0E-4D) { // L: 48 - var17 = var13 * (Math.sin(var15) / var15); + for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { + double var12 = ((double)var8 - var6) * 3.141592653589793D; + double var14 = var10; + if (var12 < -1.0E-4D || var12 > 1.0E-4D) { + var14 = var10 * (Math.sin(var12) / var12); } - var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); // L: 49 - var8[var11] = (int)Math.floor(var17 * 65536.0D + 0.5D); // L: 50 + var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); + var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14); } } } - } // L: 53 + } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([BI)[B", - garbageValue = "-153024312" + garbageValue = "-867512678" ) @Export("resample") byte[] resample(byte[] var1) { - if (this.table != null) { // L: 56 - int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 57 - int[] var3 = new int[var2]; // L: 58 - int var4 = 0; // L: 59 - int var5 = 0; // L: 60 + if (this.table != null) { + int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; + int[] var3 = new int[var2]; + int var4 = 0; + int var5 = 0; // L: 44 int var6; - for (var6 = 0; var6 < var1.length; ++var6) { // L: 61 - byte var7 = var1[var6]; // L: 62 - int[] var8 = this.table[var5]; // L: 63 + for (var6 = 0; var6 < var1.length; ++var6) { + byte var7 = var1[var6]; + int[] var8 = this.table[var5]; int var9; - for (var9 = 0; var9 < 14; ++var9) { // L: 64 - var3[var9 + var4] += var7 * var8[var9]; + for (var9 = 0; var9 < 14; ++var9) { + var3[var4 + var9] += var7 * var8[var9]; } - var5 += this.outputRate; // L: 65 - var9 = var5 / this.inputRate; // L: 66 - var4 += var9; // L: 67 - var5 -= var9 * this.inputRate; // L: 68 + var5 += this.outputRate; + var9 = var5 / this.inputRate; + var4 += var9; + var5 -= var9 * this.inputRate; } - var1 = new byte[var2]; // L: 70 + var1 = new byte[var2]; - for (var6 = 0; var6 < var2; ++var6) { // L: 71 - int var10 = var3[var6] + 32768 >> 16; // L: 72 - if (var10 < -128) { // L: 73 + for (var6 = 0; var6 < var2; ++var6) { // L: 55 + int var10 = var3[var6] + 32768 >> 16; + if (var10 < -128) { var1[var6] = -128; - } else if (var10 > 127) { // L: 74 + } else if (var10 > 127) { var1[var6] = 127; } else { - var1[var6] = (byte)var10; // L: 75 + var1[var6] = (byte)var10; } } } - return var1; // L: 78 + return var1; } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-128" + descriptor = "(II)I", + garbageValue = "-649772260" ) @Export("scaleRate") int scaleRate(int var1) { if (this.table != null) { - var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate); // L: 82 + var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate); } - return var1; // L: 83 + return var1; } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "0" + descriptor = "(II)I", + garbageValue = "546685264" ) @Export("scalePosition") int scalePosition(int var1) { - if (this.table != null) { // L: 87 + if (this.table != null) { var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; } - return var1; // L: 88 + return var1; } - @ObfuscatedName("x") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1972966178" + descriptor = "(IILeb;Lel;B)Z", + garbageValue = "105" ) - static void method2704() { - if (WorldMapData_0.loadWorlds()) { // L: 1569 - Login.worldSelectOpen = true; // L: 1570 - Login.worldSelectPage = 0; // L: 1571 - Login.worldSelectPagesCount = 0; // L: 1572 - } + public static final boolean method1113(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 19 + int var5 = var1; // L: 20 + byte var6 = 64; // L: 21 + byte var7 = 64; // L: 22 + int var8 = var0 - var6; // L: 23 + int var9 = var1 - var7; // L: 24 + class137.directions[var6][var7] = 99; // L: 25 + class137.distances[var6][var7] = 0; // L: 26 + byte var10 = 0; // L: 27 + int var11 = 0; // L: 28 + class137.bufferX[var10] = var0; // L: 29 + byte var10001 = var10; + int var18 = var10 + 1; + class137.bufferY[var10001] = var1; // L: 30 + int[][] var12 = var3.flags; // L: 31 - } // L: 1574 + while (var11 != var18) { // L: 32 + var4 = class137.bufferX[var11]; // L: 33 + var5 = class137.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 + Messages.field1377 = var4; // L: 41 + CollisionMap.field1535 = var5; // L: 42 + return true; // L: 43 + } - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "909165860" - ) - static final void method2708() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4312 4313 4330 - if (var0.plane == class90.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4314 - if (Client.cycle >= var0.cycleStart) { // L: 4315 - if (var0.targetIndex > 0) { // L: 4316 - NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4317 - if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4318 - var0.setDestination(var1.x, var1.y, WorldMapRegion.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } + int var15 = class137.distances[var16][var17] + 1; // L: 45 + if (var16 > 0 && class137.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 46 47 48 49 + class137.bufferX[var18] = var4 - 1; // L: 50 + class137.bufferY[var18] = var5; // L: 51 + var18 = var18 + 1 & 4095; // L: 52 + class137.directions[var16 - 1][var17] = 2; // L: 53 + class137.distances[var16 - 1][var17] = var15; // L: 54 + } - if (var0.targetIndex < 0) { // L: 4320 - int var2 = -var0.targetIndex - 1; // L: 4322 - Player var3; - if (var2 == Client.localPlayerIndex) { // L: 4323 - var3 = UserComparator9.localPlayer; - } else { - var3 = Client.players[var2]; // L: 4324 - } + if (var16 < 126 && class137.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 56 + class137.bufferX[var18] = var4 + 1; // L: 60 + class137.bufferY[var18] = var5; // L: 61 + var18 = var18 + 1 & 4095; // L: 62 + class137.directions[var16 + 1][var17] = 8; // L: 63 + class137.distances[var16 + 1][var17] = var15; // L: 64 + } - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, WorldMapRegion.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4325 - } - } + if (var17 > 0 && class137.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 66 67 68 69 + class137.bufferX[var18] = var4; // L: 70 + class137.bufferY[var18] = var5 - 1; // L: 71 + var18 = var18 + 1 & 4095; // L: 72 + class137.directions[var16][var17 - 1] = 1; // L: 73 + class137.distances[var16][var17 - 1] = var15; // L: 74 + } - var0.advance(Client.field808); // L: 4327 - MilliClock.scene.drawEntity(class90.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4328 - } - } else { - var0.remove(); + if (var17 < 126 && class137.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 76 77 78 79 + class137.bufferX[var18] = var4; // L: 80 + class137.bufferY[var18] = var5 + 1; // L: 81 + var18 = var18 + 1 & 4095; // L: 82 + class137.directions[var16][var17 + 1] = 4; // L: 83 + class137.distances[var16][var17 + 1] = var15; // L: 84 + } + + if (var16 > 0 && var17 > 0 && class137.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 + class137.bufferX[var18] = var4 - 1; // L: 91 + class137.bufferY[var18] = var5 - 1; // L: 92 + var18 = var18 + 1 & 4095; // L: 93 + class137.directions[var16 - 1][var17 - 1] = 3; // L: 94 + class137.distances[var16 - 1][var17 - 1] = var15; // L: 95 + } + + if (var16 < 126 && var17 > 0 && class137.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 + class137.bufferX[var18] = var4 + 1; // L: 102 + class137.bufferY[var18] = var5 - 1; // L: 103 + var18 = var18 + 1 & 4095; // L: 104 + class137.directions[var16 + 1][var17 - 1] = 9; // L: 105 + class137.distances[var16 + 1][var17 - 1] = var15; // L: 106 + } + + if (var16 > 0 && var17 < 126 && class137.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 + class137.bufferX[var18] = var4 - 1; // L: 113 + class137.bufferY[var18] = var5 + 1; // L: 114 + var18 = var18 + 1 & 4095; // L: 115 + class137.directions[var16 - 1][var17 + 1] = 6; // L: 116 + class137.distances[var16 - 1][var17 + 1] = var15; // L: 117 + } + + if (var16 < 126 && var17 < 126 && class137.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 + class137.bufferX[var18] = var4 + 1; // L: 124 + class137.bufferY[var18] = var5 + 1; // L: 125 + var18 = var18 + 1 & 4095; // L: 126 + class137.directions[var16 + 1][var17 + 1] = 12; // L: 127 + class137.distances[var16 + 1][var17 + 1] = var15; // L: 128 } } - } // L: 4332 + Messages.field1377 = var4; // L: 131 + CollisionMap.field1535 = var5; // L: 132 + return false; // L: 133 + } - @ObfuscatedName("jk") - static final void method2707(double var0) { - Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11084 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11085 - WorldMapData_0.method239(); // L: 11086 - WorldMapSectionType.clientPreferences.field1072 = var0; // L: 11087 - class23.savePreferences(); // L: 11088 - } // L: 11089 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;Lir;I)V", + garbageValue = "-269408259" + ) + public static void method1114(AbstractArchive var0, AbstractArchive var1) { + NPCComposition.NpcDefinition_archive = var0; // L: 57 + NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 + } // L: 59 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 3cb2792217..87541e17a3 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,32 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lw") +@ObfuscatedName("lh") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Llh;" ) - static final DefaultsGroup field3837; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "[[Lhz;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("v") + static final DefaultsGroup field3896; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1717211989 + intValue = 1622336411 ) @Export("group") final int group; static { - field3837 = new DefaultsGroup(3); // L: 4 + field3896 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { this.group = var1; // L: 8 } // L: 9 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1657945115" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 + } } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 431187e0ac..7eedf4065d 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,32 +3,32 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("go") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("capacity") int capacity; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("remaining") int remaining; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljw;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Lgu;" ) - class155 field1976; + class195 field2204; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); // L: 11 @@ -42,7 +42,7 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); // L: 19 } // L: 20 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 23 @@ -73,16 +73,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 48 this.removeWrapper(var3); // L: 49 } // L: 50 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lfa;)V" + descriptor = "(Lgm;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -94,63 +94,64 @@ public final class DemotingHashTable { } // L: 58 - @ObfuscatedName("c") + @ObfuscatedName("p") + public void method3825(Object var1, long var2) { + this.put(var1, var2, 1); // L: 61 + } // L: 62 + + @ObfuscatedName("b") @Export("put") public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { // L: 61 - throw new IllegalStateException(); - } else { - this.remove(var2); // L: 62 - this.remaining -= var4; // L: 63 + this.remove(var2); // L: 66 + this.remaining -= var4; // L: 67 - while (this.remaining < 0) { // L: 64 - Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 65 - if (var5 == null) { // L: 66 - throw new RuntimeException(""); // L: 67 - } - - if (!var5.isSoft()) { // L: 69 - } - - this.removeWrapper(var5); // L: 70 - if (this.field1976 != null) { // L: 71 - this.field1976.method3493(var5.get()); // L: 72 - } + while (this.remaining < 0) { // L: 68 + Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 69 + if (var5 == null) { // L: 70 + throw new RuntimeException(""); // L: 71 } - DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 75 - this.hashTable.put(var6, var2); // L: 76 - this.queue.add(var6); // L: 77 - var6.keyDual = 0L; // L: 78 - } - } // L: 79 + if (!var5.isSoft()) { // L: 73 + } - @ObfuscatedName("y") + this.removeWrapper(var5); // L: 74 + if (this.field2204 != null) { // L: 75 + this.field2204.method3814(var5.get()); // L: 76 + } + } + + DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 79 + this.hashTable.put(var6, var2); // L: 80 + this.queue.add(var6); // L: 81 + var6.keyDual = 0L; // L: 82 + } // L: 83 + + @ObfuscatedName("e") @Export("demote") public void demote(int var1) { - for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 82 - if (var2.isSoft()) { // L: 83 - if (var2.get() == null) { // L: 84 - var2.remove(); // L: 85 - var2.removeDual(); // L: 86 - this.remaining += var2.size; // L: 87 + for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 86 + if (var2.isSoft()) { // L: 87 + if (var2.get() == null) { // L: 88 + var2.remove(); // L: 89 + var2.removeDual(); // L: 90 + this.remaining += var2.size; // L: 91 } - } else if (++var2.keyDual > (long)var1) { // L: 92 - SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 93 - this.hashTable.put(var3, var2.key); // L: 94 - IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 95 - var2.remove(); // L: 96 - var2.removeDual(); // L: 97 + } else if (++var2.keyDual > (long)var1) { // L: 96 + SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 97 + this.hashTable.put(var3, var2.key); // L: 98 + IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 99 + var2.remove(); // L: 100 + var2.removeDual(); // L: 101 } } - } // L: 101 + } // L: 105 - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("clear") public void clear() { - this.queue.clear(); // L: 104 - this.hashTable.clear(); // L: 105 - this.remaining = this.capacity; // L: 106 - } // L: 107 + this.queue.clear(); // L: 108 + this.hashTable.clear(); // L: 109 + this.remaining = this.capacity; // L: 110 + } // L: 111 } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 849b5b3cb0..272a46489c 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,38 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("mn") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1161776031 + intValue = -587651233 ) - int field3937; - @ObfuscatedName("y") + int field3943; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1334910237 + intValue = -639501997 ) - int field3941; - @ObfuscatedName("h") + int field3944; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1711664603 + intValue = 1652165209 ) - int field3939; + int field3948; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lmn;", - garbageValue = "583399336" + descriptor = "(I)Lmo;", + garbageValue = "-740064176" ) @Export("get") public PlatformInfo get() { byte var1; - if (GZipDecompressor.formattedOperatingSystemName.startsWith("win")) { // L: 15 + if (Decimator.formattedOperatingSystemName.startsWith("win")) { // L: 15 var1 = 1; - } else if (GZipDecompressor.formattedOperatingSystemName.startsWith("mac")) { // L: 16 + } else if (Decimator.formattedOperatingSystemName.startsWith("mac")) { // L: 16 var1 = 2; - } else if (GZipDecompressor.formattedOperatingSystemName.startsWith("linux")) { + } else if (Decimator.formattedOperatingSystemName.startsWith("linux")) { // L: 17 var1 = 3; } else { var1 = 4; // L: 18 @@ -109,8 +109,8 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var7 = 24; } else if (var3.indexOf("10.9") != -1) { // L: 63 var7 = 25; - } else if (var3.indexOf("10.10") != -1) { // L: 64 - var7 = 26; + } else if (var3.indexOf("10.10") != -1) { + var7 = 26; // L: 64 } else if (var3.indexOf("10.11") != -1) { // L: 65 var7 = 27; } else if (var3.indexOf("10.12") != -1) { // L: 66 @@ -133,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; // L: 74 } - this.method6480(var5); // L: 75 + this.method6033(var5); // L: 75 int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field3937 > 3) { // L: 80 + if (this.field3943 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; // L: 81 @@ -150,64 +150,55 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; // L: 87 String var18 = ""; // L: 88 int[] var23 = new int[3]; // L: 93 - return new PlatformInfo(var1, var24, var7, var8, this.field3937, this.field3941, this.field3939, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 + return new PlatformInfo(var1, var24, var7, var8, this.field3943, this.field3944, this.field3948, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1728874118" + garbageValue = "123534059" ) - void method6480(String var1) { + void method6033(String var1) { if (var1.startsWith("1.")) { // L: 101 - this.method6487(var1); // L: 102 + this.method6034(var1); // L: 102 } else { - this.method6481(var1); // L: 105 + this.method6035(var1); // L: 105 } } // L: 107 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1393050521" + garbageValue = "566753126" ) - void method6487(String var1) { + void method6034(String var1) { String[] var2 = var1.split("\\."); // L: 110 try { - this.field3937 = Integer.parseInt(var2[1]); // L: 112 + this.field3943 = Integer.parseInt(var2[1]); // L: 112 var2 = var2[2].split("_"); // L: 113 - this.field3941 = Integer.parseInt(var2[0]); // L: 114 - this.field3939 = Integer.parseInt(var2[1]); // L: 115 + this.field3944 = Integer.parseInt(var2[0]); // L: 114 + this.field3948 = Integer.parseInt(var2[1]); // L: 115 } catch (Exception var4) { // L: 117 } } // L: 118 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1077684800" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "106" ) - void method6481(String var1) { + void method6035(String var1) { String[] var2 = var1.split("\\."); // L: 121 try { - this.field3937 = Integer.parseInt(var2[0]); // L: 123 - this.field3941 = Integer.parseInt(var2[1]); // L: 124 - this.field3939 = Integer.parseInt(var2[2]); // L: 125 + this.field3943 = Integer.parseInt(var2[0]); // L: 123 + this.field3944 = Integer.parseInt(var2[1]); // L: 124 + this.field3948 = Integer.parseInt(var2[2]); // L: 125 } catch (Exception var4) { // L: 127 } } // L: 128 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(S)[Lim;", - garbageValue = "-29867" - ) - public static StudioGame[] method6478() { - return new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.oldscape, StudioGame.game4, StudioGame.runescape, StudioGame.game3}; // L: 17 - } -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 54cfa019c4..0eba11aac2 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,43 +9,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("av") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("format") AudioFormat format; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("line") SourceDataLine line; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1895572259 + intValue = -1411994739 ) @Export("capacity2") int capacity2; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } // L: 18 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "757289607" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)StructComposition.field3338, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.format = new AudioFormat((float)PcmPlayer.field394, 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("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1929759603" + garbageValue = "-1868594255" ) @Export("open") protected void open(int var1) throws LineUnavailableException { @@ -55,68 +55,81 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.open(); // L: 29 this.line.start(); // L: 30 this.capacity2 = var1; // L: 31 - } catch (LineUnavailableException var3) { // L: 33 - if (PrivateChatMode.method6104(var1) != 1) { // L: 34 - this.open(GameObject.method3452(var1)); // L: 35 + } catch (LineUnavailableException var7) { // L: 33 + int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765); // L: 37 + var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459); // L: 38 + var4 = (var4 >>> 4) + var4 & 252645135; // L: 39 + var4 += var4 >>> 8; // L: 40 + var4 += var4 >>> 16; // L: 41 + int var3 = var4 & 255; // L: 42 + if (var3 != 1) { // L: 44 + int var6 = var1 - 1; // L: 48 + var6 |= var6 >>> 1; // L: 49 + var6 |= var6 >>> 2; // L: 50 + var6 |= var6 >>> 4; // L: 51 + var6 |= var6 >>> 8; // L: 52 + var6 |= var6 >>> 16; // L: 53 + int var5 = var6 + 1; // L: 54 + this.open(var5); // L: 56 } else { - this.line = null; // L: 38 - throw var3; // L: 39 + this.line = null; // L: 59 + throw var7; // L: 60 } } - } // L: 36 41 + } // L: 57 62 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "6543" + descriptor = "(I)I", + garbageValue = "-1317116866" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 65 } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("write") protected void write() { - int var1 = 256; // L: 49 - if (PcmPlayer.PcmPlayer_stereo) { // L: 50 + int var1 = 256; // L: 70 + if (PcmPlayer.PcmPlayer_stereo) { // L: 71 var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { // L: 51 - int var3 = super.samples[var2]; // L: 52 - if ((var3 + 8388608 & -16777216) != 0) { // L: 53 - var3 = 8388607 ^ var3 >> 31; // L: 54 + for (int var2 = 0; var2 < var1; ++var2) { // L: 72 + int var3 = super.samples[var2]; // L: 73 + if ((var3 + 8388608 & -16777216) != 0) { // L: 74 + var3 = 8388607 ^ var3 >> 31; // L: 75 } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56 - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57 + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 77 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 78 } - this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 - } // L: 60 + this.line.write(this.byteSamples, 0, var1 << 1); // L: 80 + } // L: 81 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "64" + garbageValue = "46" ) @Export("close") protected void close() { - if (this.line != null) { // L: 63 - this.line.close(); // L: 64 - this.line = null; // L: 65 + if (this.line != null) { // L: 84 + this.line.close(); // L: 85 + this.line = null; // L: 86 } - } // L: 67 + } // L: 88 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-674709942" + descriptor = "(B)V", + garbageValue = "-41" ) @Export("discard") protected void discard() { - this.line.flush(); // L: 70 - } // L: 71 + this.line.flush(); // L: 91 + } // L: 92 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index c75d5ffdbd..533b6ad0d1 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,92 +1,494 @@ import 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("bp") +@ObfuscatedName("ao") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -601318053 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("ak") - static String field433; - @ObfuscatedName("bv") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "Lkq;" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("ao") + @Export("null_string") + protected static String null_string; DevicePcmPlayerProvider() { } // L: 7 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Ldh;", - garbageValue = "-25384" + descriptor = "(B)Lbh;", + garbageValue = "87" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); // L: 10 } - @ObfuscatedName("d") + @ObfuscatedName("hv") @ObfuscatedSignature( - descriptor = "(IIIIIII)I", - garbageValue = "-313683225" + descriptor = "(Lcs;IIBI)V", + garbageValue = "761999327" ) - public static int method921(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { // L: 25 - int var6 = var3; // L: 26 - var3 = var4; // L: 27 - var4 = var6; // L: 28 - } + static final void method470(Player var0, int var1, int var2, byte var3) { + int var4 = var0.pathX[0]; // L: 7420 + int var5 = var0.pathY[0]; // L: 7421 + int var6 = var0.transformedSize(); // L: 7422 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 7423 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 7424 + int var8 = var0.transformedSize(); // L: 7426 + RouteStrategy var9 = Renderable.method3628(var1, var2); // L: 7427 + CollisionMap var10 = Client.collisionMaps[var0.plane]; // L: 7428 + int[] var11 = Client.field879; // L: 7429 + int[] var12 = Client.field726; // L: 7430 - var2 &= 3; // L: 30 - if (var2 == 0) { // L: 31 - return var1; - } else if (var2 == 1) { // L: 32 - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 33 - } - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-3337607" - ) - static final void method920() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4335 4336 4343 - if (var0.plane == class90.Client_plane && !var0.isFinished) { // L: 4337 - if (Client.cycle >= var0.cycleStart) { // L: 4338 - var0.advance(Client.field808); // L: 4339 - if (var0.isFinished) { // L: 4340 - var0.remove(); - } else { - MilliClock.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4341 + int var13; + int var14; + for (var13 = 0; var13 < 128; ++var13) { // L: 7432 + for (var14 = 0; var14 < 128; ++var14) { // L: 7433 + class137.directions[var13][var14] = 0; // L: 7434 + class137.distances[var13][var14] = 99999999; // L: 7435 } } - } else { - var0.remove(); + + int var15; + int var16; + byte var17; + byte var18; + int var19; + int var20; + byte var21; + int var22; + int[][] var23; + int var24; + int var25; + int var26; + int var27; + boolean var33; + boolean var34; + int var35; + int var36; + int var38; + if (var8 == 1) { // L: 7439 + var15 = var4; // L: 7442 + var16 = var5; // L: 7443 + var17 = 64; // L: 7444 + var18 = 64; // L: 7445 + var19 = var4 - var17; // L: 7446 + var20 = var5 - var18; // L: 7447 + class137.directions[var17][var18] = 99; // L: 7448 + class137.distances[var17][var18] = 0; // L: 7449 + var21 = 0; // L: 7450 + var22 = 0; // L: 7451 + class137.bufferX[var21] = var4; // L: 7452 + var38 = var21 + 1; + class137.bufferY[var21] = var5; // L: 7453 + var23 = var10.flags; // L: 7454 + + while (true) { + if (var38 == var22) { // L: 7457 + Messages.field1377 = var15; // L: 7529 + CollisionMap.field1535 = var16; // L: 7530 + var34 = false; // L: 7531 + break; + } + + var15 = class137.bufferX[var22]; // L: 7458 + var16 = class137.bufferY[var22]; // L: 7459 + var22 = var22 + 1 & 4095; // L: 7460 + var35 = var15 - var19; // L: 7461 + var36 = var16 - var20; // L: 7462 + var24 = var15 - var10.xInset; // L: 7463 + var25 = var16 - var10.yInset; // L: 7464 + if (var9.hasArrived(1, var15, var16, var10)) { // L: 7465 + Messages.field1377 = var15; // L: 7466 + CollisionMap.field1535 = var16; // L: 7467 + var34 = true; // L: 7468 + break; + } + + var26 = class137.distances[var35][var36] + 1; // L: 7471 + if (var35 > 0 && class137.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136776) == 0) { // L: 7472 + class137.bufferX[var38] = var15 - 1; // L: 7473 + class137.bufferY[var38] = var16; // L: 7474 + var38 = var38 + 1 & 4095; // L: 7475 + class137.directions[var35 - 1][var36] = 2; // L: 7476 + class137.distances[var35 - 1][var36] = var26; // L: 7477 + } + + if (var35 < 127 && class137.directions[var35 + 1][var36] == 0 && (var23[var24 + 1][var25] & 19136896) == 0) { // L: 7479 + class137.bufferX[var38] = var15 + 1; // L: 7480 + class137.bufferY[var38] = var16; // L: 7481 + var38 = var38 + 1 & 4095; // L: 7482 + class137.directions[var35 + 1][var36] = 8; // L: 7483 + class137.distances[var35 + 1][var36] = var26; // L: 7484 + } + + if (var36 > 0 && class137.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 7486 + class137.bufferX[var38] = var15; // L: 7487 + class137.bufferY[var38] = var16 - 1; // L: 7488 + var38 = var38 + 1 & 4095; // L: 7489 + class137.directions[var35][var36 - 1] = 1; // L: 7490 + class137.distances[var35][var36 - 1] = var26; // L: 7491 + } + + if (var36 < 127 && class137.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 7493 + class137.bufferX[var38] = var15; // L: 7494 + class137.bufferY[var38] = var16 + 1; // L: 7495 + var38 = var38 + 1 & 4095; // L: 7496 + class137.directions[var35][var36 + 1] = 4; // L: 7497 + class137.distances[var35][var36 + 1] = var26; // L: 7498 + } + + if (var35 > 0 && var36 > 0 && class137.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 7500 + class137.bufferX[var38] = var15 - 1; // L: 7501 + class137.bufferY[var38] = var16 - 1; // L: 7502 + var38 = var38 + 1 & 4095; // L: 7503 + class137.directions[var35 - 1][var36 - 1] = 3; // L: 7504 + class137.distances[var35 - 1][var36 - 1] = var26; // L: 7505 + } + + if (var35 < 127 && var36 > 0 && class137.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { // L: 7507 + class137.bufferX[var38] = var15 + 1; // L: 7508 + class137.bufferY[var38] = var16 - 1; // L: 7509 + var38 = var38 + 1 & 4095; // L: 7510 + class137.directions[var35 + 1][var36 - 1] = 9; // L: 7511 + class137.distances[var35 + 1][var36 - 1] = var26; // L: 7512 + } + + if (var35 > 0 && var36 < 127 && class137.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 7514 + class137.bufferX[var38] = var15 - 1; // L: 7515 + class137.bufferY[var38] = var16 + 1; // L: 7516 + var38 = var38 + 1 & 4095; // L: 7517 + class137.directions[var35 - 1][var36 + 1] = 6; // L: 7518 + class137.distances[var35 - 1][var36 + 1] = var26; // L: 7519 + } + + if (var35 < 127 && var36 < 127 && class137.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 1] & 19136992) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { // L: 7521 + class137.bufferX[var38] = var15 + 1; // L: 7522 + class137.bufferY[var38] = var16 + 1; // L: 7523 + var38 = var38 + 1 & 4095; // L: 7524 + class137.directions[var35 + 1][var36 + 1] = 12; // L: 7525 + class137.distances[var35 + 1][var36 + 1] = var26; // L: 7526 + } + } + + var33 = var34; // L: 7533 + } else if (var8 == 2) { // L: 7535 + var33 = Decimator.method1113(var4, var5, var9, var10); + } else { + var15 = var4; // L: 7539 + var16 = var5; // L: 7540 + var17 = 64; // L: 7541 + var18 = 64; // L: 7542 + var19 = var4 - var17; // L: 7543 + var20 = var5 - var18; // L: 7544 + class137.directions[var17][var18] = 99; // L: 7545 + class137.distances[var17][var18] = 0; // L: 7546 + var21 = 0; // L: 7547 + var22 = 0; // L: 7548 + class137.bufferX[var21] = var4; // L: 7549 + var38 = var21 + 1; + class137.bufferY[var21] = var5; // L: 7550 + var23 = var10.flags; // L: 7551 + + label624: + while (true) { + label622: + while (true) { + do { + do { + do { + label599: + do { + if (var38 == var22) { // L: 7552 + Messages.field1377 = var15; // L: 7672 + CollisionMap.field1535 = var16; // L: 7673 + var34 = false; // L: 7674 + break label624; + } + + var15 = class137.bufferX[var22]; // L: 7553 + var16 = class137.bufferY[var22]; // L: 7554 + var22 = var22 + 1 & 4095; // L: 7555 + var35 = var15 - var19; // L: 7556 + var36 = var16 - var20; // L: 7557 + var24 = var15 - var10.xInset; // L: 7558 + var25 = var16 - var10.yInset; // L: 7559 + if (var9.hasArrived(var8, var15, var16, var10)) { // L: 7560 + Messages.field1377 = var15; // L: 7561 + CollisionMap.field1535 = var16; // L: 7562 + var34 = true; // L: 7563 + break label624; + } + + var26 = class137.distances[var35][var36] + 1; // L: 7566 + if (var35 > 0 && class137.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + var8 - 1] & 19136824) == 0) { // L: 7567 7568 7569 7570 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class137.bufferX[var38] = var15 - 1; // L: 7574 + class137.bufferY[var38] = var16; // L: 7575 + var38 = var38 + 1 & 4095; // L: 7576 + class137.directions[var35 - 1][var36] = 2; // L: 7577 + class137.distances[var35 - 1][var36] = var26; // L: 7578 + break; + } + + if ((var23[var24 - 1][var25 + var27] & 19136830) != 0) { // L: 7572 + break; + } + + ++var27; // L: 7571 + } + } + + if (var35 < 128 - var8 && class137.directions[var35 + 1][var36] == 0 && (var23[var8 + var24][var25] & 19136899) == 0 && (var23[var24 + var8][var25 + var8 - 1] & 19136992) == 0) { // L: 7580 7581 7582 7583 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class137.bufferX[var38] = var15 + 1; // L: 7587 + class137.bufferY[var38] = var16; // L: 7588 + var38 = var38 + 1 & 4095; // L: 7589 + class137.directions[var35 + 1][var36] = 8; // L: 7590 + class137.distances[var35 + 1][var36] = var26; // L: 7591 + break; + } + + if ((var23[var8 + var24][var27 + var25] & 19136995) != 0) { // L: 7585 + break; + } + + ++var27; // L: 7584 + } + } + + if (var36 > 0 && class137.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var8 + var24 - 1][var25 - 1] & 19136899) == 0) { // L: 7593 7594 7595 7596 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class137.bufferX[var38] = var15; // L: 7600 + class137.bufferY[var38] = var16 - 1; // L: 7601 + var38 = var38 + 1 & 4095; // L: 7602 + class137.directions[var35][var36 - 1] = 1; // L: 7603 + class137.distances[var35][var36 - 1] = var26; // L: 7604 + break; + } + + if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 7598 + break; + } + + ++var27; // L: 7597 + } + } + + if (var36 < 128 - var8 && class137.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + var8] & 19136824) == 0 && (var23[var8 + var24 - 1][var25 + var8] & 19136992) == 0) { // L: 7606 7607 7608 7609 + var27 = 1; + + while (true) { + if (var27 >= var8 - 1) { + class137.bufferX[var38] = var15; // L: 7613 + class137.bufferY[var38] = var16 + 1; // L: 7614 + var38 = var38 + 1 & 4095; // L: 7615 + class137.directions[var35][var36 + 1] = 4; // L: 7616 + class137.distances[var35][var36 + 1] = var26; // L: 7617 + break; + } + + if ((var23[var27 + var24][var25 + var8] & 19137016) != 0) { // L: 7611 + break; + } + + ++var27; // L: 7610 + } + } + + if (var35 > 0 && var36 > 0 && class137.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { // L: 7619 7620 7621 + var27 = 1; + + while (true) { + if (var27 >= var8) { + class137.bufferX[var38] = var15 - 1; // L: 7626 + class137.bufferY[var38] = var16 - 1; // L: 7627 + var38 = var38 + 1 & 4095; // L: 7628 + class137.directions[var35 - 1][var36 - 1] = 3; // L: 7629 + class137.distances[var35 - 1][var36 - 1] = var26; // L: 7630 + break; + } + + if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { // L: 7623 7624 + break; + } + + ++var27; // L: 7622 + } + } + + if (var35 < 128 - var8 && var36 > 0 && class137.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { // L: 7632 7633 7634 + var27 = 1; + + while (true) { + if (var27 >= var8) { + class137.bufferX[var38] = var15 + 1; // L: 7639 + class137.bufferY[var38] = var16 - 1; // L: 7640 + var38 = var38 + 1 & 4095; // L: 7641 + class137.directions[var35 + 1][var36 - 1] = 9; // L: 7642 + class137.distances[var35 + 1][var36 - 1] = var26; // L: 7643 + break; + } + + if ((var23[var8 + var24][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var27 + var24][var25 - 1] & 19136911) != 0) { // L: 7636 7637 + break; + } + + ++var27; // L: 7635 + } + } + + if (var35 > 0 && var36 < 128 - var8 && class137.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + var8] & 19136824) == 0) { // L: 7645 7646 7647 + for (var27 = 1; var27 < var8; ++var27) { // L: 7648 + if ((var23[var24 - 1][var27 + var25] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 + var8] & 19137016) != 0) { // L: 7649 7650 + continue label599; + } + } + + class137.bufferX[var38] = var15 - 1; // L: 7652 + class137.bufferY[var38] = var16 + 1; // L: 7653 + var38 = var38 + 1 & 4095; // L: 7654 + class137.directions[var35 - 1][var36 + 1] = 6; // L: 7655 + class137.distances[var35 - 1][var36 + 1] = var26; // L: 7656 + } + } while(var35 >= 128 - var8); // L: 7658 + } while(var36 >= 128 - var8); + } while(class137.directions[var35 + 1][var36 + 1] != 0); // L: 7659 + } while((var23[var24 + var8][var25 + var8] & 19136992) != 0); // L: 7660 + + for (var27 = 1; var27 < var8; ++var27) { // L: 7661 + if ((var23[var24 + var27][var8 + var25] & 19137016) != 0 || (var23[var8 + var24][var27 + var25] & 19136995) != 0) { // L: 7662 7663 + continue label622; + } + } + + class137.bufferX[var38] = var15 + 1; // L: 7665 + class137.bufferY[var38] = var16 + 1; // L: 7666 + var38 = var38 + 1 & 4095; // L: 7667 + class137.directions[var35 + 1][var36 + 1] = 12; // L: 7668 + class137.distances[var35 + 1][var36 + 1] = var26; // L: 7669 + } + } + + var33 = var34; // L: 7676 + } + + int var7; + label672: { + var14 = var4 - 64; // L: 7678 + var15 = var5 - 64; // L: 7679 + var16 = Messages.field1377; // L: 7680 + var35 = CollisionMap.field1535; // L: 7681 + if (!var33) { // L: 7682 + var36 = Integer.MAX_VALUE; // L: 7684 + var19 = Integer.MAX_VALUE; // L: 7685 + byte var37 = 10; // L: 7686 + var38 = var9.approxDestinationX; // L: 7687 + var22 = var9.approxDestinationY; // L: 7688 + int var32 = var9.approxDestinationSizeX; // L: 7689 + var24 = var9.approxDestinationSizeY; // L: 7690 + + for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { // L: 7691 + for (var26 = var22 - var37; var26 <= var37 + var22; ++var26) { // L: 7692 + var27 = var25 - var14; // L: 7693 + int var28 = var26 - var15; // L: 7694 + if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class137.distances[var27][var28] < 100) { // L: 7695 7696 + int var29 = 0; // L: 7697 + if (var25 < var38) { // L: 7698 + var29 = var38 - var25; + } else if (var25 > var38 + var32 - 1) { // L: 7699 + var29 = var25 - (var32 + var38 - 1); + } + + int var30 = 0; // L: 7700 + if (var26 < var22) { // L: 7701 + var30 = var22 - var26; + } else if (var26 > var24 + var22 - 1) { // L: 7702 + var30 = var26 - (var22 + var24 - 1); + } + + int var31 = var29 * var29 + var30 * var30; // L: 7703 + if (var31 < var36 || var31 == var36 && class137.distances[var27][var28] < var19) { // L: 7704 + var36 = var31; // L: 7705 + var19 = class137.distances[var27][var28]; // L: 7706 + var16 = var25; // L: 7707 + var35 = var26; // L: 7708 + } + } + } + } + + if (var36 == Integer.MAX_VALUE) { // L: 7714 + var7 = -1; // L: 7715 + break label672; + } + } + + if (var4 == var16 && var35 == var5) { // L: 7724 + var7 = 0; // L: 7725 + } else { + var18 = 0; // L: 7728 + class137.bufferX[var18] = var16; // L: 7731 + var36 = var18 + 1; + class137.bufferY[var18] = var35; // L: 7732 + + for (var19 = var20 = class137.directions[var16 - var14][var35 - var15]; var16 != var4 || var35 != var5; var19 = class137.directions[var16 - var14][var35 - var15]) { // L: 7733 7734 7744 + if (var20 != var19) { // L: 7735 + var20 = var19; // L: 7736 + class137.bufferX[var36] = var16; // L: 7737 + class137.bufferY[var36++] = var35; // L: 7738 + } + + if ((var19 & 2) != 0) { // L: 7740 + ++var16; + } else if ((var19 & 8) != 0) { // L: 7741 + --var16; + } + + if ((var19 & 1) != 0) { // L: 7742 + ++var35; + } else if ((var19 & 4) != 0) { // L: 7743 + --var35; + } + } + + var38 = 0; // L: 7746 + + while (var36-- > 0) { // L: 7747 + var11[var38] = class137.bufferX[var36]; // L: 7748 + var12[var38++] = class137.bufferY[var36]; // L: 7749 + if (var38 >= var11.length) { // L: 7750 + break; + } + } + + var7 = var38; // L: 7752 + } + } + + var13 = var7; // L: 7754 + if (var7 >= 1) { // L: 7755 + for (var14 = 0; var14 < var13 - 1; ++var14) { // L: 7756 + var0.method2142(Client.field879[var14], Client.field726[var14], var3); + } + + } } } - - } // L: 4345 - - @ObfuscatedName("kq") - @ObfuscatedSignature( - descriptor = "(Lhz;B)Z", - garbageValue = "103" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; // L: 11503 - } + } // L: 7757 } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index 3fc7a0e3c4..6b7f899aa1 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,53 +4,158 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hb") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("directBuffer") ByteBuffer directBuffer; - DirectByteArrayCopier() { - } // L: 10 - - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1361682252" + garbageValue = "-1722490231" ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 - this.directBuffer.position(0); // L: 14 - this.directBuffer.get(var1); // L: 15 - return var1; // L: 16 + byte[] var1 = new byte[this.directBuffer.capacity()]; + this.directBuffer.position(0); + this.directBuffer.get(var1); + return var1; } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "262833794" + garbageValue = "1564375073" ) @Export("set") - void set(byte[] var1) { + public void set(byte[] var1) { this.directBuffer = ByteBuffer.allocateDirect(var1.length); this.directBuffer.position(0); // L: 21 this.directBuffer.put(var1); // L: 22 - } // L: 23 + } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;I)V", - garbageValue = "292233920" + descriptor = "(I)I", + garbageValue = "1136750578" ) - public static void method4147(AbstractArchive var0) { - StructComposition.StructDefinition_archive = var0; // L: 19 - } // L: 20 + static int method4354() { + return 12; // L: 123 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljh;B)I", + garbageValue = "98" + ) + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); // L: 11 + int var4 = var1.length(); // L: 12 + int var5 = 0; // L: 13 + int var6 = 0; // L: 14 + char var7 = 0; // L: 15 + char var8 = 0; // L: 16 + + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; + } + + if (var6 - var8 >= var4) { // L: 20 + return 1; + } + + char var9; + if (var7 != 0) { // L: 23 + var9 = var7; // L: 24 + boolean var14 = false; // L: 25 + } else { + var9 = var0.charAt(var5++); // L: 27 + } + + char var10; + if (var8 != 0) { // L: 28 + var10 = var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } + + var7 = WorldMapSection1.method3154(var9); // L: 33 + var8 = WorldMapSection1.method3154(var10); // L: 34 + var9 = GrandExchangeOfferNameComparator.standardizeChar(var9, var2); // L: 35 + var10 = GrandExchangeOfferNameComparator.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 class124.lowercaseChar(var9, var2) - class124.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); // L: 43 + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + 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 class124.lowercaseChar(var11, var2) - class124.lowercaseChar(var12, var2); // L: 55 + } + } + } + + var17 = var3 - var4; // L: 58 + if (var17 != 0) { // L: 59 + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { // L: 60 + var12 = var0.charAt(var18); // L: 61 + char var13 = var1.charAt(var18); // L: 62 + if (var13 != var12) { // L: 63 + return class124.lowercaseChar(var12, var2) - class124.lowercaseChar(var13, var2); + } + } + + return 0; // L: 65 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1742399139" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 + return var1 == null ? 0 : var1.size(); // L: 45 46 + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + descriptor = "(Lhu;B)I", + garbageValue = "-62" + ) + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11589 + return var1 != null ? var1.integer : var0.flags; // L: 11590 11591 + } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 9f8675fe96..0ea279e1b5 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fi") +@ObfuscatedName("gw") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; // L: 8 } // L: 9 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("get") Object get() { return this.obj; // L: 12 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isSoft") boolean isSoft() { return false; // L: 16 diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index 7a61233d29..d9a6f11626 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("mz") @Implements("DualNode") public class DualNode extends Node { @ObfuscatedName("cu") @Export("keyDual") public long keyDual; - @ObfuscatedName("ci") + @ObfuscatedName("cb") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cy") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cm") + @ObfuscatedName("dm") @Export("removeDual") public void removeDual() { if (this.nextDual != null) { // L: 9 diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index 82e6b401dd..d3b3635a54 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,12 +3,12 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jo") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lgj;)V" + descriptor = "(Lmz;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 18 } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgj;)V" + descriptor = "(Lmz;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "()Lgj;" + descriptor = "()Lmz;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 2514398472..1bb87d01d3 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,77 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cn") @Implements("DynamicObject") public class DynamicObject extends Renderable { - @ObfuscatedName("a") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1608906951 - ) - static int field1311; - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = 1685580933 - ) - @Export("currentPort") - static int currentPort; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1583763067 + intValue = -57600529 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1077688157 + intValue = 1163612607 ) @Export("type") int type; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1461018485 + intValue = 1554674349 ) @Export("orientation") int orientation; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 242558127 + intValue = -1797083453 ) @Export("plane") int plane; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -345704253 + intValue = 544096397 ) @Export("x") int x; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2021063101 + intValue = -252563019 ) @Export("y") int y; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -765264835 + intValue = -2049566951 ) @Export("frame") int frame; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1029669135 + intValue = -642790573 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLem;)V" + descriptor = "(IIIIIIIZLfm;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) { this.id = var1; // L: 20 @@ -84,12 +73,12 @@ public class DynamicObject extends Renderable { this.x = var5; // L: 24 this.y = var6; // L: 25 if (var7 != -1) { // L: 26 - this.sequenceDefinition = InterfaceParent.SequenceDefinition_get(var7); // L: 27 + this.sequenceDefinition = class225.SequenceDefinition_get(var7); // L: 27 this.frame = 0; // L: 28 this.cycleStart = Client.cycle - 1; // L: 29 - if (this.sequenceDefinition.field3548 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + if (this.sequenceDefinition.field3707 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 DynamicObject var10 = (DynamicObject)var9; // L: 31 - if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32 + if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 this.frame = var10.frame; // L: 33 this.cycleStart = var10.cycleStart; // L: 34 return; // L: 35 @@ -104,10 +93,10 @@ public class DynamicObject extends Renderable { } // L: 43 - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" + descriptor = "(I)Lgv;", + garbageValue = "1835906978" ) @Export("getModel") protected final Model getModel() { @@ -137,7 +126,7 @@ public class DynamicObject extends Renderable { this.cycleStart = Client.cycle - var1; // L: 60 } - ObjectComposition var12 = WorldMapAreaData.getObjectDefinition(this.id); // L: 62 + ObjectComposition var12 = class19.getObjectDefinition(this.id); // L: 62 if (var12.transforms != null) { // L: 63 var12 = var12.transform(); } @@ -166,4 +155,4 @@ public class DynamicObject extends Renderable { return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83 } } -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java index b3644c8c36..1e38318214 100644 --- a/runescape-client/src/main/java/EnumComposition.java +++ b/runescape-client/src/main/java/EnumComposition.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jz") @Implements("EnumComposition") public class EnumComposition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("EnumDefinition_archive") public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("inputType") public char inputType; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("outputType") public char outputType; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 977907101 + intValue = 1791938445 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1947625869 + intValue = -1639426453 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("keys") public int[] keys; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("intVals") public int[] intVals; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("strVals") public String[] strVals; @@ -59,10 +59,10 @@ public class EnumComposition extends DualNode { this.outputCount = 0; // L: 17 } // L: 22 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "1374661087" + descriptor = "(Lnu;I)V", + garbageValue = "1691183927" ) @Export("decode") void decode(Buffer var1) { @@ -76,10 +76,10 @@ public class EnumComposition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;IB)V", - garbageValue = "112" + descriptor = "(Lnu;II)V", + garbageValue = "-440567835" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -116,33 +116,13 @@ public class EnumComposition extends DualNode { } // L: 66 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2129947174" + garbageValue = "765918269" ) @Export("size") public int size() { return this.outputCount; // L: 69 } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(CLgp;B)I", - garbageValue = "40" - ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; // L: 143 - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144 - var0 = Character.toLowerCase(var0); // L: 145 - var2 = (var0 << 4) + 1; // L: 146 - } - - if (var0 == 241 && var1 == Language.Language_ES) { // L: 148 - var2 = 1762; - } - - return var2; // L: 149 - } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 8bedffa08f..b81ca361b3 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("jk") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index c4e06ce680..7bc3b3b4c7 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,35 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("gf") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) - DualNode field1968; - @ObfuscatedName("v") + DualNode field2210; + @ObfuscatedName("o") @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljw;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1968 = new DualNode(); // L: 8 + this.field2210 = new DualNode(); // L: 8 this.deque = new IterableDualNodeQueue(); // L: 12 this.capacity = var1; // L: 15 this.remainingCapacity = var1; // L: 16 @@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable { this.hashTable = new IterableNodeHashTable(var2); // L: 19 } // L: 20 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(J)Lgj;" + descriptor = "(J)Lmz;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; // L: 28 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } // L: 38 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgj;J)V" + descriptor = "(Lmz;J)V" ) @Export("put") public void put(DualNode var1, long var2) { @@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable { DualNode var4 = this.deque.removeLast(); // L: 42 var4.remove(); // L: 43 var4.removeDual(); // L: 44 - if (var4 == this.field1968) { // L: 45 + if (var4 == this.field2210) { // L: 45 var4 = this.deque.removeLast(); // L: 46 var4.remove(); // L: 47 var4.removeDual(); // L: 48 @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); // L: 53 } // L: 54 - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("clear") public void clear() { this.deque.clear(); // L: 57 this.hashTable.clear(); // L: 58 - this.field1968 = new DualNode(); // L: 59 + this.field2210 = 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 a06f959194..a590a88269 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -3,25 +3,37 @@ 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("er") +@ObfuscatedName("fh") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("n") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -687013303 + intValue = 1100336631 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("bj") + @ObfuscatedGetter( + intValue = -1521392293 + ) + static int field2002; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 2025670569 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1872981457 + intValue = 645441179 ) @Export("y") int y; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -522101521 + intValue = 1727804359 ) @Export("z") int z; @@ -29,27 +41,728 @@ public class FaceNormal { FaceNormal() { } // L: 8 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-1093535932" + descriptor = "(Lcj;IIB)V", + garbageValue = "18" ) - public static boolean method3421(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 - if (var0 != 0) { // L: 46 - char[] var1 = class298.cp1252AsciiExtension; // L: 48 + @Export("runScript") + static void runScript(ScriptEvent var0, int var1, int var2) { + Object[] var3 = var0.args; // L: 109 + Script var4; + int var19; + if (WorldMap.isWorldMapEvent(var0.type)) { // L: 111 + UrlRequest.worldMapEvent = (WorldMapEvent)var3[0]; // L: 112 + WorldMapElement var5 = ByteArrayPool.WorldMapElement_get(UrlRequest.worldMapEvent.mapElement); // L: 113 + var4 = Tiles.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 114 + } else { + var19 = (Integer)var3[0]; // L: 117 + var4 = class24.getScript(var19); // L: 118 + } - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 - char var3 = var1[var2]; // L: 50 - if (var0 == var3) { // L: 52 - return true; + if (var4 != null) { // L: 120 + class16.Interpreter_intStackSize = 0; // L: 123 + Interpreter.Interpreter_stringStackSize = 0; // L: 124 + var19 = -1; // L: 125 + int[] var6 = var4.opcodes; // L: 126 + int[] var7 = var4.intOperands; // L: 127 + byte var8 = -1; // L: 128 + Interpreter.Interpreter_frameDepth = 0; // L: 129 + Interpreter.field944 = false; // L: 130 + boolean var9 = false; // L: 131 + int var10 = 0; // L: 132 + + try { + int var13; + try { + ScriptFrame.Interpreter_intLocals = new int[var4.localIntCount]; // L: 134 + int var11 = 0; // L: 135 + Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 136 + int var12 = 0; // L: 137 + + int var14; + String var20; + for (var13 = 1; var13 < var3.length; ++var13) { // L: 138 + if (var3[var13] instanceof Integer) { // L: 139 + var14 = (Integer)var3[var13]; // L: 140 + if (var14 == -2147483647) { // L: 141 + var14 = var0.mouseX; + } + + if (var14 == -2147483646) { // L: 142 + var14 = var0.mouseY; + } + + if (var14 == -2147483645) { // L: 143 + var14 = var0.widget != null ? var0.widget.id * 516202957 * 1486959365 : -1; + } + + if (var14 == -2147483644) { // L: 144 + var14 = var0.opIndex; + } + + if (var14 == -2147483643) { // L: 145 + var14 = var0.widget != null ? var0.widget.childIndex * 1704710587 * 20794227 : -1; + } + + if (var14 == -2147483642) { // L: 146 + var14 = var0.dragTarget != null ? var0.dragTarget.id * 516202957 * 1486959365 : -1; + } + + if (var14 == -2147483641) { // L: 147 + var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1704710587 * 20794227 : -1; + } + + if (var14 == -2147483640) { // L: 148 + var14 = var0.keyTyped; + } + + if (var14 == -2147483639) { // L: 149 + var14 = var0.keyPressed; + } + + ScriptFrame.Interpreter_intLocals[var11++] = var14; // L: 150 + } else if (var3[var13] instanceof String) { // L: 152 + var20 = (String)var3[var13]; // L: 153 + if (var20.equals("event_opbase")) { // L: 154 + var20 = var0.targetName; + } + + Interpreter.Interpreter_stringLocals[var12++] = var20; // L: 155 + } + } + + Interpreter.field950 = var0.field1154; // L: 159 + + while (true) { + ++var10; // L: 161 + if (var10 > var1) { // L: 162 + throw new RuntimeException(); + } + + ++var19; // L: 163 + int var31 = var6[var19]; + if (var31 >= 100) { // L: 164 + boolean var32; + if (var4.intOperands[var19] == 1) { // L: 382 + var32 = true; + } else { + var32 = false; // L: 383 + } + + var14 = class223.method4236(var31, var4, var32); // L: 384 + switch(var14) { // L: 385 + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 388 + } + } else if (var31 == 0) { // L: 165 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7[var19]; // L: 166 + } else if (var31 == ScriptOpcodes.GET_VARP) { // L: 169 + var13 = var7[var19]; // L: 170 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 171 + } else if (var31 == ScriptOpcodes.SET_VARP) { // L: 174 + var13 = var7[var19]; // L: 175 + Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 176 + class27.changeGameOptions(var13); // L: 177 + } else if (var31 == ScriptOpcodes.SCONST) { // L: 180 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.stringOperands[var19]; // L: 181 + } else if (var31 == ScriptOpcodes.JUMP) { // L: 184 + var19 += var7[var19]; // L: 185 + } else if (var31 == ScriptOpcodes.IF_ICMPNE) { // L: 188 + class16.Interpreter_intStackSize -= 2; // L: 189 + if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 190 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPEQ) { // L: 193 + class16.Interpreter_intStackSize -= 2; // L: 194 + if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 195 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPLT) { // L: 198 + class16.Interpreter_intStackSize -= 2; // L: 199 + if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 200 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPGT) { // L: 203 + class16.Interpreter_intStackSize -= 2; // L: 204 + if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 205 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.RETURN) { // L: 208 + if (Interpreter.Interpreter_frameDepth == 0) { // L: 209 + return; // L: 416 + } + + ScriptFrame var37 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 210 + var4 = var37.script; // L: 211 + var6 = var4.opcodes; // L: 212 + var7 = var4.intOperands; // L: 213 + var19 = var37.pc; // L: 214 + ScriptFrame.Interpreter_intLocals = var37.intLocals; // L: 215 + Interpreter.Interpreter_stringLocals = var37.stringLocals; // L: 216 + } else if (var31 == ScriptOpcodes.GET_VARBIT) { // L: 219 + var13 = var7[var19]; // L: 220 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class2.getVarbit(var13); // L: 221 + } else if (var31 == ScriptOpcodes.SET_VARBIT) { // L: 224 + var13 = var7[var19]; // L: 225 + class337.method5984(var13, Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 226 + } else if (var31 == ScriptOpcodes.IF_ICMPLE) { // L: 229 + class16.Interpreter_intStackSize -= 2; // L: 230 + if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 231 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.IF_ICMPGE) { // L: 234 + class16.Interpreter_intStackSize -= 2; // L: 235 + if (Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]) { // L: 236 + var19 += var7[var19]; + } + } else if (var31 == ScriptOpcodes.ILOAD) { // L: 239 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ScriptFrame.Interpreter_intLocals[var7[var19]]; // L: 240 + } else if (var31 == ScriptOpcodes.ISTORE) { // L: 243 + ScriptFrame.Interpreter_intLocals[var7[var19]] = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 244 + } else if (var31 == ScriptOpcodes.SLOAD) { // L: 247 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var19]]; // L: 248 + } else if (var31 == ScriptOpcodes.SSTORE) { // L: 251 + Interpreter.Interpreter_stringLocals[var7[var19]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 252 + } else if (var31 == ScriptOpcodes.JOIN_STRING) { // L: 255 + var13 = var7[var19]; // L: 256 + Interpreter.Interpreter_stringStackSize -= var13; // L: 257 + var20 = class23.method346(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); // L: 258 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var20; // L: 259 + } else if (var31 == ScriptOpcodes.POP_INT) { // L: 262 + --class16.Interpreter_intStackSize; // L: 263 + } else if (var31 == ScriptOpcodes.POP_STRING) { // L: 266 + --Interpreter.Interpreter_stringStackSize; // L: 267 + } else { + int var17; + if (var31 != ScriptOpcodes.INVOKE) { // L: 270 + if (var31 == ScriptOpcodes.GET_VARC_INT) { // L: 293 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = TextureProvider.varcs.getInt(var7[var19]); // L: 294 + } else if (var31 == ScriptOpcodes.SET_VARC_INT) { // L: 297 + TextureProvider.varcs.setInt(var7[var19], Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 298 + } else if (var31 == ScriptOpcodes.DEFINE_ARRAY) { // L: 301 + var13 = var7[var19] >> 16; // L: 302 + var14 = var7[var19] & 65535; // L: 303 + int var23 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 304 + if (var23 < 0 || var23 > 5000) { // L: 305 + throw new RuntimeException(); // L: 306 + } + + Interpreter.Interpreter_arrayLengths[var13] = var23; // L: 308 + byte var24 = -1; // L: 309 + if (var14 == 105) { // L: 310 + var24 = 0; + } + + for (var17 = 0; var17 < var23; ++var17) { // L: 311 + Interpreter.Interpreter_arrays[var13][var17] = var24; + } + } else if (var31 == ScriptOpcodes.GET_ARRAY_INT) { // L: 314 + var13 = var7[var19]; // L: 315 + var14 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 316 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 317 + throw new RuntimeException(); // L: 318 + } + + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 320 + } else if (var31 == ScriptOpcodes.SET_ARRAY_INT) { // L: 323 + var13 = var7[var19]; // L: 324 + class16.Interpreter_intStackSize -= 2; // L: 325 + var14 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 326 + if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 327 + throw new RuntimeException(); // L: 328 + } + + Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 330 + } else { + String var21; + if (var31 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 333 + var21 = TextureProvider.varcs.getStringOld(var7[var19]); // L: 334 + if (var21 == null) { // L: 335 + var21 = "null"; + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 336 + } else if (var31 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 339 + TextureProvider.varcs.setStringOld(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 340 + } else if (var31 == ScriptOpcodes.GET_VARC_STRING) { // L: 343 + var21 = TextureProvider.varcs.getString(var7[var19]); // L: 344 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 345 + } else if (var31 == ScriptOpcodes.SET_VARC_STRING) { // L: 348 + TextureProvider.varcs.setString(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 349 + } else if (var31 == ScriptOpcodes.SWITCH) { // L: 352 + IterableNodeHashTable var35 = var4.switches[var7[var19]]; // L: 353 + IntegerNode var34 = (IntegerNode)var35.get((long)Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 354 + if (var34 != null) { // L: 355 + var19 += var34.integer; + } + } else { + Integer var36; + if (var31 == 74) { // L: 358 + var36 = class19.field154.method144(var7[var19]); // L: 359 + if (var36 == null) { // L: 360 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 361 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var36; // L: 364 + } + } else { + if (var31 != 76) { // L: 368 + throw new IllegalStateException(); // L: 378 + } + + var36 = Coord.field2591.method5988(var7[var19]); // L: 369 + if (var36 == null) { // L: 370 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 371 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var36; // L: 374 + } + } + } + } + } else { + var13 = var7[var19]; // L: 271 + Script var33 = class24.getScript(var13); // L: 272 + int[] var15 = new int[var33.localIntCount]; // L: 273 + String[] var16 = new String[var33.localStringCount]; // L: 274 + + for (var17 = 0; var17 < var33.intArgumentCount; ++var17) { // L: 275 + var15[var17] = Interpreter.Interpreter_intStack[var17 + (class16.Interpreter_intStackSize - var33.intArgumentCount)]; + } + + for (var17 = 0; var17 < var33.stringArgumentCount; ++var17) { // L: 276 + var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var33.stringArgumentCount)]; + } + + class16.Interpreter_intStackSize -= var33.intArgumentCount; // L: 277 + Interpreter.Interpreter_stringStackSize -= var33.stringArgumentCount; // L: 278 + ScriptFrame var22 = new ScriptFrame(); // L: 279 + var22.script = var4; // L: 280 + var22.pc = var19; // L: 281 + var22.intLocals = ScriptFrame.Interpreter_intLocals; // L: 282 + var22.stringLocals = Interpreter.Interpreter_stringLocals; // L: 283 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; // L: 284 + var4 = var33; // L: 285 + var6 = var33.opcodes; // L: 286 + var7 = var33.intOperands; // L: 287 + var19 = -1; // L: 288 + ScriptFrame.Interpreter_intLocals = var15; // L: 289 + Interpreter.Interpreter_stringLocals = var16; // L: 290 + } + } + } + } catch (Exception var29) { // L: 398 + var9 = true; // L: 399 + StringBuilder var26 = new StringBuilder(30); // L: 401 + var26.append("").append(var4.key).append(" "); // L: 402 + + for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 403 + var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" "); + } + + var26.append("").append(var8); // L: 404 + class223.RunException_sendStackTrace(var26.toString(), var29); // L: 405 + } + } finally { + if (Interpreter.field944) { // L: 409 + Interpreter.field946 = true; // L: 410 + Archive.method4470(); // L: 411 + Interpreter.field946 = false; // L: 412 + Interpreter.field944 = false; // L: 413 + } + + if (!var9 && var2 > 0 && var10 >= var2) { // L: 415 + class223.RunException_sendStackTrace("Warning: Script " + var4.field1058 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); + } + + } + } + } // L: 121 419 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-537848067" + ) + static final boolean method3632() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 87 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1567751606" + ) + static int method3630(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1396 + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1397 + class69.addGameMessage(0, "", var7); // L: 1398 + return 1; // L: 1399 + } else if (var0 == ScriptOpcodes.ANIM) { + class16.Interpreter_intStackSize -= 2; // L: 1402 + class32.performPlayerAnimation(Varcs.localPlayer, Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 1403 + return 1; // L: 1404 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field946) { // L: 1407 + Interpreter.field944 = true; // L: 1408 + } + + return 1; // L: 1410 + } else { + int var16; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1413 + var16 = 0; // L: 1414 + if (WorldMapArea.isNumber(var7)) { // L: 1415 + var16 = class69.method1168(var7); + } + + PacketBufferNode var14 = ObjectComposition.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher); // L: 1417 + var14.packetBuffer.writeInt(var16); // L: 1418 + Client.packetWriter.addNode(var14); // L: 1419 + return 1; // L: 1420 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1423 + var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); // L: 1425 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1426 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1427 + Client.packetWriter.addNode(var12); // L: 1428 + return 1; // L: 1429 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1432 + var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); // L: 1434 + var12.packetBuffer.writeByte(var7.length() + 1); // L: 1435 + var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1436 + Client.packetWriter.addNode(var12); // L: 1437 + return 1; // L: 1438 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1441 + var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1442 + SoundCache.method889(var10, var4); // L: 1443 + return 1; // L: 1444 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class16.Interpreter_intStackSize -= 3; // L: 1447 + var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1448 + var16 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1449 + int var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 1450 + Widget var15 = class139.getWidget(var9); // L: 1451 + PcmPlayer.clickWidget(var15, var10, var16); // L: 1452 + return 1; // L: 1453 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class16.Interpreter_intStackSize -= 2; // L: 1456 + var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1457 + var16 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1458 + Widget var13 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1459 + PcmPlayer.clickWidget(var13, var10, var16); // L: 1460 + return 1; // L: 1461 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + MouseHandler.mouseCam = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1464 + return 1; // L: 1465 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.roofsHidden ? 1 : 0; // L: 1468 + return 1; // L: 1469 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + Login.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1472 + Message.savePreferences(); // L: 1473 + return 1; // L: 1474 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1477 + boolean var8 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1478 + class302.openURL(var7, var8, false); // L: 1479 + return 1; // L: 1480 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1483 + var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); // L: 1485 + var12.packetBuffer.writeShort(var10); // L: 1486 + Client.packetWriter.addNode(var12); // L: 1487 + return 1; // L: 1488 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1491 + Interpreter.Interpreter_stringStackSize -= 2; // L: 1492 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 1493 + String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 1494 + if (var4.length() > 500) { // L: 1495 + return 1; + } else if (var5.length() > 500) { // L: 1496 + return 1; + } else { + PacketBufferNode var6 = ObjectComposition.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher); // L: 1497 + var6.packetBuffer.writeShort(1 + Friend.stringCp1252NullTerminatedByteSize(var4) + Friend.stringCp1252NullTerminatedByteSize(var5)); // L: 1498 + var6.packetBuffer.method6639(var10); // L: 1499 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1500 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1501 + Client.packetWriter.addNode(var6); // L: 1502 + return 1; // L: 1503 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1506 + return 1; // L: 1507 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1510 + return 1; // L: 1511 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1514 + return 1; // L: 1515 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1518 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1519 + } + + return 1; // L: 1520 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1523 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1524 + } + + return 1; // L: 1525 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1528 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1529 + } + + return 1; // L: 1530 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 1533 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1534 + } + + return 1; // L: 1535 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1538 + return 1; // L: 1539 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1542 + return 1; // L: 1543 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1546 + return 1; // L: 1547 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + class207.setTapToDrop(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1); // L: 1550 + return 1; // L: 1551 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class27.getTapToDrop() ? 1 : 0; // L: 1554 + return 1; // L: 1555 + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + class16.Interpreter_intStackSize -= 2; // L: 1558 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1559 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1560 + return 1; // L: 1561 + } else if (var0 == 3130) { + class16.Interpreter_intStackSize -= 2; // L: 1564 + return 1; // L: 1565 + } else if (var0 == 3131) { + --class16.Interpreter_intStackSize; // L: 1568 + return 1; // L: 1569 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.canvasWidth; // L: 1572 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameEngine.canvasHeight; // L: 1573 + return 1; // L: 1574 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class16.Interpreter_intStackSize; // L: 1577 + return 1; // L: 1578 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1581 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class16.Interpreter_intStackSize -= 2; // L: 1584 + return 1; // L: 1585 + } else if (var0 == 3136) { + Client.field764 = 3; // L: 1588 + Client.field765 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1589 + return 1; // L: 1590 + } else if (var0 == 3137) { + Client.field764 = 2; // L: 1593 + Client.field765 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1594 + return 1; // L: 1595 + } else if (var0 == 3138) { + Client.field764 = 0; // L: 1598 + return 1; // L: 1599 + } else if (var0 == 3139) { + Client.field764 = 1; // L: 1602 + return 1; // L: 1603 + } else if (var0 == 3140) { + Client.field764 = 3; // L: 1606 + Client.field765 = var2 ? FriendSystem.scriptDotWidget.id * 516202957 * 1486959365 : class4.scriptActiveWidget.id * 516202957 * 1486959365; // L: 1607 + return 1; // L: 1608 + } else { + boolean var11; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1611 + Login.clientPreferences.hideUsername = var11; // L: 1612 + Message.savePreferences(); // L: 1613 + return 1; // L: 1614 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.hideUsername ? 1 : 0; // L: 1617 + return 1; // L: 1618 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1621 + Client.Login_isUsernameRemembered = var11; // L: 1622 + if (!var11) { // L: 1623 + Login.clientPreferences.rememberedUsername = ""; // L: 1624 + Message.savePreferences(); // L: 1625 + } + + return 1; // L: 1627 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1630 + return 1; // L: 1631 + } else if (var0 == 3145) { + return 1; // L: 1634 + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 1637 + if (var11 == Login.clientPreferences.titleMusicDisabled) { // L: 1638 + Login.clientPreferences.titleMusicDisabled = !var11; // L: 1639 + Message.savePreferences(); // L: 1640 + } + + return 1; // L: 1642 + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1645 + return 1; // L: 1646 + } else if (var0 == 3148) { + return 1; // L: 1649 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1652 + return 1; // L: 1653 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1656 + return 1; // L: 1657 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1660 + return 1; // L: 1661 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1664 + return 1; // L: 1665 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1668 + return 1; // L: 1669 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.method345(); // L: 1672 + return 1; // L: 1673 + } else if (var0 == 3155) { + --Interpreter.Interpreter_stringStackSize; // L: 1676 + return 1; // L: 1677 + } else if (var0 == 3156) { + return 1; // L: 1680 + } else if (var0 == 3157) { + class16.Interpreter_intStackSize -= 2; // L: 1683 + return 1; // L: 1684 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1687 + return 1; // L: 1688 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1691 + return 1; // L: 1692 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1695 + return 1; // L: 1696 + } else if (var0 == 3161) { + --class16.Interpreter_intStackSize; // L: 1699 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1700 + return 1; // L: 1701 + } else if (var0 == 3162) { + --class16.Interpreter_intStackSize; // L: 1704 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1705 + return 1; // L: 1706 + } else if (var0 == 3163) { + --Interpreter.Interpreter_stringStackSize; // L: 1709 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1710 + return 1; // L: 1711 + } else if (var0 == 3164) { + --class16.Interpreter_intStackSize; // L: 1714 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1715 + return 1; // L: 1716 + } else if (var0 == 3165) { + --class16.Interpreter_intStackSize; // L: 1719 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1720 + return 1; // L: 1721 + } else if (var0 == 3166) { + class16.Interpreter_intStackSize -= 2; // L: 1724 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1725 + return 1; // L: 1726 + } else if (var0 == 3167) { + class16.Interpreter_intStackSize -= 2; // L: 1729 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1730 + return 1; // L: 1731 + } else if (var0 == 3168) { + class16.Interpreter_intStackSize -= 2; // L: 1734 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1735 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1736 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1737 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1738 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1739 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1740 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1741 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1742 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1743 + return 1; // L: 1744 + } else if (var0 == 3169) { + return 1; // L: 1747 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1750 + return 1; // L: 1751 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1754 + return 1; // L: 1755 + } else if (var0 == 3172) { + --class16.Interpreter_intStackSize; // L: 1758 + return 1; // L: 1759 + } else if (var0 == 3173) { + --class16.Interpreter_intStackSize; // L: 1762 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1763 + return 1; // L: 1764 + } else if (var0 == 3174) { + --class16.Interpreter_intStackSize; // L: 1767 + return 1; // L: 1768 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1771 + return 1; // L: 1772 + } else if (var0 == 3176) { + return 1; // L: 1775 + } else if (var0 == 3177) { + return 1; // L: 1778 + } else if (var0 == 3178) { + --Interpreter.Interpreter_stringStackSize; // L: 1781 + return 1; // L: 1782 + } else if (var0 == 3179) { + return 1; // L: 1785 + } else if (var0 == 3180) { + --Interpreter.Interpreter_stringStackSize; // L: 1788 + return 1; // L: 1789 + } else if (var0 == 3181) { + var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1792 + MouseRecorder.method2109((double)((float)var10 / 200.0F + 0.5F)); // L: 1793 + return 1; // L: 1794 + } else if (var0 == 3182) { + float var3 = 200.0F * ((float)Login.clientPreferences.field1304 - 0.5F); // L: 1797 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1798 + return 1; // L: 1799 + } else if (var0 != 3183 && var0 != 3184) { + return 2; // L: 1805 + } else { + --class16.Interpreter_intStackSize; // L: 1802 + return 1; // L: 1803 + } } } } - - return false; // L: 57 - } else { - return true; } } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index ae761f9039..dd41eb4769 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -4,47 +4,51 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("fj") +@ObfuscatedName("ec") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Llc;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; static { FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); } // L: 9 - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IS)Ljava/lang/String;", - garbageValue = "4003" + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "-773093747" ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; // L: 22 - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "14" - ) - static int method3709(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1124 - 7.0D) * 256.0D); // L: 3277 + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 218 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 219 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 220 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 221 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 222 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 223 + return Float.TYPE; + } else if (var0.equals("D")) { // L: 224 + return Double.TYPE; + } else if (var0.equals("C")) { // L: 225 + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 226 227 + } } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index 1a23844ac9..eaaea05f36 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("ox") @Implements("FillMode") public enum FillMode implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lox;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lox;" ) - field3896(1, 1), - @ObfuscatedName("d") + field4229(1, 1), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lox;" ) - field3897(2, 2); + field4230(2, 2); - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 981795357 + intValue = -1972567139 ) - public final int field3898; - @ObfuscatedName("y") + public final int field4232; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1459508057 + intValue = -1190954597 ) - final int field3895; + final int field4231; FillMode(int var3, int var4) { - this.field3898 = var3; // L: 19 - this.field3895 = var4; // L: 20 + this.field4232 = var3; // L: 19 + this.field4231 = var4; // L: 20 } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3895; // L: 24 + return this.field4231; // L: 24 } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 128cde9770..76dee6ac48 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,42 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("fz") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("n") + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("Widget_archive") + public static AbstractArchive Widget_archive; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1598532417 + intValue = 41501185 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 142791141 + intValue = 969764679 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 319839389 + intValue = 1466324567 ) @Export("y") int y; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 5699265069963851797L + longValue = 1931928399249517797L ) @Export("tag") public long tag; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -641786975 + intValue = 1857453107 ) @Export("flags") int flags; diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index a4f3930919..ac75f54902 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,75 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("ke") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("FloorOverlayDefinition_archive") - static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("v") + public static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("FloorOverlayDefinition_cached") static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 229154339 + intValue = 980969933 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 537117493 + intValue = -2093072057 ) @Export("texture") public int texture; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -151922243 + intValue = 1989870403 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1474561599 + intValue = 537487059 ) @Export("hue") public int hue; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 580468697 + intValue = -1328712215 ) @Export("saturation") public int saturation; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1227736915 + intValue = -969196131 ) @Export("lightness") public int lightness; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -214097909 + intValue = 803362363 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -996907009 + intValue = 2116212795 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2132940635 + intValue = 61795661 ) @Export("secondaryLightness") public int secondaryLightness; @@ -88,124 +88,124 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; // L: 15 } // L: 23 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "-113" ) @Export("postDecode") void postDecode() { - if (this.secondaryRgb != -1) { // L: 41 - this.setHsl(this.secondaryRgb); // L: 42 - this.secondaryHue = this.hue; // L: 43 - this.secondarySaturation = this.saturation; // L: 44 - this.secondaryLightness = this.lightness; // L: 45 + 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); // L: 47 - } // L: 48 + this.setHsl(this.primaryRgb); // L: 43 + } // L: 44 - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "581864251" + descriptor = "(Lnu;IB)V", + garbageValue = "6" ) @Export("decode") void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 52 - if (var3 == 0) { // L: 53 - return; // L: 56 + int var3 = var1.readUnsignedByte(); // L: 48 + if (var3 == 0) { // L: 49 + return; // L: 52 } - this.decodeNext(var1, var3, var2); // L: 54 + this.decodeNext(var1, var3, var2); // L: 50 } } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;IIB)V", - garbageValue = "1" + descriptor = "(Lnu;III)V", + garbageValue = "-1985782893" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 59 + if (var2 == 1) { // L: 55 this.primaryRgb = var1.readMedium(); - } else if (var2 == 2) { // L: 60 - this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { // L: 61 + } else if (var2 == 2) { + this.texture = var1.readUnsignedByte(); // L: 56 + } else if (var2 == 5) { // L: 57 this.hideUnderlay = false; - } else if (var2 == 7) { // L: 62 - this.secondaryRgb = var1.readMedium(); - } else if (var2 == 8) { // L: 63 + } else if (var2 == 7) { + this.secondaryRgb = var1.readMedium(); // L: 58 + } else if (var2 == 8) { // L: 59 } - } // L: 65 + } // L: 61 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "115" + descriptor = "(II)V", + garbageValue = "-524815797" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 68 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 69 - double var6 = (double)(var1 & 255) / 256.0D; // L: 70 - double var8 = var2; // L: 71 - if (var4 < var2) { // L: 72 + 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) { // L: 73 + if (var6 < var8) { // L: 69 var8 = var6; } - double var10 = var2; // L: 74 - if (var4 > var2) { // L: 75 + double var10 = var2; // L: 70 + if (var4 > var2) { // L: 71 var10 = var4; } - if (var6 > var10) { // L: 76 + if (var6 > var10) { // L: 72 var10 = var6; } - double var12 = 0.0D; // L: 77 - double var14 = 0.0D; // L: 78 - double var16 = (var8 + var10) / 2.0D; // L: 79 - if (var8 != var10) { // L: 80 - if (var16 < 0.5D) { // L: 81 + double var12 = 0.0D; // L: 73 + double var14 = 0.0D; // L: 74 + double var16 = (var8 + var10) / 2.0D; // L: 75 + if (var8 != var10) { // L: 76 + if (var16 < 0.5D) { // L: 77 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 82 + if (var16 >= 0.5D) { // L: 78 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { // L: 83 + if (var2 == var10) { // L: 79 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 84 + } else if (var10 == var4) { // L: 80 var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var6 == var10) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 85 + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 81 } } - var12 /= 6.0D; // L: 87 - this.hue = (int)(256.0D * var12); // L: 88 - this.saturation = (int)(256.0D * var14); // L: 89 - this.lightness = (int)(256.0D * var16); // L: 90 - if (this.saturation < 0) { // L: 91 + var12 /= 6.0D; // L: 83 + this.hue = (int)(256.0D * var12); // L: 84 + this.saturation = (int)(256.0D * var14); // L: 85 + this.lightness = (int)(var16 * 256.0D); // L: 86 + if (this.saturation < 0) { // L: 87 this.saturation = 0; - } else if (this.saturation > 255) { // L: 92 + } else if (this.saturation > 255) { // L: 88 this.saturation = 255; } - if (this.lightness < 0) { // L: 93 + if (this.lightness < 0) { // L: 89 this.lightness = 0; - } else if (this.lightness > 255) { // L: 94 + } else if (this.lightness > 255) { // L: 90 this.lightness = 255; } - } // L: 95 + } // L: 91 } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 26692ba1a9..4cb06477fc 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("iw") +@ObfuscatedName("ky") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -130851115 + intValue = 21649565 ) @Export("rgb") int rgb; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 873128511 + intValue = 125421579 ) @Export("hue") public int hue; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1930192423 + intValue = 1389342831 ) @Export("saturation") public int saturation; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1785513219 + intValue = -1607996817 ) @Export("lightness") public int lightness; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -114271383 + intValue = 995550405 ) @Export("hueMultiplier") public int hueMultiplier; @@ -54,147 +54,124 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - FloorUnderlayDefinition() { + public FloorUnderlayDefinition() { this.rgb = 0; // L: 12 - } // L: 18 + } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1258878623" + garbageValue = "-473123862" ) @Export("postDecode") - void postDecode() { - this.setHsl(this.rgb); // L: 32 - } // L: 33 + public void postDecode() { + this.setHsl(this.rgb); // L: 34 + } // L: 35 - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "166104294" + descriptor = "(Lnu;II)V", + garbageValue = "1271291801" ) @Export("decode") - void decode(Buffer var1, int var2) { + public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); // L: 37 - if (var3 == 0) { // L: 38 - return; // L: 41 + int var3 = var1.readUnsignedByte(); // L: 39 + if (var3 == 0) { // L: 40 + return; // L: 43 } - this.decodeNext(var1, var3, var2); // L: 39 + this.decodeNext(var1, var3, var2); // L: 41 } } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;III)V", - garbageValue = "1874969287" + descriptor = "(Lnu;III)V", + garbageValue = "-1899368585" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { // L: 44 + if (var2 == 1) { // L: 46 this.rgb = var1.readMedium(); } - } // L: 46 + } // L: 48 - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1796735191" + descriptor = "(IB)V", + garbageValue = "6" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 49 - double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 50 - double var6 = (double)(var1 & 255) / 256.0D; // L: 51 - double var8 = var2; // L: 52 - if (var4 < var2) { // L: 53 + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 51 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 52 + double var6 = (double)(var1 & 255) / 256.0D; // L: 53 + double var8 = var2; // L: 54 + if (var4 < var2) { // L: 55 var8 = var4; } - if (var6 < var8) { // L: 54 + if (var6 < var8) { // L: 56 var8 = var6; } - double var10 = var2; // L: 55 - if (var4 > var2) { // L: 56 + double var10 = var2; // L: 57 + if (var4 > var2) { // L: 58 var10 = var4; } - if (var6 > var10) { // L: 57 + if (var6 > var10) { // L: 59 var10 = var6; } - double var12 = 0.0D; // L: 58 - double var14 = 0.0D; // L: 59 - double var16 = (var10 + var8) / 2.0D; // L: 60 - if (var8 != var10) { // L: 61 - if (var16 < 0.5D) { // L: 62 - var14 = (var10 - var8) / (var10 + var8); + double var12 = 0.0D; // L: 60 + double var14 = 0.0D; // L: 61 + double var16 = (var8 + var10) / 2.0D; // L: 62 + if (var10 != var8) { // L: 63 + if (var16 < 0.5D) { // L: 64 + var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { // L: 63 + if (var16 >= 0.5D) { // L: 65 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { // L: 64 + if (var10 == var2) { // L: 66 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { // L: 65 + } else if (var4 == var10) { // L: 67 var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 66 + var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 68 } } - var12 /= 6.0D; // L: 68 - this.saturation = (int)(var14 * 256.0D); // L: 69 - this.lightness = (int)(var16 * 256.0D); // L: 70 - if (this.saturation < 0) { // L: 71 + var12 /= 6.0D; // L: 70 + this.saturation = (int)(var14 * 256.0D); // L: 71 + this.lightness = (int)(256.0D * var16); // L: 72 + if (this.saturation < 0) { // L: 73 this.saturation = 0; - } else if (this.saturation > 255) { // L: 72 + } else if (this.saturation > 255) { // L: 74 this.saturation = 255; } - if (this.lightness < 0) { // L: 73 + if (this.lightness < 0) { // L: 75 this.lightness = 0; - } else if (this.lightness > 255) { // L: 74 + } else if (this.lightness > 255) { // L: 76 this.lightness = 255; } - if (var16 > 0.5D) { // L: 75 - this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); + if (var16 > 0.5D) { // L: 77 + this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D); } else { - this.hueMultiplier = (int)(var14 * var16 * 512.0D); // L: 76 + this.hueMultiplier = (int)(512.0D * var16 * var14); // L: 78 } - if (this.hueMultiplier < 1) { // L: 77 + if (this.hueMultiplier < 1) { // L: 79 this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 78 - } // L: 79 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Ljp;", - garbageValue = "-122" - ) - @Export("StructDefinition_getStructDefinition") - public static StructComposition StructDefinition_getStructDefinition(int var0) { - StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23 - if (var1 != null) { // L: 24 - return var1; - } else { - byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25 - var1 = new StructComposition(); // L: 26 - if (var2 != null) { // L: 27 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 28 - StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29 - return var1; // L: 30 - } - } + this.hue = (int)((double)this.hueMultiplier * var12); // L: 80 + } // L: 81 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index bc7488170f..792210fd4a 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,7 +2,7 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kl") +@ObfuscatedName("kq") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { @@ -13,7 +13,7 @@ public final class Font extends AbstractFont { super(var1); // L: 11 } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } // L: 44 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47 diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index c98bc80fea..3aef900553 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,59 +1,55 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("mv") @Implements("FontName") public class FontName { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lig;" + @ObfuscatedName("lb") + @ObfuscatedGetter( + intValue = 1196232611 ) - @Export("Widget_archive") - public static AbstractArchive Widget_archive; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lim;" - ) - static StudioGame field3699; - @ObfuscatedName("z") + @Export("menuY") + static int menuY; + @ObfuscatedName("k") @Export("name") String name; @@ -70,23 +66,31 @@ public class FontName { this.name = var1; // L: 16 } // L: 17 - @ObfuscatedName("n") + @ObfuscatedName("kn") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1321910935" + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "72" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitComposition var1 = Tiles.method1219(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 - } + static String method6285(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 11607 + if (Client.gameBuild == 1) { // L: 11608 + var0 = var0 + "-wtrc"; + } else if (Client.gameBuild == 2) { // L: 11609 + var0 = var0 + "-wtqa"; + } else if (Client.gameBuild == 3) { // L: 11610 + var0 = var0 + "-wtwip"; + } else if (Client.gameBuild == 5) { // L: 11611 + var0 = var0 + "-wti"; + } else if (Client.gameBuild == 4) { // L: 11612 + var0 = "local"; + } - @ObfuscatedName("e") - public static int method5502(long var0) { - return (int)(var0 >>> 14 & 3L); // L: 72 + String var3 = ""; // L: 11613 + if (class0.field4 != null) { // L: 11614 + var3 = "/p=" + class0.field4; + } + + String var4 = "runescape.com"; // L: 11615 + return var2 + var0 + "." + var4 + "/l=" + class35.clientLanguage + "/a=" + FaceNormal.field2002 + var3 + "/"; // L: 11616 } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 41a1661ef5..a3fae18d34 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,27 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("mj") @Implements("Fonts") public class Fonts { - @ObfuscatedName("n") + @ObfuscatedName("s") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("map") HashMap map; @ObfuscatedSignature( - descriptor = "(Lig;Lig;)V" + descriptor = "(Lir;Lir;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; // L: 14 @@ -32,10 +35,10 @@ public class Fonts { this.map = new HashMap(); // L: 16 } // L: 17 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Lkq;I)Ljava/util/HashMap;", - garbageValue = "-988913234" + descriptor = "([Lmv;I)Ljava/util/HashMap;", + garbageValue = "1411083215" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -47,49 +50,14 @@ public class Fonts { if (this.map.containsKey(var5)) { // L: 26 var2.put(var5, this.map.get(var5)); // L: 27 } else { - AbstractArchive var7 = this.spritesArchive; // L: 31 - AbstractArchive var8 = this.fontsArchive; // L: 32 - String var9 = var5.name; // L: 33 - int var10 = var7.getGroupId(var9); // L: 35 - int var11 = var7.getFileId(var10, ""); // L: 36 - byte[] var14 = var7.takeFile(var10, var11); // L: 41 - boolean var13; - if (var14 == null) { // L: 42 - var13 = false; // L: 43 - } else { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var14); // L: 46 - var13 = true; // L: 47 - } - - Font var12; - if (!var13) { // L: 49 - var12 = null; // L: 50 - } else { - byte[] var15 = var8.takeFile(var10, var11); // L: 54 - Font var18; - if (var15 == null) { // L: 56 - var18 = null; // L: 57 - } else { - Font var16 = new Font(var15, class105.SpriteBuffer_xOffsets, class336.SpriteBuffer_yOffsets, class336.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, HorizontalAlignment.SpriteBuffer_spritePalette, class2.SpriteBuffer_pixels); // L: 60 - class105.SpriteBuffer_xOffsets = null; // L: 62 - class336.SpriteBuffer_yOffsets = null; // L: 63 - class336.SpriteBuffer_spriteWidths = null; // L: 64 - class225.SpriteBuffer_spriteHeights = null; // L: 65 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 66 - class2.SpriteBuffer_pixels = null; // L: 67 - var18 = var16; // L: 69 - } - - var12 = var18; // L: 71 - } - - if (var12 != null) { // L: 76 - this.map.put(var5, var12); // L: 77 - var2.put(var5, var12); // L: 78 + Font var6 = ClanChat.method5655(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; // L: 84 + return var2; // L: 39 } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 99decf1772..26479c804e 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,31 +1,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("fb") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lig;" + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -560796659 ) - static AbstractArchive field1904; - @ObfuscatedName("he") + public static int field2007; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "[Llm;" - ) - @Export("crossSprites") - static SpritePixels[] crossSprites; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Leg;" + descriptor = "[Lft;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lig;Lig;IZ)V" + descriptor = "(Lir;Lir;IZ)V" ) Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); // L: 35 @@ -62,24 +57,32 @@ public class Frames extends DualNode { } // L: 60 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-196452763" + garbageValue = "394513826" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; // L: 63 } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lig;Lig;ZI)V", - garbageValue = "-1252177889" + descriptor = "(DDII)[D", + garbageValue = "-880318163" ) - public static void method3429(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectComposition.ObjectDefinition_archive = var0; // L: 73 - ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74 - ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75 - } // L: 76 + public static double[] method3639(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; // L: 13 + double[] var6 = new double[var5]; // L: 14 + int var7 = -var4; + + for (int var8 = 0; var7 <= var4; ++var8) { + double var11 = AbstractUserComparator.method5714(((double)var7 - var0) / var2) / var2; // L: 20 + var6[var8] = var11; // L: 22 + ++var7; // L: 15 + } + + return var6; // L: 24 + } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 6fe7aa130f..88bd7a7382 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,27 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("lv") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("ce") - @ObfuscatedSignature( - descriptor = "Lbb;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("n") - boolean field3663; - @ObfuscatedName("v") - boolean field3661; + @ObfuscatedName("f") + boolean field3828; + @ObfuscatedName("o") + boolean field3827; Friend() { } // L: 9 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lko;I)I", - garbageValue = "-1403484495" + descriptor = "(Llv;B)I", + garbageValue = "61" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -35,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field3663 && !var1.field3663) { // L: 16 + } else if (this.field3828 && !var1.field3828) { // L: 16 return -1; - } else if (!this.field3663 && var1.field3663) { // L: 17 + } else if (!this.field3828 && var1.field3828) { // L: 17 return 1; - } else if (this.field3661 && !var1.field3661) { // L: 18 + } else if (this.field3827 && !var1.field3827) { // L: 18 return -1; - } else if (!this.field3661 && var1.field3661) { // L: 19 + } else if (!this.field3827 && var1.field3827) { // L: 19 return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("at") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljn;I)I", - garbageValue = "642739557" + descriptor = "(Llt;I)I", + garbageValue = "1200801892" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -61,4 +55,14 @@ public class Friend extends Buddy { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); // L: 33 } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-2006217942" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 115 + } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 7b0c196dd4..c5ddd18575 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,29 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("lk") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 272461805 - ) - public int field3676; - @ObfuscatedName("c") + @ObfuscatedName("sl") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Llp;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "Lfn;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1609482177 + ) + public int field3833; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llw;" ) @Export("username") public Username username; - @ObfuscatedName("y") + @ObfuscatedName("u") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lkk;I)V" + descriptor = "(Llw;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3676 = (int)(Tiles.currentTimeMillis() / 1000L); // L: 106 + this.field3833 = (int)(ObjectSound.currentTimeMillis() / 1000L); // L: 106 this.username = var1; // L: 107 this.world = (short)var2; // L: 108 } // L: 109 diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 859c8c587a..a8ea45828b 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -4,311 +4,340 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("bl") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lhu;" + ) + @Export("scriptDotWidget") + static Widget scriptDotWidget; + @ObfuscatedName("oc") + @ObfuscatedSignature( + descriptor = "Lnh;" + ) + static class368 field910; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lmf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkm;" + descriptor = "Llx;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkp;" + descriptor = "Llu;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1793991825 + intValue = -1378545391 ) - int field1084; + int field908; @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lmf;)V" ) FriendSystem(LoginType var1) { - this.field1084 = 0; // L: 23 + this.field908 = 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("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1945346484" + descriptor = "(B)Z", + garbageValue = "0" ) - boolean method1974() { - return this.field1084 == 2; // L: 32 + boolean method1719() { + return this.field908 == 2; // L: 32 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2084368484" + descriptor = "(B)V", + garbageValue = "13" ) - final void method1975() { - this.field1084 = 1; // L: 36 + final void method1720() { + this.field908 = 1; // L: 36 } // L: 37 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-1050410631" + descriptor = "(Lnu;II)V", + garbageValue = "474808595" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); // L: 40 - this.field1084 = 2; // L: 41 - class105.method2448(); // L: 42 - } // L: 43 + this.field908 = 2; // L: 41 - @ObfuscatedName("c") + for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43 + Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44 + var4.clearIsFriend(); // L: 45 + } + + GameEngine.method682(); // L: 47 + if (InterfaceParent.clanChat != null) { // L: 48 + InterfaceParent.clanChat.clearFriends(); // L: 49 + } + + } // L: 52 + + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1241092725" + garbageValue = "1118155085" ) @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.field3676 < Tiles.currentTimeMillis() / 1000L - 5L) { // L: 47 + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55 + if ((long)var1.field3833 < ObjectSound.currentTimeMillis() / 1000L - 5L) { // L: 56 if (var1.world > 0) { - AbstractWorldMapData.addGameMessage(5, "", var1.username + " has logged in."); // L: 48 + class69.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 } - if (var1.world == 0) { // L: 49 - AbstractWorldMapData.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { // L: 58 + class69.addGameMessage(5, "", var1.username + " has logged out."); } - var1.remove(); // L: 50 + var1.remove(); // L: 59 } } - } // L: 53 + } // L: 62 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "7" + garbageValue = "61" ) @Export("clear") final void clear() { - this.field1084 = 0; // L: 56 - this.friendsList.clear(); // L: 57 - this.ignoreList.clear(); // L: 58 - } // L: 59 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lkk;ZB)Z", - garbageValue = "44" - ) - @Export("isFriended") - final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { // L: 62 - return false; - } else if (var1.equals(UserComparator9.localPlayer.username)) { // L: 63 - return true; - } else { - return this.friendsList.isFriended(var1, var2); // L: 64 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lkk;I)Z", - garbageValue = "-645506648" - ) - @Export("isIgnored") - final boolean isIgnored(Username var1) { - if (var1 == null) { // L: 69 - return false; - } else { - return this.ignoreList.contains(var1); // L: 70 - } - } + this.field908 = 0; // L: 65 + this.friendsList.clear(); // L: 66 + this.ignoreList.clear(); // L: 67 + } // L: 68 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "54" + descriptor = "(Llw;ZI)Z", + garbageValue = "-302791861" ) - @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 - class300.method5473("Your friend list is full. Max of 200 for free users, and 400 for members"); // L: 80 - } else if (UserComparator9.localPlayer.username.equals(var2)) { // L: 84 - class300.method5473("You can't add yourself to your own friend list"); // L: 86 - } else if (this.isFriended(var2, false)) { // L: 90 - class300.method5473(var1 + " is already on your friend list"); // L: 92 - } else if (this.isIgnored(var2)) { // L: 96 - class300.method5473("Please remove " + var1 + " from your ignore list first"); // L: 98 - } else { - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); // L: 104 - var3.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var1)); // L: 105 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 106 - Client.packetWriter.addNode(var3); // L: 107 - } - } + @Export("isFriended") + final boolean isFriended(Username var1, boolean var2) { + if (var1 == null) { // L: 71 + return false; + } else if (var1.equals(Varcs.localPlayer.username)) { // L: 72 + return true; + } else { + return this.friendsList.isFriended(var1, var2); // L: 73 } - } // L: 82 88 94 100 109 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "23277245" - ) - @Export("friendsListIsFull") - final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field673 != 1; // L: 116 } - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-821036710" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { // L: 123 - Username var2 = new Username(var1, this.loginType); // L: 124 - if (var2.hasCleanName()) { // L: 125 - if (this.canAddIgnore()) { // L: 126 - WorldMapAreaData.method781(); // L: 127 - } else if (UserComparator9.localPlayer.username.equals(var2)) { // L: 130 - NetSocket.method3748(); // L: 131 - } else if (this.isIgnored(var2)) { // L: 134 - class300.method5473(var1 + " is already on your ignore list"); // L: 136 - } else if (this.isFriended(var2, false)) { // L: 140 - Tiles.method1209(var1); // L: 141 - } else { - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2321, Client.packetWriter.isaacCipher); // L: 146 - var3.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var1)); // L: 147 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 148 - Client.packetWriter.addNode(var3); // L: 149 - } - } - } - } // L: 128 132 138 142 151 - @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Llw;I)Z", + garbageValue = "2086987830" + ) + @Export("isIgnored") + final boolean isIgnored(Username var1) { + if (var1 == null) { // L: 78 + return false; + } else { + return this.ignoreList.contains(var1); // L: 79 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "91342792" + ) + @Export("addFriend") + final void addFriend(String var1) { + if (var1 != null) { // L: 84 + Username var2 = new Username(var1, this.loginType); // L: 85 + if (var2.hasCleanName()) { // L: 86 + if (this.friendsListIsFull()) { // L: 87 + class124.method2488(); // L: 88 + } else if (Varcs.localPlayer.username.equals(var2)) { // L: 91 + Object var10000 = null; // L: 93 + String var4 = "You can't add yourself to your own friend list"; + class69.addGameMessage(30, "", var4); // L: 95 + } else if (this.isFriended(var2, false)) { // L: 100 + class147.method3014(var1); // L: 101 + } else if (this.isIgnored(var2)) { // L: 104 + Projectile.method1981(var1); // L: 105 + } else { + PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 110 + var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 111 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 112 + Client.packetWriter.addNode(var3); // L: 113 + } + } + } + } // L: 89 98 102 106 115 + + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-319380471" + garbageValue = "2112164938" + ) + @Export("friendsListIsFull") + final boolean friendsListIsFull() { + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field720 != 1; // L: 139 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-9" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 146 + Username var2 = new Username(var1, this.loginType); // L: 147 + if (var2.hasCleanName()) { // L: 148 + if (this.canAddIgnore()) { // L: 149 + class157.method3113(); // L: 150 + } else if (Varcs.localPlayer.username.equals(var2)) { // L: 153 + class35.method435(); // L: 154 + } else if (this.isIgnored(var2)) { // L: 157 + HealthBarUpdate.method2180(var1); // L: 158 + } else if (this.isFriended(var2, false)) { // L: 161 + class11.method205(var1); // L: 162 + } else { + PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); // L: 167 + var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 168 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 169 + Client.packetWriter.addNode(var3); // L: 170 + } + } + } + } // L: 151 155 159 163 172 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "57" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field673 != 1; // L: 166 + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field720 != 1; // L: 203 } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;B)V", - garbageValue = "14" + garbageValue = "45" ) @Export("removeFriend") final void removeFriend(String var1) { - if (var1 != null) { // L: 173 - Username var2 = new Username(var1, this.loginType); // L: 174 - if (var2.hasCleanName()) { // L: 175 - if (this.friendsList.removeByUsername(var2)) { // L: 176 - Client.field857 = Client.cycleCntr; // L: 178 - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); // L: 181 - var3.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var1)); // L: 182 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 183 - Client.packetWriter.addNode(var3); // L: 184 + if (var1 != null) { // L: 210 + Username var2 = new Username(var1, this.loginType); // L: 211 + if (var2.hasCleanName()) { // L: 212 + if (this.friendsList.removeByUsername(var2)) { // L: 213 + MouseHandler.method707(); // L: 214 + PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); // L: 216 + var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 217 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 218 + Client.packetWriter.addNode(var3); // L: 219 + } + + for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 222 + Player var4 = Client.players[Players.Players_indices[var5]]; // L: 223 + var4.clearIsFriend(); // L: 224 + } + + GameEngine.method682(); // L: 226 + if (InterfaceParent.clanChat != null) { // L: 227 + InterfaceParent.clanChat.clearFriends(); // L: 228 } - class105.method2448(); // L: 186 } } - } // L: 187 + } // L: 231 @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1962434605" + garbageValue = "-784998952" ) @Export("removeIgnore") final void removeIgnore(String var1) { - if (var1 != null) { // L: 190 - Username var2 = new Username(var1, this.loginType); // L: 191 - if (var2.hasCleanName()) { // L: 192 - if (this.ignoreList.removeByUsername(var2)) { // L: 193 - Client.field857 = Client.cycleCntr; // L: 195 - PacketBufferNode var3 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2329, Client.packetWriter.isaacCipher); // L: 198 - var3.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var1)); // L: 199 - var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 200 - Client.packetWriter.addNode(var3); // L: 201 + if (var1 != null) { // L: 234 + Username var2 = new Username(var1, this.loginType); // L: 235 + if (var2.hasCleanName()) { // L: 236 + if (this.ignoreList.removeByUsername(var2)) { // L: 237 + MouseHandler.method707(); // L: 238 + PacketBufferNode var3 = ObjectComposition.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); // L: 240 + var3.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var1)); // L: 241 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 242 + Client.packetWriter.addNode(var3); // L: 243 } - class51.FriendSystem_invalidateIgnoreds(); // L: 203 + class1.FriendSystem_invalidateIgnoreds(); // L: 245 } } - } // L: 204 + } // L: 246 - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkk;I)Z", - garbageValue = "-914482688" + descriptor = "(Llw;I)Z", + garbageValue = "-448496053" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 216 - return var2 != null && var2.hasWorld(); // L: 217 + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 258 + return var2 != null && var2.hasWorld(); // L: 259 } - @ObfuscatedName("ji") + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "(Lhz;IIB)V", - garbageValue = "1" + descriptor = "(Lcs;ZI)V", + garbageValue = "1735869199" ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10875 - if (var0 != null) { // L: 10877 - Widget var4 = Strings.method4325(var0); // L: 10880 - if (var4 == null) { // L: 10881 - var4 = var0.parent; - } - - if (var4 != null) { // L: 10884 - Client.clickedWidget = var0; // L: 10888 - var4 = Strings.method4325(var0); // L: 10891 - if (var4 == null) { // L: 10892 - var4 = var0.parent; - } - - Client.clickedWidgetParent = var4; // L: 10895 - Client.widgetClickX = var1; // L: 10896 - Client.widgetClickY = var2; // L: 10897 - PlayerComposition.widgetDragDuration = 0; // L: 10898 - Client.isDraggingWidget = false; // L: 10899 - int var6 = Client.menuOptionsCount - 1; // L: 10902 - if (var6 != -1) { // L: 10905 - class195.tempMenuAction = new MenuAction(); // L: 10906 - class195.tempMenuAction.param0 = Client.menuArguments1[var6]; // L: 10907 - class195.tempMenuAction.param1 = Client.menuArguments2[var6]; // L: 10908 - class195.tempMenuAction.opcode = Client.menuOpcodes[var6]; // L: 10909 - class195.tempMenuAction.identifier = Client.menuIdentifiers[var6]; // L: 10910 - class195.tempMenuAction.action = Client.menuActions[var6]; // L: 10911 - } - - return; // L: 10913 - } + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 3927 + var0.isUnanimated = false; // L: 3928 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 3929 3930 + var0.isUnanimated = true; } + int var2 = var0.x >> 7; // L: 3932 + int var3 = var0.y >> 7; // L: 3933 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 3934 + long var4 = AttackOption.calculateTag(0, 0, 0, false, var0.index); // L: 3935 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 3936 + var0.isUnanimated = false; // L: 3937 + var0.tileHeight = UserComparator7.getTileHeight(var0.x, var0.y, class26.Client_plane); // L: 3938 + var0.playerCycle = Client.cycle; // L: 3939 + WorldMapArea.scene.addNullableObject(class26.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 3940 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 3943 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 3944 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 3945 + } + + var0.tileHeight = UserComparator7.getTileHeight(var0.x, var0.y, class26.Client_plane); // L: 3947 + var0.playerCycle = Client.cycle; // L: 3948 + WorldMapArea.scene.drawEntity(class26.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 3949 + } + } } - } // L: 10886 + + } // L: 3953 } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index dd22d2180d..27c73cd210 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,61 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("lx") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("d") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lim;" + ) + static GameBuild field3812; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lmf;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2002671207 + intValue = 436175223 ) - int field3655; - @ObfuscatedName("s") + int field3815; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Ljp;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lmf;)V" ) public FriendsList(LoginType var1) { super(400); // L: 17 - this.field3655 = 1; // L: 13 + this.field3815 = 1; // L: 13 this.friendLoginUpdates = new LinkDeque(); // L: 14 this.loginType = var1; // L: 18 } // L: 19 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljn;", - garbageValue = "-315842787" + descriptor = "(I)Llt;", + garbageValue = "-1522637653" ) @Export("newInstance") User newInstance() { return new Friend(); // L: 22 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)[Ljn;", - garbageValue = "1723641195" + descriptor = "(II)[Llt;", + garbageValue = "1232560537" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; // L: 26 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkk;ZI)Z", - garbageValue = "-117027707" + descriptor = "(Llw;ZS)Z", + garbageValue = "255" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -70,10 +75,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("bk") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "277533413" + descriptor = "(Lnu;II)V", + garbageValue = "2071340484" ) @Export("read") public void read(Buffer var1, int var2) { @@ -137,17 +142,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { // L: 88 - var11.int2 = ++this.field3655 - 1; // L: 89 + var11.int2 = ++this.field3815 - 1; // L: 89 if (var11.world == -1 && var6 == 0) { // L: 90 - var11.int2 = -(var11.int2 * 1612943523) * 975938315; + var11.int2 = -(var11.int2 * -755465589) * 1237996835; } var11.world = var6; // L: 91 } var11.rank = var7; // L: 93 - var11.field3663 = var9; // L: 94 - var11.field3661 = var10; // L: 95 + var11.field3828 = var9; // L: 94 + var11.field3827 = var10; // L: 95 continue; // L: 96 } @@ -158,23 +163,4 @@ public class FriendsList extends UserList { return; // L: 98 } } - - @ObfuscatedName("ls") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-22" - ) - static void method5386() { - if (HealthBarUpdate.field1016 != null) { // L: 11661 - Client.field674 = Client.cycle; // L: 11662 - HealthBarUpdate.field1016.method4510(); // L: 11663 - - for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11664 - if (Client.players[var0] != null) { // L: 11665 - HealthBarUpdate.field1016.method4509((Client.players[var0].x >> 7) + GrandExchangeOfferNameComparator.baseX, (Client.players[var0].y >> 7) + NetCache.baseY); // L: 11666 - } - } - } - - } // L: 11670 } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 628887632a..2b9a40fbb3 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,16 +4,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mg") +@ObfuscatedName("ok") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("t") - @Export("formattedOperatingSystemName") - public static String formattedOperatingSystemName; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 + @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" @@ -21,14 +22,10 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } // L: 13 - public GZipDecompressor() { - this(-1, 1000000, 1000000); // L: 10 - } // L: 11 - - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;[BI)V", - garbageValue = "1829368113" + descriptor = "(Lnu;[BB)V", + garbageValue = "1" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { @@ -50,4 +47,4 @@ public class GZipDecompressor { throw new RuntimeException(""); } } // L: 27 -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index 04a49e357e..195ea3e44f 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("im") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lim;" ) @Export("LIVE") static final GameBuild LIVE; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lim;" ) @Export("BUILDLIVE") static final GameBuild BUILDLIVE; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lim;" ) @Export("RC") static final GameBuild RC; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liu;" + descriptor = "Lim;" ) @Export("WIP") static final GameBuild WIP; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("name") public final String name; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 627083657 + intValue = 597489609 ) @Export("buildId") - public final int buildId; + final int buildId; static { LIVE = new GameBuild("LIVE", 0); // L: 5 @@ -53,177 +53,27 @@ public class GameBuild { this.buildId = var2; // L: 18 } // L: 19 - @ObfuscatedName("gf") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1767980909" + descriptor = "(IIB)I", + garbageValue = "-107" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field938 = 0L; // L: 3811 - if (var0 >= 2) { // L: 3812 - Client.isResizable = true; + static int method4386(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 { - Client.isResizable = false; // L: 3813 - } + int var3 = 0; // L: 31 - if (BoundaryObject.getWindowedMode() == 1) { // L: 3814 - class1.client.setMaxCanvasSize(765, 503); // L: 3815 - } else { - class1.client.setMaxCanvasSize(7680, 2160); // L: 3818 - } - - if (Client.gameState >= 25) { // L: 3820 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); // L: 3822 - var1.packetBuffer.writeByte(BoundaryObject.getWindowedMode()); // L: 3823 - var1.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); // L: 3824 - var1.packetBuffer.writeShort(class25.canvasHeight); // L: 3825 - Client.packetWriter.addNode(var1); // L: 3826 - } - - } // L: 3828 - - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "44" - ) - static boolean method4350() { - return (Client.drawPlayerNames & 4) != 0; // L: 4418 - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - descriptor = "(Ljy;IIII)V", - garbageValue = "2014518085" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { - if (Client.menuOptionsCount < 400) { // L: 9186 - if (var0.transforms != null) { // L: 9187 - var0 = var0.transform(); - } - - if (var0 != null) { // L: 9188 - if (var0.isInteractable) { // L: 9189 - if (!var0.isFollower || Client.followerIndex == var1) { // L: 9190 - String var4 = var0.name; // L: 9191 - int var7; - int var8; - if (var0.combatLevel != 0) { // L: 9192 - var7 = var0.combatLevel; // L: 9195 - var8 = UserComparator9.localPlayer.combatLevel; // L: 9196 - int var9 = var8 - var7; // L: 9198 - String var6; - if (var9 < -9) { // L: 9199 - var6 = FileSystem.colorStartTag(16711680); // L: 9200 - } else if (var9 < -6) { // L: 9203 - var6 = FileSystem.colorStartTag(16723968); // L: 9204 - } else if (var9 < -3) { // L: 9207 - var6 = FileSystem.colorStartTag(16740352); // L: 9208 - } else if (var9 < 0) { // L: 9211 - var6 = FileSystem.colorStartTag(16756736); // L: 9212 - } else if (var9 > 9) { // L: 9215 - var6 = FileSystem.colorStartTag(65280); // L: 9216 - } else if (var9 > 6) { // L: 9219 - var6 = FileSystem.colorStartTag(4259584); // L: 9220 - } else if (var9 > 3) { // L: 9223 - var6 = FileSystem.colorStartTag(8453888); // L: 9224 - } else if (var9 > 0) { // L: 9227 - var6 = FileSystem.colorStartTag(12648192); // L: 9228 - } else { - var6 = FileSystem.colorStartTag(16776960); // L: 9231 - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9233 - } - - if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9235 - WorldMapManager.insertMenuItemNoShift("Examine", FileSystem.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9236 - } - - if (Client.isItemSelected == 1) { // L: 9239 - WorldMapManager.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FileSystem.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9240 - } else if (Client.isSpellSelected) { // L: 9243 - if ((GrandExchangeOfferNameComparator.selectedSpellFlags & 2) == 2) { // L: 9244 - WorldMapManager.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FileSystem.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9245 - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9250 - String[] var11 = var0.actions; // L: 9251 - if (var11 != null) { // L: 9252 - for (var7 = 4; var7 >= 0; --var7) { // L: 9253 - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9254 - var8 = 0; // L: 9255 - if (var7 == 0) { // L: 9256 - var8 = var10 + 9; - } - - if (var7 == 1) { // L: 9257 - var8 = var10 + 10; - } - - if (var7 == 2) { // L: 9258 - var8 = var10 + 11; - } - - if (var7 == 3) { // L: 9259 - var8 = var10 + 12; - } - - if (var7 == 4) { // L: 9260 - var8 = var10 + 13; - } - - WorldMapManager.insertMenuItemNoShift(var11[var7], FileSystem.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9261 - } - } - } - - if (var11 != null) { // L: 9266 - for (var7 = 4; var7 >= 0; --var7) { // L: 9267 - if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9268 - short var12 = 0; // L: 9269 - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9270 - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > UserComparator9.localPlayer.combatLevel) { // L: 9271 - var12 = 2000; // L: 9272 - } - - var8 = 0; // L: 9274 - if (var7 == 0) { // L: 9275 - var8 = var12 + 9; - } - - if (var7 == 1) { // L: 9276 - var8 = var12 + 10; - } - - if (var7 == 2) { // L: 9277 - var8 = var12 + 11; - } - - if (var7 == 3) { // L: 9278 - var8 = var12 + 12; - } - - if (var7 == 4) { // L: 9279 - var8 = var12 + 13; - } - - WorldMapManager.insertMenuItemNoShift(var11[var7], FileSystem.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9280 - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9285 - WorldMapManager.insertMenuItemNoShift("Examine", FileSystem.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9286 - } - } - - } + 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 } - } // L: 9290 + } } diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java index 03248ae6d2..918610e561 100644 --- a/runescape-client/src/main/java/GameEngine.java +++ b/runescape-client/src/main/java/GameEngine.java @@ -4,7 +4,6 @@ import java.awt.Container; import java.awt.EventQueue; import java.awt.Frame; import java.awt.Graphics; -import java.awt.Image; import java.awt.Insets; import java.awt.LayoutManager; import java.awt.Rectangle; @@ -19,167 +18,179 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; 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 net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bt") +@ObfuscatedName("al") @Implements("GameEngine") public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfu;" + descriptor = "Ldt;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lbt;" + descriptor = "Lal;" ) @Export("gameEngine") static GameEngine gameEngine; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1172672455 + intValue = -1685725481 ) @Export("GameEngine_redundantStartThreadCount") static int GameEngine_redundantStartThreadCount; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = -8672480776898647035L + longValue = -4853509514782557043L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1471054529 + intValue = 53446861 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1858214361 + intValue = -1368983969 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -860232961 + intValue = 651117419 ) @Export("fps") protected static int fps; - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("graphicsTickTimes") protected static long[] graphicsTickTimes; - @ObfuscatedName("f") + @ObfuscatedName("j") @Export("clientTickTimes") protected static long[] clientTickTimes; - @ObfuscatedName("ax") - static Image field480; - @ObfuscatedName("ar") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -855219925 + intValue = 1639936393 ) - static int field481; - @ObfuscatedName("an") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = 531187917 + ) + static int field321; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Loe;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("ab") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - longValue = 1354253672444800547L + longValue = 6808670330875016505L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - longValue = 7149663946399436317L + longValue = 5063361816700909807L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("z") + @ObfuscatedName("e") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("u") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -250488397 + intValue = 523882701 ) @Export("contentWidth") protected int contentWidth; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -100223911 + intValue = -504731567 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -99597119 + intValue = -1685077201 ) @Export("canvasX") int canvasX; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2031980453 + intValue = -327773481 ) @Export("canvasY") int canvasY; - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2105446269 + intValue = 981917933 ) - int field473; + int field332; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = 2017329663 + ) + int field320; @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -501888553 - ) - int field460; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -1655080689 + intValue = 9044595 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 892249971 + intValue = 1660420049 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("frame") Frame frame; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("fullRedraw") volatile boolean fullRedraw; - @ObfuscatedName("al") + @ObfuscatedName("as") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - longValue = -8976229610863512045L + longValue = -5289724236337246501L ) - volatile long field484; - @ObfuscatedName("ah") + volatile long field303; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lad;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("ap") + @ObfuscatedName("az") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("aj") + @ObfuscatedName("au") @Export("eventQueue") final EventQueue eventQueue; @@ -193,61 +204,61 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen fps = 0; // L: 50 graphicsTickTimes = new long[32]; // L: 53 clientTickTimes = new long[32]; // L: 55 - field481 = 500; // L: 73 - volatileFocus = true; // L: 82 - garbageCollectorLastCollectionTime = -1L; // L: 85 - garbageCollectorLastCheckTimeMs = -1L; // L: 86 + field321 = 500; + volatileFocus = true; + garbageCollectorLastCollectionTime = -1L; + garbageCollectorLastCheckTimeMs = -1L; } protected GameEngine() { this.hasErrored = false; // L: 46 this.canvasX = 0; // L: 59 - this.canvasY = 0; // L: 60 - this.fullRedraw = true; // L: 71 - this.resizeCanvasNextFrame = false; // L: 74 - this.isCanvasInvalid = false; // L: 75 - this.field484 = 0L; // L: 76 - EventQueue var1 = null; // L: 89 + this.canvasY = 0; + this.fullRedraw = true; + this.resizeCanvasNextFrame = false; + this.isCanvasInvalid = false; + this.field303 = 0L; + EventQueue var1 = null; try { - var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 - } catch (Throwable var3) { // L: 93 + var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); + } catch (Throwable var3) { } - this.eventQueue = var1; // L: 94 - DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 - class2.pcmPlayerProvider = var2; // L: 97 - } // L: 99 + this.eventQueue = var1; + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); + class301.pcmPlayerProvider = var2; + } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-420237579" + descriptor = "(IIB)V", + garbageValue = "7" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 - this.method1007(); + this.method560(); } this.maxCanvasWidth = var1; // L: 103 this.maxCanvasHeight = var2; // L: 104 } // L: 105 - @ObfuscatedName("y") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "2080596148" + garbageValue = "2112263032" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { // L: 108 for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 - ApproximateRouteStrategy.sleepExact(1L); + GrandExchangeEvent.sleepExact(1L); } - if (var1 != null) { // L: 110 - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); + if (var1 != null) { + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110 } } @@ -255,8 +266,8 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Lfo;", - garbageValue = "-1572437052" + descriptor = "(I)Ldw;", + garbageValue = "-702892795" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -268,306 +279,278 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen return this.mouseWheelHandler; // L: 118 } - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "84" + descriptor = "(I)V", + garbageValue = "-1964367866" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 } // L: 123 - @ObfuscatedName("e") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-775361579" + garbageValue = "1478107780" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 } // L: 127 - @ObfuscatedName("q") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-367283277" + garbageValue = "825633698" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 131 - KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 132 - KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 133 - KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 134 - KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 135 - KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 136 - KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 137 - KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 138 - KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 139 - KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 140 - KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 141 - KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 142 - KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 143 - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 146 - KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 147 - KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 148 - KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 149 - KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 150 - KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 151 - KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 152 - KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 153 - KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 154 - KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 155 - KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 156 - KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 157 - } + class82.method1924(); // L: 130 + java.awt.Canvas var1 = this.canvas; // L: 131 + var1.setFocusTraversalKeysEnabled(false); // L: 133 + var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 134 + var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 135 + } // L: 137 - java.awt.Canvas var1 = this.canvas; // L: 160 - var1.setFocusTraversalKeysEnabled(false); // L: 162 - var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 163 - var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 164 - } // L: 166 - - @ObfuscatedName("l") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1149446926" + garbageValue = "-748357036" ) @Export("setUpMouse") protected final void setUpMouse() { - WorldMapArea.method489(this.canvas); // L: 169 - } // L: 170 + UserComparator4.method2419(this.canvas); // L: 140 + } // L: 141 - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1907084559" + descriptor = "(B)V", + garbageValue = "105" ) @Export("resizeCanvas") final void resizeCanvas() { - Container var1 = this.container(); // L: 173 - if (var1 != null) { // L: 174 - Bounds var2 = this.getFrameContentBounds(); // L: 175 - this.contentWidth = Math.max(var2.highX, this.field473); // L: 176 - this.contentHeight = Math.max(var2.highY, this.field460); // L: 177 - if (this.contentWidth <= 0) { // L: 178 + Container var1 = this.container(); // L: 144 + if (var1 != null) { // L: 145 + Bounds var2 = this.getFrameContentBounds(); // L: 146 + this.contentWidth = Math.max(var2.highX, this.field332); // L: 147 + this.contentHeight = Math.max(var2.highY, this.field320); // L: 148 + if (this.contentWidth <= 0) { // L: 149 this.contentWidth = 1; } - if (this.contentHeight <= 0) { // L: 179 + if (this.contentHeight <= 0) { // L: 150 this.contentHeight = 1; } - GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 180 - class25.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 181 - this.canvasX = (this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth) / 2; // L: 182 - this.canvasY = 0; // L: 183 - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight); // L: 184 - FileSystem.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight, this.canvas); // L: 185 - if (var1 == this.frame) { // L: 186 - Insets var3 = this.frame.getInsets(); // L: 187 - this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 188 + InterfaceParent.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 151 + canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 152 + this.canvasX = (this.contentWidth - InterfaceParent.canvasWidth) / 2; // L: 153 + this.canvasY = 0; // L: 154 + this.canvas.setSize(InterfaceParent.canvasWidth, canvasHeight); // L: 155 + rasterProvider = new RasterProvider(InterfaceParent.canvasWidth, canvasHeight, this.canvas); // L: 156 + if (var1 == this.frame) { // L: 157 + Insets var3 = this.frame.getInsets(); // L: 158 + this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); // L: 159 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); // L: 190 + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 161 } - this.fullRedraw = true; // L: 191 - this.resizeGame(); // L: 192 + this.fullRedraw = true; // L: 162 + this.resizeGame(); // L: 163 } - } // L: 193 + } // L: 164 - @ObfuscatedName("b") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-226650241" + garbageValue = "-1835470787" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-998749826" + garbageValue = "35349985" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; // L: 198 - int var2 = this.canvasY; // L: 199 - int var3 = this.contentWidth - GrandExchangeOfferTotalQuantityComparator.canvasWidth - var1; // L: 200 - int var4 = this.contentHeight - class25.canvasHeight - var2; // L: 201 - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 202 + int var1 = this.canvasX; // L: 169 + int var2 = this.canvasY; // L: 170 + int var3 = this.contentWidth - InterfaceParent.canvasWidth - var1; // L: 171 + int var4 = this.contentHeight - canvasHeight - var2; // L: 172 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 173 try { - Container var5 = this.container(); // L: 204 - int var6 = 0; // L: 205 - int var7 = 0; // L: 206 - if (var5 == this.frame) { // L: 207 - Insets var8 = this.frame.getInsets(); // L: 208 - var6 = var8.left; // L: 209 - var7 = var8.top; // L: 210 + Container var5 = this.container(); // L: 175 + int var6 = 0; // L: 176 + int var7 = 0; // L: 177 + if (var5 == this.frame) { // L: 178 + Insets var8 = this.frame.getInsets(); // L: 179 + var6 = var8.left; // L: 180 + var7 = var8.top; // L: 181 } - Graphics var10 = var5.getGraphics(); // L: 212 - var10.setColor(Color.black); // L: 213 + Graphics var10 = var5.getGraphics(); // L: 183 + var10.setColor(Color.black); // L: 184 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); // L: 214 + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 185 } - if (var2 > 0) { // L: 215 + if (var2 > 0) { // L: 186 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { // L: 216 + if (var3 > 0) { // L: 187 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { // L: 217 + if (var4 > 0) { // L: 188 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { // L: 219 + } catch (Exception var9) { // L: 190 } } - } // L: 221 + } // L: 192 - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-14" + descriptor = "(I)V", + garbageValue = "2129767231" ) @Export("replaceCanvas") final void replaceCanvas() { - PlayerType.method4345(this.canvas); // L: 224 - java.awt.Canvas var1 = this.canvas; // L: 225 - var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 227 - var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 228 - var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 229 - MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 230 - if (this.mouseWheelHandler != null) { // L: 232 + java.awt.Canvas var1 = this.canvas; // L: 195 + var1.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 197 + var1.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 198 + KeyHandler.field259 = -1; // L: 199 + WorldMapLabelSize.method2677(this.canvas); // L: 201 + if (this.mouseWheelHandler != null) { // L: 202 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); // L: 233 - java.awt.Canvas var2 = this.canvas; // L: 234 - var2.setFocusTraversalKeysEnabled(false); - var2.addKeyListener(KeyHandler.KeyHandler_instance); - var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 238 - WorldMapArea.method489(this.canvas); - if (this.mouseWheelHandler != null) { + this.addCanvas(); // L: 203 + java.awt.Canvas var2 = this.canvas; // L: 204 + var2.setFocusTraversalKeysEnabled(false); // L: 206 + var2.addKeyListener(KeyHandler.KeyHandler_instance); // L: 207 + var2.addFocusListener(KeyHandler.KeyHandler_instance); // L: 208 + UserComparator4.method2419(this.canvas); // L: 210 + if (this.mouseWheelHandler != null) { // L: 211 this.mouseWheelHandler.addTo(this.canvas); } - this.method1007(); // L: 242 - } // L: 243 + this.method560(); // L: 212 + } // L: 213 @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-2060658023" + garbageValue = "69063419" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameEngine != null) { // L: 247 - ++GameEngine_redundantStartThreadCount; // L: 248 - if (GameEngine_redundantStartThreadCount >= 3) { - this.error("alreadyloaded"); - return; // L: 251 + if (gameEngine != null) { // L: 217 + ++GameEngine_redundantStartThreadCount; // L: 218 + if (GameEngine_redundantStartThreadCount >= 3) { // L: 219 + this.error("alreadyloaded"); // L: 220 + return; // L: 221 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 253 - return; // L: 254 + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 223 + return; // L: 224 } - gameEngine = this; - GrandExchangeOfferTotalQuantityComparator.canvasWidth = var1; - class25.canvasHeight = var2; - RunException.RunException_revision = var3; // L: 259 - RunException.RunException_applet = this; // L: 260 - if (taskHandler == null) { + gameEngine = this; // L: 226 + InterfaceParent.canvasWidth = var1; // L: 227 + canvasHeight = var2; // L: 228 + RunException.RunException_revision = var3; // L: 229 + SecureRandomCallable.RunException_applet = this; // L: 230 + if (taskHandler == null) { // L: 231 taskHandler = new TaskHandler(); } - taskHandler.newThreadTask(this, 1); - } catch (Exception var5) { - SequenceDefinition.RunException_sendStackTrace((String)null, var5); - this.error("crash"); + taskHandler.newThreadTask(this, 1); // L: 232 + } catch (Exception var5) { // L: 234 + class223.RunException_sendStackTrace((String)null, var5); // L: 235 + this.error("crash"); // L: 236 } - } // L: 268 + } // L: 238 - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "128" + descriptor = "(I)V", + garbageValue = "-431845158" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); // L: 271 - if (this.canvas != null) { - this.canvas.removeFocusListener(this); - var1.remove(this.canvas); + Container var1 = this.container(); // L: 241 + if (this.canvas != null) { // L: 242 + this.canvas.removeFocusListener(this); // L: 243 + var1.remove(this.canvas); // L: 244 } - GrandExchangeOfferTotalQuantityComparator.canvasWidth = Math.max(var1.getWidth(), this.field473); - class25.canvasHeight = Math.max(var1.getHeight(), this.field460); + InterfaceParent.canvasWidth = Math.max(var1.getWidth(), this.field332); // L: 246 + canvasHeight = Math.max(var1.getHeight(), this.field320); // L: 247 Insets var2; - if (this.frame != null) { - var2 = this.frame.getInsets(); - GrandExchangeOfferTotalQuantityComparator.canvasWidth -= var2.right + var2.left; - class25.canvasHeight -= var2.top + var2.bottom; + if (this.frame != null) { // L: 248 + var2 = this.frame.getInsets(); // L: 249 + InterfaceParent.canvasWidth -= var2.right + var2.left; // L: 250 + canvasHeight -= var2.top + var2.bottom; // L: 251 } - this.canvas = new Canvas(this); - var1.setBackground(Color.BLACK); - var1.setLayout((LayoutManager)null); - var1.add(this.canvas); - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight); - this.canvas.setVisible(true); - this.canvas.setBackground(Color.BLACK); // L: 289 - 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: 253 + var1.setBackground(Color.BLACK); // L: 254 + var1.setLayout((LayoutManager)null); // L: 255 + var1.add(this.canvas); // L: 256 + this.canvas.setSize(InterfaceParent.canvasWidth, canvasHeight); // L: 257 + this.canvas.setVisible(true); // L: 258 + this.canvas.setBackground(Color.BLACK); // L: 259 + if (var1 == this.frame) { // L: 260 + var2 = this.frame.getInsets(); // L: 261 + this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); // L: 262 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 264 } - this.canvas.addFocusListener(this); - this.canvas.requestFocus(); - this.fullRedraw = true; - if (FileSystem.rasterProvider != null && GrandExchangeOfferTotalQuantityComparator.canvasWidth == FileSystem.rasterProvider.width && class25.canvasHeight == FileSystem.rasterProvider.height) { - ((RasterProvider)FileSystem.rasterProvider).setComponent(this.canvas); - FileSystem.rasterProvider.drawFull(0, 0); // L: 300 + this.canvas.addFocusListener(this); // L: 265 + this.canvas.requestFocus(); // L: 266 + this.fullRedraw = true; // L: 267 + if (rasterProvider != null && InterfaceParent.canvasWidth == rasterProvider.width && canvasHeight == rasterProvider.height) { // L: 268 + ((RasterProvider)rasterProvider).setComponent(this.canvas); // L: 269 + rasterProvider.drawFull(0, 0); // L: 270 } else { - FileSystem.rasterProvider = new RasterProvider(GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight, this.canvas); // L: 303 + rasterProvider = new RasterProvider(InterfaceParent.canvasWidth, canvasHeight, this.canvas); // L: 273 } - this.isCanvasInvalid = false; - this.field484 = Tiles.currentTimeMillis(); // L: 306 - } + this.isCanvasInvalid = false; // L: 275 + this.field303 = ObjectSound.currentTimeMillis(); // L: 276 + } // L: 277 - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1882599672" + descriptor = "(B)Z", + garbageValue = "-29" ) @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")) { // L: 312 - if (var1.endsWith("127.0.0.1")) { + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 280 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 281 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 282 + if (var1.endsWith("127.0.0.1")) { // L: 283 return true; } else { while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); // L: 314 + var1 = var1.substring(0, var1.length() - 1); // L: 284 } - if (var1.endsWith("192.168.1.")) { + if (var1.endsWith("192.168.1.")) { // L: 285 return true; } else { - this.error("invalidhost"); - return false; + this.error("invalidhost"); // L: 286 + return false; // L: 287 } } } else { @@ -578,135 +561,135 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen } } - @ObfuscatedName("ay") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "1" + garbageValue = "24" ) @Export("clientTick") void clientTick() { - long var1 = Tiles.currentTimeMillis(); - long var3 = clientTickTimes[WallDecoration.clientTickTimeIdx]; - clientTickTimes[WallDecoration.clientTickTimeIdx] = var1; - WallDecoration.clientTickTimeIdx = WallDecoration.clientTickTimeIdx + 1 & 31; // L: 373 - if (0L != var3 && var1 > var3) { + long var1 = ObjectSound.currentTimeMillis(); // L: 331 + long var3 = clientTickTimes[class29.clientTickTimeIdx]; // L: 332 + clientTickTimes[class29.clientTickTimeIdx] = var1; // L: 333 + class29.clientTickTimeIdx = class29.clientTickTimeIdx + 1 & 31; // L: 334 + if (0L != var3 && var1 > var3) { // L: 335 } - synchronized(this) { // L: 375 - PcmPlayer.hasFocus = volatileFocus; + synchronized(this) { // L: 336 + GrandExchangeOfferAgeComparator.hasFocus = volatileFocus; // L: 337 + } // L: 338 + + this.doCycle(); // L: 339 + } // L: 340 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-105" + ) + @Export("graphicsTick") + void graphicsTick() { + Container var1 = this.container(); // L: 343 + long var2 = ObjectSound.currentTimeMillis(); // L: 344 + long var4 = graphicsTickTimes[class139.graphicsTickTimeIdx]; // L: 345 + graphicsTickTimes[class139.graphicsTickTimeIdx] = var2; // L: 346 + class139.graphicsTickTimeIdx = class139.graphicsTickTimeIdx + 1 & 31; // L: 347 + if (var4 != 0L && var2 > var4) { // L: 348 + int var6 = (int)(var2 - var4); // L: 349 + fps = ((var6 >> 1) + 32000) / var6; // L: 350 } - this.doCycle(); - } // L: 379 + if (++field321 - 1 > 50) { // L: 352 + field321 -= 50; // L: 353 + this.fullRedraw = true; // L: 354 + this.canvas.setSize(InterfaceParent.canvasWidth, canvasHeight); // L: 355 + this.canvas.setVisible(true); // L: 356 + if (var1 == this.frame) { // L: 357 + Insets var7 = this.frame.getInsets(); // L: 358 + this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); // L: 359 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 361 + } + } + + if (this.isCanvasInvalid) { // L: 363 + this.replaceCanvas(); + } + + this.method673(); // L: 364 + this.draw(this.fullRedraw); // L: 365 + if (this.fullRedraw) { // L: 366 + this.clearBackground(); + } + + this.fullRedraw = false; // L: 367 + } // L: 368 + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2082996572" + ) + final void method673() { + Bounds var1 = this.getFrameContentBounds(); // L: 371 + if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 372 + this.resizeCanvas(); // L: 373 + this.resizeCanvasNextFrame = false; // L: 374 + } + + } // L: 376 @ObfuscatedName("am") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "548741005" + garbageValue = "-1539118256" ) - @Export("graphicsTick") - void graphicsTick() { - Container var1 = this.container(); - long var2 = Tiles.currentTimeMillis(); - long var4 = graphicsTickTimes[class60.graphicsTickTimeIdx]; - graphicsTickTimes[class60.graphicsTickTimeIdx] = var2; - class60.graphicsTickTimeIdx = class60.graphicsTickTimeIdx + 1 & 31; - if (var4 != 0L && var2 > var4) { - int var6 = (int)(var2 - var4); - fps = ((var6 >> 1) + 32000) / var6; - } - - if (++field481 - 1 > 50) { - field481 -= 50; - this.fullRedraw = true; // L: 393 - this.canvas.setSize(GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight); - this.canvas.setVisible(true); - if (var1 == this.frame) { // L: 396 - Insets var7 = this.frame.getInsets(); // L: 397 - this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); - } - } - - if (this.isCanvasInvalid) { // L: 402 - this.replaceCanvas(); - } - - this.method1103(); - this.draw(this.fullRedraw); - if (this.fullRedraw) { // L: 405 - this.clearBackground(); - } - - this.fullRedraw = false; - } + final void method560() { + this.resizeCanvasNextFrame = true; // L: 379 + } // L: 380 @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - final void method1103() { - Bounds var1 = this.getFrameContentBounds(); - if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 411 - this.resizeCanvas(); - this.resizeCanvasNextFrame = false; - } - - } // L: 415 - - @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-17755841" - ) - final void method1007() { - this.resizeCanvasNextFrame = true; - } // L: 419 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1467969246" + garbageValue = "-1612459374" ) @Export("kill") final synchronized void kill() { - if (!isKilled) { - isKilled = true; // L: 423 + if (!isKilled) { // L: 383 + isKilled = true; // L: 384 try { - this.canvas.removeFocusListener(this); - } catch (Exception var5) { + this.canvas.removeFocusListener(this); // L: 386 + } catch (Exception var5) { // L: 388 } try { - this.kill0(); - } catch (Exception var4) { + this.kill0(); // L: 390 + } catch (Exception var4) { // L: 392 } - if (this.frame != null) { + if (this.frame != null) { // L: 393 try { - System.exit(0); - } catch (Throwable var3) { + System.exit(0); // L: 395 + } catch (Throwable var3) { // L: 397 } } - if (taskHandler != null) { + if (taskHandler != null) { // L: 399 try { - taskHandler.close(); - } catch (Exception var2) { // L: 442 + taskHandler.close(); // L: 401 + } catch (Exception var2) { // L: 403 } } - this.vmethod1423(); // L: 444 + this.vmethod1219(); // L: 405 } - } + } // L: 406 @ObfuscatedName("aq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-337269105" + garbageValue = "-473168642" ) @Export("setUp") protected abstract void setUp(); @@ -714,1133 +697,904 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-123" + garbageValue = "-102" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ak") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1888023388" + garbageValue = "-278821415" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ax") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1925350941" + descriptor = "(B)V", + garbageValue = "74" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ar") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZS)V", - garbageValue = "239" + descriptor = "(ILjava/lang/String;ZI)V", + garbageValue = "1020883079" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); - if (WorldMapIcon_0.fontHelvetica13 == null) { // L: 506 - WorldMapIcon_0.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 507 - GrandExchangeOfferAgeComparator.loginScreenFontMetrics = this.canvas.getFontMetrics(WorldMapIcon_0.fontHelvetica13); // L: 508 + Graphics var4 = this.canvas.getGraphics(); // L: 466 + if (class26.fontHelvetica13 == null) { // L: 467 + class26.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 468 + GrandExchangeOfferNameComparator.loginScreenFontMetrics = this.canvas.getFontMetrics(class26.fontHelvetica13); // L: 469 } - if (var3) { // L: 510 - var4.setColor(Color.black); // L: 511 - var4.fillRect(0, 0, GrandExchangeOfferTotalQuantityComparator.canvasWidth, class25.canvasHeight); // L: 512 + if (var3) { // L: 471 + var4.setColor(Color.black); // L: 472 + var4.fillRect(0, 0, InterfaceParent.canvasWidth, canvasHeight); // L: 473 } - Color var5 = new Color(140, 17, 17); // L: 514 + Color var5 = new Color(140, 17, 17); // L: 475 try { - if (field480 == null) { // L: 516 - field480 = this.canvas.createImage(304, 34); + if (GrandExchangeOfferWorldComparator.field3318 == null) { // L: 477 + GrandExchangeOfferWorldComparator.field3318 = this.canvas.createImage(304, 34); } - Graphics var6 = field480.getGraphics(); // L: 517 - var6.setColor(var5); // L: 518 - var6.drawRect(0, 0, 303, 33); // L: 519 - var6.fillRect(2, 2, var1 * 3, 30); // L: 520 - var6.setColor(Color.black); // L: 521 - var6.drawRect(1, 1, 301, 31); // L: 522 - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 523 - var6.setFont(WorldMapIcon_0.fontHelvetica13); // L: 524 - var6.setColor(Color.white); // L: 525 - var6.drawString(var2, (304 - GrandExchangeOfferAgeComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 526 - var4.drawImage(field480, GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152, class25.canvasHeight / 2 - 18, (ImageObserver)null); // L: 527 - } catch (Exception var9) { // L: 529 - int var7 = GrandExchangeOfferTotalQuantityComparator.canvasWidth / 2 - 152; // L: 530 - int var8 = class25.canvasHeight / 2 - 18; // L: 531 - var4.setColor(var5); // L: 532 - var4.drawRect(var7, var8, 303, 33); // L: 533 - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 534 - var4.setColor(Color.black); // L: 535 - var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 536 - var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 537 - var4.setFont(WorldMapIcon_0.fontHelvetica13); // L: 538 - var4.setColor(Color.white); // L: 539 - var4.drawString(var2, var7 + (304 - GrandExchangeOfferAgeComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 540 + Graphics var6 = GrandExchangeOfferWorldComparator.field3318.getGraphics(); // L: 478 + var6.setColor(var5); // L: 479 + var6.drawRect(0, 0, 303, 33); // L: 480 + var6.fillRect(2, 2, var1 * 3, 30); // L: 481 + var6.setColor(Color.black); // L: 482 + var6.drawRect(1, 1, 301, 31); // L: 483 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 484 + var6.setFont(class26.fontHelvetica13); // L: 485 + var6.setColor(Color.white); // L: 486 + var6.drawString(var2, (304 - GrandExchangeOfferNameComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 487 + var4.drawImage(GrandExchangeOfferWorldComparator.field3318, InterfaceParent.canvasWidth / 2 - 152, canvasHeight / 2 - 18, (ImageObserver)null); // L: 488 + } catch (Exception var9) { // L: 490 + int var7 = InterfaceParent.canvasWidth / 2 - 152; // L: 491 + int var8 = canvasHeight / 2 - 18; // L: 492 + var4.setColor(var5); // L: 493 + var4.drawRect(var7, var8, 303, 33); // L: 494 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 495 + var4.setColor(Color.black); // L: 496 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 497 + var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 498 + var4.setFont(class26.fontHelvetica13); // L: 499 + var4.setColor(Color.white); // L: 500 + var4.drawString(var2, var7 + (304 - GrandExchangeOfferNameComparator.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 501 } - } catch (Exception var10) { // L: 543 - this.canvas.repaint(); // L: 544 + } catch (Exception var10) { // L: 504 + this.canvas.repaint(); // L: 505 } - } // L: 546 + } // L: 507 - @ObfuscatedName("al") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1187634060" + garbageValue = "320452892" ) - protected final void method1078() { - field480 = null; // L: 549 - WorldMapIcon_0.fontHelvetica13 = null; // L: 550 - GrandExchangeOfferAgeComparator.loginScreenFontMetrics = null; // L: 551 - } // L: 552 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "120" - ) - @Export("error") - protected void error(String var1) { - if (!this.hasErrored) { // L: 555 - this.hasErrored = true; // L: 556 - System.out.println("error_game_" + var1); // L: 557 - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 559 - } catch (Exception var3) { // L: 561 - } - - } - } // L: 562 + protected final void method594() { + GrandExchangeOfferWorldComparator.field3318 = null; // L: 510 + class26.fontHelvetica13 = null; // L: 511 + GrandExchangeOfferNameComparator.loginScreenFontMetrics = null; // L: 512 + } // L: 513 @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2138250050" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { // L: 516 + this.hasErrored = true; // L: 517 + System.out.println("error_game_" + var1); // L: 518 + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 520 + } catch (Exception var3) { // L: 522 + } + + } + } // L: 523 + + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)Ljava/awt/Container;", - garbageValue = "-838247309" + garbageValue = "-1157412337" ) @Export("container") Container container() { - return (Container)(this.frame != null ? this.frame : this); // L: 565 + return (Container)(this.frame != null ? this.frame : this); // L: 526 } - @ObfuscatedName("aw") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(I)Lli;", - garbageValue = "-1070651105" + descriptor = "(B)Llj;", + garbageValue = "80" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { - Container var1 = this.container(); // L: 570 - int var2 = Math.max(var1.getWidth(), this.field473); // L: 571 - int var3 = Math.max(var1.getHeight(), this.field460); // L: 572 - if (this.frame != null) { // L: 573 - Insets var4 = this.frame.getInsets(); // L: 574 - var2 -= var4.right + var4.left; // L: 575 - var3 -= var4.bottom + var4.top; // L: 576 + Container var1 = this.container(); // L: 531 + int var2 = Math.max(var1.getWidth(), this.field332); // L: 532 + int var3 = Math.max(var1.getHeight(), this.field320); // L: 533 + if (this.frame != null) { // L: 534 + Insets var4 = this.frame.getInsets(); // L: 535 + var2 -= var4.right + var4.left; // L: 536 + var3 -= var4.bottom + var4.top; // L: 537 } - return new Bounds(var2, var3); // L: 578 + return new Bounds(var2, var3); // L: 539 } - @ObfuscatedName("az") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-697132291" + garbageValue = "-42126832" ) @Export("hasFrame") protected final boolean hasFrame() { - return this.frame != null; // L: 582 + return this.frame != null; // L: 543 } - @ObfuscatedName("ap") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "103" + descriptor = "(I)V", + garbageValue = "1242495393" ) - protected abstract void vmethod1423(); - - public final void destroy() { - if (this == gameEngine && !isKilled) { // L: 458 - stopTimeMs = Tiles.currentTimeMillis(); - ApproximateRouteStrategy.sleepExact(5000L); - this.kill(); - } - } + protected abstract void vmethod1219(); public final synchronized void paint(Graphics var1) { - if (this == gameEngine && !isKilled) { - this.fullRedraw = true; - if (Tiles.currentTimeMillis() - this.field484 > 1000L) { - Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= GrandExchangeOfferTotalQuantityComparator.canvasWidth && var2.height >= class25.canvasHeight) { - this.isCanvasInvalid = true; // L: 473 + if (this == gameEngine && !isKilled) { // L: 430 + this.fullRedraw = true; // L: 431 + if (ObjectSound.currentTimeMillis() - this.field303 > 1000L) { // L: 432 + Rectangle var2 = var1.getClipBounds(); // L: 433 + if (var2 == null || var2.width >= InterfaceParent.canvasWidth && var2.height >= canvasHeight) { + this.isCanvasInvalid = true; // L: 434 } } } - } + } // L: 436 + + public final void destroy() { + if (this == gameEngine && !isKilled) { // L: 419 + stopTimeMs = ObjectSound.currentTimeMillis(); // L: 420 + GrandExchangeEvent.sleepExact(5000L); // L: 421 + this.kill(); // L: 422 + } + } // L: 423 + + public final void start() { + if (this == gameEngine && !isKilled) { // L: 409 + stopTimeMs = 0L; // L: 410 + } + } // L: 411 + + public final void stop() { + if (this == gameEngine && !isKilled) { // L: 414 + stopTimeMs = ObjectSound.currentTimeMillis() + 4000L; // L: 415 + } + } // L: 416 + + public final void windowIconified(WindowEvent var1) { + } // L: 456 + + public final void update(Graphics var1) { + this.paint(var1); // L: 426 + } // L: 427 + + public final void windowActivated(WindowEvent var1) { + } // L: 447 + + public final void windowClosed(WindowEvent var1) { + } // L: 448 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 451 + } // L: 452 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 454 public abstract void init(); + public final void windowOpened(WindowEvent var1) { + } // L: 457 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 439 + this.fullRedraw = true; // L: 440 + } // L: 441 + public void run() { try { - if (TaskHandler.javaVendor != null) { - String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 323 - 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"); // L: 327 - return; // L: 328 + if (TaskHandler.javaVendor != null) { // L: 292 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 293 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 294 + String var2 = TaskHandler.javaVersion; // L: 295 + 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: 296 + this.error("wrongjava"); // L: 297 + return; // L: 298 } - if (var2.startsWith("1.6.0_")) { // L: 330 + if (var2.startsWith("1.6.0_")) { // L: 300 int var3; - for (var3 = 6; var3 < var2.length() && Strings.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && UserComparator4.isDigit(var2.charAt(var3)); ++var3) { // L: 301 302 } - String var4 = var2.substring(6, var3); // L: 333 - if (WorldMapDecoration.isNumber(var4) && class217.parseInt(var4) < 10) { - this.error("wrongjava"); // L: 335 - return; + String var4 = var2.substring(6, var3); // L: 303 + if (WorldMapArea.isNumber(var4) && class69.method1168(var4) < 10) { // L: 304 + this.error("wrongjava"); // L: 305 + return; // L: 306 } } - fiveOrOne = 5; + fiveOrOne = 5; // L: 309 } } - this.setFocusCycleRoot(true); // L: 342 - this.addCanvas(); - this.setUp(); // L: 344 + this.setFocusCycleRoot(true); // L: 312 + this.addCanvas(); // L: 313 + this.setUp(); // L: 314 + Decimator.clock = PacketBuffer.method6523(); // L: 315 - Object var8; - try { - var8 = new NanoClock(); - } catch (Throwable var6) { - var8 = new MilliClock(); - } + while (0L == stopTimeMs || ObjectSound.currentTimeMillis() < stopTimeMs) { // L: 316 + class232.gameCyclesToDo = Decimator.clock.wait(cycleDurationMillis, fiveOrOne); // L: 317 - WorldMapSprite.clock = (Clock)var8; // L: 354 - - while (stopTimeMs == 0L || Tiles.currentTimeMillis() < stopTimeMs) { - VertexNormal.gameCyclesToDo = WorldMapSprite.clock.wait(cycleDurationMillis, fiveOrOne); - - for (int var5 = 0; var5 < VertexNormal.gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < class232.gameCyclesToDo; ++var5) { // L: 318 this.clientTick(); } - this.graphicsTick(); - this.post(this.canvas); // L: 359 + this.graphicsTick(); // L: 319 + this.post(this.canvas); // L: 320 } - } catch (Exception var7) { - SequenceDefinition.RunException_sendStackTrace((String)null, var7); - this.error("crash"); + } catch (Exception var6) { // L: 323 + class223.RunException_sendStackTrace((String)null, var6); // L: 324 + this.error("crash"); // L: 325 } - this.kill(); // L: 366 - } - - public final void stop() { - if (this == gameEngine && !isKilled) { // L: 453 - stopTimeMs = Tiles.currentTimeMillis() + 4000L; - } - } - - public final void windowClosing(WindowEvent var1) { - this.destroy(); - } // L: 491 - - public final void windowDeactivated(WindowEvent var1) { - } - - public final void windowIconified(WindowEvent var1) { - } - - public final void windowOpened(WindowEvent var1) { - } - - public final void windowClosed(WindowEvent var1) { - } - - public final void start() { - if (this == gameEngine && !isKilled) { - stopTimeMs = 0L; - } - } - - public final void windowDeiconified(WindowEvent var1) { - } + this.kill(); // L: 327 + } // L: 328 public final void focusLost(FocusEvent var1) { - volatileFocus = false; + volatileFocus = false; // L: 444 + } // L: 445 + + public final void windowDeiconified(WindowEvent var1) { + } // L: 455 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "1469338847" + ) + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 68 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 69 + char var7 = var0.charAt(var6 + var1); // L: 70 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 71 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 72 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 73 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 74 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 75 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 76 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 77 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 78 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 79 + } else if (var7 == 8240) { // L: 80 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 81 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 82 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 83 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 84 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 85 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 86 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 87 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 88 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 89 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 90 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { + var3[var6 + var4] = -105; // L: 91 + } else if (var7 == 732) { // L: 92 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 93 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 94 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 95 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 96 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 97 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 98 + var3[var6 + var4] = -97; + } else { + var3[var6 + var4] = 63; // L: 99 + } + } + + return var5; // L: 101 } - public final void focusGained(FocusEvent var1) { - volatileFocus = true; // L: 478 - this.fullRedraw = true; - } // L: 480 + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1318947252" + ) + static void method682() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57 - public final void windowActivated(WindowEvent var1) { - } // L: 486 + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 58 + var1.clearIsFromFriend(); // L: 60 + } - public final void update(Graphics var1) { - this.paint(var1); - } + } // L: 63 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)[Lje;", - garbageValue = "1729948471" + descriptor = "(Lfu;[Lel;I)V", + garbageValue = "1781189638" ) - static HorizontalAlignment[] method1137() { - return new HorizontalAlignment[]{HorizontalAlignment.field3494, HorizontalAlignment.field3490, HorizontalAlignment.HorizontalAlignment_centered}; // L: 14 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(IIIIIILeq;Lfe;I)V", - garbageValue = "1508002032" - ) - static final void method1134(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: 235 236 237 - if (var0 < Tiles.Tiles_minPlane) { // L: 240 - Tiles.Tiles_minPlane = var0; - } - - ObjectComposition var8 = WorldMapAreaData.getObjectDefinition(var3); // L: 241 - int var9; - int var10; - if (var4 != 1 && var4 != 3) { // L: 244 - var9 = var8.sizeX; // L: 249 - var10 = var8.sizeY; // L: 250 - } else { - var9 = var8.sizeY; // L: 245 - var10 = var8.sizeX; // L: 246 - } - - int var11; - int var12; - if (var9 + var1 <= 104) { // L: 256 - var11 = (var9 >> 1) + var1; // L: 257 - var12 = (var9 + 1 >> 1) + var1; // L: 258 - } else { - var11 = var1; // L: 261 - var12 = var1 + 1; // L: 262 - } - - int var13; - int var14; - if (var10 + var2 <= 104) { // L: 264 - var13 = (var10 >> 1) + var2; // L: 265 - var14 = var2 + (var10 + 1 >> 1); // L: 266 - } else { - var13 = var2; // L: 269 - var14 = var2 + 1; // L: 270 - } - - int[][] var15 = Tiles.Tiles_heights[var0]; // L: 272 - int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2; // L: 273 - int var17 = (var1 << 7) + (var9 << 6); // L: 274 - int var18 = (var2 << 7) + (var10 << 6); // L: 275 - long var19 = TextureProvider.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 276 - int var21 = var5 + (var4 << 6); // L: 277 - if (var8.int3 == 1) { // L: 278 - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { // L: 279 - ObjectSound var22 = new ObjectSound(); // L: 280 - var22.plane = var0; // L: 281 - var22.x = var1 * 128; // L: 282 - var22.y = var2 * 128; // L: 283 - var23 = var8.sizeX; // L: 284 - var24 = var8.sizeY; // L: 285 - if (var4 == 1 || var4 == 3) { // L: 286 - var23 = var8.sizeY; // L: 287 - var24 = var8.sizeX; // L: 288 - } - - var22.field1090 = (var23 + var1) * 128; // L: 290 - var22.field1094 = (var24 + var2) * 128; // L: 291 - var22.soundEffectId = var8.ambientSoundId; // L: 292 - var22.field1092 = var8.int4 * 128; // L: 293 - var22.field1095 = var8.int5; // L: 294 - var22.field1096 = var8.int6; // L: 295 - var22.soundEffectIds = var8.soundEffectIds; // L: 296 - if (var8.transforms != null) { // L: 297 - var22.obj = var8; // L: 298 - var22.set(); // L: 299 - } - - ObjectSound.objectSounds.addFirst(var22); // L: 301 - if (var22.soundEffectIds != null) { // L: 302 - var22.field1097 = var22.field1095 + (int)(Math.random() * (double)(var22.field1096 - var22.field1095)); - } - } - - Object var34; - if (var5 == 22) { // L: 304 - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 305 - if (var8.animationId == -1 && var8.transforms == null) { // L: 307 - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 308 - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 309 - if (var8.interactType == 1 && var7 != null) { // L: 310 - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { // L: 313 - int[] var10000; - if (var5 >= 12) { // L: 334 - if (var8.animationId == -1 && var8.transforms == null) { // L: 336 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 337 - } - - var6.method3400(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 338 - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 339 - var10000 = class2.field12[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { // L: 340 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { // L: 343 - if (var8.animationId == -1 && var8.transforms == null) { // L: 345 - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 346 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field521[var4], 0, var19, var21); // L: 347 - if (var4 == 0) { // L: 348 - if (var8.clipped) { // L: 349 - TaskHandler.field2045[var0][var1][var2] = 50; // L: 350 - TaskHandler.field2045[var0][var1][var2 + 1] = 50; // L: 351 + static final void method680(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 615 + for (var3 = 0; var3 < 104; ++var3) { // L: 616 + for (var4 = 0; var4 < 104; ++var4) { // L: 617 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 618 + var5 = var2; // L: 619 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 620 + var5 = var2 - 1; } - if (var8.modelClipped) { // L: 353 - var10000 = class2.field12[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { // L: 355 - if (var8.clipped) { // L: 356 - TaskHandler.field2045[var0][var1][var2 + 1] = 50; // L: 357 - TaskHandler.field2045[var0][var1 + 1][var2 + 1] = 50; // L: 358 - } - - if (var8.modelClipped) { // L: 360 - var10000 = class2.field12[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { // L: 362 - if (var8.clipped) { // L: 363 - TaskHandler.field2045[var0][var1 + 1][var2] = 50; // L: 364 - TaskHandler.field2045[var0][var1 + 1][var2 + 1] = 50; // L: 365 - } - - if (var8.modelClipped) { // L: 367 - var10000 = class2.field12[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { // L: 369 - if (var8.clipped) { // L: 370 - TaskHandler.field2045[var0][var1][var2] = 50; // L: 371 - TaskHandler.field2045[var0][var1 + 1][var2] = 50; // L: 372 - } - - if (var8.modelClipped) { // L: 374 - var10000 = class2.field12[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 376 - var7.method3749(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 377 - var6.method3258(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { // L: 380 - if (var8.animationId == -1 && var8.transforms == null) { // L: 382 - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 383 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field514[var4], 0, var19, var21); // L: 384 - if (var8.clipped) { // L: 385 - if (var4 == 0) { // L: 386 - TaskHandler.field2045[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 387 - TaskHandler.field2045[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 388 - TaskHandler.field2045[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 389 - TaskHandler.field2045[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 391 - var7.method3749(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { // L: 394 - var28 = var4 + 1 & 3; // L: 395 - Object var31; - Object var32; - if (var8.animationId == -1 && var8.transforms == null) { // L: 398 - var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 399 - var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 400 - } else { - var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 403 - var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 404 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field521[var4], Tiles.field521[var28], var19, var21); // L: 406 - if (var8.modelClipped) { // L: 407 - if (var4 == 0) { // L: 408 - var10000 = class2.field12[var0][var1]; // L: 409 - var10000[var2] |= 585; - var10000 = class2.field12[var0][var1]; // L: 410 - var10000[var2 + 1] |= 1170; - } else if (var4 == 1) { // L: 412 - var10000 = class2.field12[var0][var1]; // L: 413 - var10000[1 + var2] |= 1170; - var10000 = class2.field12[var0][var1 + 1]; // L: 414 - var10000[var2] |= 585; - } else if (var4 == 2) { // L: 416 - var10000 = class2.field12[var0][var1 + 1]; // L: 417 - var10000[var2] |= 585; - var10000 = class2.field12[var0][var1]; // L: 418 - var10000[var2] |= 1170; - } else if (var4 == 3) { // L: 420 - var10000 = class2.field12[var0][var1]; // L: 421 - var10000[var2] |= 1170; - var10000 = class2.field12[var0][var1]; // L: 422 - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 425 - var7.method3749(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 426 - var6.method3258(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { // L: 429 - if (var8.animationId == -1 && var8.transforms == null) { // L: 431 - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 432 - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field514[var4], 0, var19, var21); // L: 433 - if (var8.clipped) { // L: 434 - if (var4 == 0) { // L: 435 - TaskHandler.field2045[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { // L: 436 - TaskHandler.field2045[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { // L: 437 - TaskHandler.field2045[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { // L: 438 - TaskHandler.field2045[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 440 - var7.method3749(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { // L: 443 - if (var8.animationId == -1 && var8.transforms == null) { // L: 445 - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 446 - } - - var6.method3400(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 447 - if (var8.interactType != 0 && var7 != null) { // L: 448 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { // L: 449 - var6.method3258(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { // L: 452 - if (var8.animationId == -1 && var8.transforms == null) { // L: 454 - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 455 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field521[var4], 0, 0, 0, var19, var21); // L: 456 - } else { - Object var25; - long var29; - if (var5 == 5) { // L: 459 - var28 = 16; // L: 460 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 461 - if (0L != var29) { // L: 462 - var28 = WorldMapAreaData.getObjectDefinition(class25.Entity_unpackID(var29)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 464 - var25 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 465 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field521[var4], 0, var28 * Tiles.field523[var4], var28 * Tiles.field527[var4], var19, var21); // L: 466 - } else if (var5 == 6) { // L: 469 - var28 = 8; // L: 470 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 471 - if (0L != var29) { // L: 472 - var28 = WorldMapAreaData.getObjectDefinition(class25.Entity_unpackID(var29)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { // L: 474 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 475 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field525[var4], var28 * Tiles.field526[var4], var19, var21); // L: 476 - } else if (var5 == 7) { // L: 479 - var23 = var4 + 2 & 3; // L: 481 - if (var8.animationId == -1 && var8.transforms == null) { // L: 482 - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 483 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 484 - } else if (var5 == 8) { // L: 487 - var28 = 8; // L: 488 - var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 489 - if (0L != var29) { // L: 490 - var28 = WorldMapAreaData.getObjectDefinition(class25.Entity_unpackID(var29)).int2 / 2; - } - - int var27 = var4 + 2 & 3; // L: 493 - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { // L: 494 - var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 495 - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 496 - } else { - var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 499 - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 500 - } - - var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field525[var4], var28 * Tiles.field526[var4], var19, var21); // L: 502 + if (var5 >= 0) { // L: 621 + var1[var5].setBlockedByFloor(var3, var4); } } } - } else { - if (var8.animationId == -1 && var8.transforms == null) { // L: 315 - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 316 - } - - if (var34 != null && var6.method3400(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 317 318 - var23 = 15; // L: 319 - if (var34 instanceof Model) { // L: 320 - var23 = ((Model)var34).method3079() / 4; // L: 321 - if (var23 > 30) { // L: 322 - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { // L: 324 - for (int var33 = 0; var33 <= var10; ++var33) { // L: 325 - if (var23 > TaskHandler.field2045[var0][var24 + var1][var33 + var2]) { // L: 326 - TaskHandler.field2045[var0][var24 + var1][var33 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { // L: 331 - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - } } - } // L: 311 332 341 378 392 427 441 450 457 467 477 485 503 505 - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-325844225" - ) - @Export("load") - static void load() { + Tiles.field1103 += (int)(Math.random() * 5.0D) - 2; // L: 626 + if (Tiles.field1103 < -8) { // L: 627 + Tiles.field1103 = -8; + } + + if (Tiles.field1103 > 8) { // L: 628 + Tiles.field1103 = 8; + } + + Tiles.field1104 += (int)(Math.random() * 5.0D) - 2; // L: 629 + if (Tiles.field1104 < -16) { // L: 630 + Tiles.field1104 = -16; + } + + if (Tiles.field1104 > 16) { // L: 631 + Tiles.field1104 = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; int var14; - if (Client.titleLoadingStage == 0) { // L: 1408 - MilliClock.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1409 + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { // L: 632 + byte[][] var42 = SecureRandomCallable.field1106[var2]; // L: 633 + var9 = (int)Math.sqrt(5100.0D); // L: 639 + var10 = var9 * 768 >> 8; // L: 640 - for (var14 = 0; var14 < 4; ++var14) { // L: 1410 - Client.collisionMaps[var14] = new CollisionMap(104, 104); + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 641 + for (var12 = 1; var12 < 103; ++var12) { // L: 642 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 643 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 644 + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); // L: 645 + var16 = (var13 << 8) / var15; // L: 646 + var17 = 65536 / var15; // L: 647 + var18 = (var14 << 8) / var15; // L: 648 + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 649 + var20 = (var42[var12][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1); // L: 650 + WorldMapLabelSize.field1570[var12][var11] = var19 - var20; // L: 651 + } } - GrandExchangeOfferAgeComparator.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1411 - Login.Login_loadingText = "Starting game engine..."; // L: 1412 - Login.Login_loadingPercent = 5; // L: 1413 - Client.titleLoadingStage = 20; // L: 1414 - } else if (Client.titleLoadingStage == 20) { // L: 1417 - Login.Login_loadingText = "Prepared visibility map"; // L: 1418 - Login.Login_loadingPercent = 10; // L: 1419 - Client.titleLoadingStage = 30; // L: 1420 - } else if (Client.titleLoadingStage == 30) { // L: 1423 - class52.archive0 = ViewportMouse.newArchive(0, false, true, true); // L: 1424 - SpriteMask.archive1 = ViewportMouse.newArchive(1, false, true, true); // L: 1425 - WorldMapIcon_0.archive2 = ViewportMouse.newArchive(2, true, false, true); // L: 1426 - PlayerComposition.archive3 = ViewportMouse.newArchive(3, false, true, true); // L: 1427 - WorldMapCacheName.archive4 = ViewportMouse.newArchive(4, false, true, true); // L: 1428 - class8.archive5 = ViewportMouse.newArchive(5, true, true, true); // L: 1429 - UrlRequester.archive6 = ViewportMouse.newArchive(6, true, true, true); // L: 1430 - WorldMapData_0.archive7 = ViewportMouse.newArchive(7, false, true, true); // L: 1431 - ModeWhere.archive8 = ViewportMouse.newArchive(8, false, true, true); // L: 1432 - ViewportMouse.archive9 = ViewportMouse.newArchive(9, false, true, true); // L: 1433 - LoginScreenAnimation.archive10 = ViewportMouse.newArchive(10, false, true, true); // L: 1434 - WorldMapManager.archive11 = ViewportMouse.newArchive(11, false, true, true); // L: 1435 - WorldMapSection0.archive12 = ViewportMouse.newArchive(12, false, true, true); // L: 1436 - CollisionMap.archive13 = ViewportMouse.newArchive(13, true, false, true); // L: 1437 - Tiles.archive14 = ViewportMouse.newArchive(14, false, true, true); // L: 1438 - SpriteMask.archive15 = ViewportMouse.newArchive(15, false, true, true); // L: 1439 - ItemComposition.archive17 = ViewportMouse.newArchive(17, true, true, true); // L: 1440 - class25.archive18 = ViewportMouse.newArchive(18, false, true, true); // L: 1441 - ArchiveLoader.archive19 = ViewportMouse.newArchive(19, false, true, true); // L: 1442 - Login.archive20 = ViewportMouse.newArchive(20, false, true, true); // L: 1443 - Login.Login_loadingText = "Connecting to update server"; // L: 1444 - Login.Login_loadingPercent = 20; // L: 1445 - Client.titleLoadingStage = 40; // L: 1446 - } else if (Client.titleLoadingStage == 40) { // L: 1449 - byte var25 = 0; // L: 1450 - var14 = var25 + class52.archive0.percentage() * 4 / 100; // L: 1451 - var14 += SpriteMask.archive1.percentage() * 4 / 100; // L: 1452 - var14 += WorldMapIcon_0.archive2.percentage() * 2 / 100; // L: 1453 - var14 += PlayerComposition.archive3.percentage() * 2 / 100; // L: 1454 - var14 += WorldMapCacheName.archive4.percentage() * 6 / 100; // L: 1455 - var14 += class8.archive5.percentage() * 4 / 100; // L: 1456 - var14 += UrlRequester.archive6.percentage() * 2 / 100; // L: 1457 - var14 += WorldMapData_0.archive7.percentage() * 56 / 100; // L: 1458 - var14 += ModeWhere.archive8.percentage() * 2 / 100; // L: 1459 - var14 += ViewportMouse.archive9.percentage() * 2 / 100; // L: 1460 - var14 += LoginScreenAnimation.archive10.percentage() * 2 / 100; // L: 1461 - var14 += WorldMapManager.archive11.percentage() * 2 / 100; // L: 1462 - var14 += WorldMapSection0.archive12.percentage() * 2 / 100; // L: 1463 - var14 += CollisionMap.archive13.percentage() * 2 / 100; // L: 1464 - var14 += Tiles.archive14.percentage() * 2 / 100; // L: 1465 - var14 += SpriteMask.archive15.percentage() * 2 / 100; // L: 1466 - var14 += ArchiveLoader.archive19.percentage() / 100; // L: 1467 - var14 += class25.archive18.percentage() / 100; // L: 1468 - var14 += Login.archive20.percentage() / 100; // L: 1469 - var14 += ItemComposition.archive17.method4461() && ItemComposition.archive17.isFullyLoaded() ? 1 : 0; // L: 1470 - if (var14 != 100) { // L: 1471 - if (var14 != 0) { // L: 1472 - Login.Login_loadingText = "Checking for updates - " + var14 + "%"; - } - - Login.Login_loadingPercent = 30; // L: 1473 - } else { - class217.method4155(class52.archive0, "Animations"); // L: 1476 - class217.method4155(SpriteMask.archive1, "Skeletons"); // L: 1477 - class217.method4155(WorldMapCacheName.archive4, "Sound FX"); // L: 1478 - class217.method4155(class8.archive5, "Maps"); // L: 1479 - class217.method4155(UrlRequester.archive6, "Music Tracks"); // L: 1480 - class217.method4155(WorldMapData_0.archive7, "Models"); // L: 1481 - class217.method4155(ModeWhere.archive8, "Sprites"); // L: 1482 - class217.method4155(WorldMapManager.archive11, "Music Jingles"); // L: 1483 - class217.method4155(Tiles.archive14, "Music Samples"); // L: 1484 - class217.method4155(SpriteMask.archive15, "Music Patches"); // L: 1485 - class217.method4155(ArchiveLoader.archive19, "World Map"); // L: 1486 - class217.method4155(class25.archive18, "World Map Geography"); // L: 1487 - class217.method4155(Login.archive20, "World Map Ground"); // L: 1488 - class60.spriteIds = new GraphicsDefaults(); // L: 1489 - class60.spriteIds.decode(ItemComposition.archive17); // L: 1490 - Login.Login_loadingText = "Loaded update list"; // L: 1491 - Login.Login_loadingPercent = 30; // L: 1492 - Client.titleLoadingStage = 45; // L: 1493 + for (var11 = 0; var11 < 104; ++var11) { // L: 654 + Tiles.Tiles_hue[var11] = 0; // L: 655 + Tiles.Tiles_saturation[var11] = 0; // L: 656 + Tiles.Tiles_lightness[var11] = 0; // L: 657 + GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier[var11] = 0; // L: 658 + class375.field4136[var11] = 0; // L: 659 } - } else if (Client.titleLoadingStage == 45) { // L: 1496 - boolean var24 = !Client.isLowDetail; // L: 1497 - StructComposition.field3338 = 22050; // L: 1500 - PcmPlayer.PcmPlayer_stereo = var24; // L: 1501 - PcmPlayer.field1419 = 2; // L: 1502 - MidiPcmStream var22 = new MidiPcmStream(); // L: 1504 - var22.method3919(9, 128); // L: 1505 - class197.pcmPlayer0 = GrandExchangeOffer.method167(taskHandler, 0, 22050); // L: 1506 - class197.pcmPlayer0.setStream(var22); // L: 1507 - class69.method1256(SpriteMask.archive15, Tiles.archive14, WorldMapCacheName.archive4, var22); // L: 1508 - WorldMapDecorationType.pcmPlayer1 = GrandExchangeOffer.method167(taskHandler, 1, 2048); // L: 1509 - VarbitComposition.pcmStreamMixer = new PcmStreamMixer(); // L: 1510 - WorldMapDecorationType.pcmPlayer1.setStream(VarbitComposition.pcmStreamMixer); // L: 1511 - World.decimator = new Decimator(22050, StructComposition.field3338); // L: 1512 - Login.Login_loadingText = "Prepared sound engine"; // L: 1513 - Login.Login_loadingPercent = 35; // L: 1514 - Client.titleLoadingStage = 50; // L: 1515 - class350.WorldMapElement_fonts = new Fonts(ModeWhere.archive8, CollisionMap.archive13); // L: 1516 - } else { - int var1; - if (Client.titleLoadingStage == 50) { // L: 1519 - FontName[] var20 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_bold12, FontName.FontName_verdana15, FontName.FontName_plain12}; // L: 1522 - var1 = var20.length; // L: 1524 - Fonts var23 = class350.WorldMapElement_fonts; // L: 1525 - FontName[] var18 = new FontName[]{FontName.FontName_plain11, FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_bold12, FontName.FontName_verdana15, FontName.FontName_plain12}; // L: 1528 - Client.fontsMap = var23.createMap(var18); // L: 1530 - if (Client.fontsMap.size() < var1) { // L: 1531 - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1532 - Login.Login_loadingPercent = 40; // L: 1533 - } else { - SecureRandomCallable.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1536 - Login.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1537 - ScriptEvent.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1538 - GrandExchangeOfferUnitPriceComparator.platformInfo = Client.platformInfoProvider.get(); // L: 1539 - Login.Login_loadingText = "Loaded fonts"; // L: 1540 - Login.Login_loadingPercent = 40; // L: 1541 - Client.titleLoadingStage = 60; // L: 1542 + + for (var11 = -5; var11 < 109; ++var11) { // L: 661 + for (var12 = 0; var12 < 104; ++var12) { // L: 662 + var13 = var11 + 5; // L: 663 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 664 + var14 = class9.field69[var2][var13][var12] & 255; // L: 665 + if (var14 > 0) { // L: 666 + var16 = var14 - 1; // L: 668 + FloorUnderlayDefinition var44 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 670 + FloorUnderlayDefinition var46; + if (var44 != null) { // L: 671 + var46 = var44; // L: 672 + } else { + byte[] var45 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 675 + var44 = new FloorUnderlayDefinition(); // L: 676 + if (var45 != null) { // L: 677 + var44.decode(new Buffer(var45), var16); + } + + var44.postDecode(); // L: 678 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var44, (long)var16); // L: 679 + var46 = var44; // L: 680 + } + + var10000 = Tiles.Tiles_hue; // L: 683 + var10000[var12] += var46.hue; + var10000 = Tiles.Tiles_saturation; // L: 684 + var10000[var12] += var46.saturation; + var10000 = Tiles.Tiles_lightness; // L: 685 + var10000[var12] += var46.lightness; + var10000 = GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier; // L: 686 + var10000[var12] += var46.hueMultiplier; + var10002 = class375.field4136[var12]++; // L: 687 + } + } + + var14 = var11 - 5; // L: 690 + if (var14 >= 0 && var14 < 104) { // L: 691 + var15 = class9.field69[var2][var14][var12] & 255; // L: 692 + if (var15 > 0) { // L: 693 + FloorUnderlayDefinition var47 = Tiles.method2035(var15 - 1); // L: 694 + var10000 = Tiles.Tiles_hue; // L: 695 + var10000[var12] -= var47.hue; + var10000 = Tiles.Tiles_saturation; // L: 696 + var10000[var12] -= var47.saturation; + var10000 = Tiles.Tiles_lightness; // L: 697 + var10000[var12] -= var47.lightness; + var10000 = GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier; // L: 698 + var10000[var12] -= var47.hueMultiplier; + var10002 = class375.field4136[var12]--; // L: 699 + } + } } - } else { - int var3; - int var4; - Archive var15; - Archive var16; - if (Client.titleLoadingStage == 60) { // L: 1545 - var15 = LoginScreenAnimation.archive10; // L: 1547 - var16 = ModeWhere.archive8; // L: 1548 - var3 = 0; // L: 1550 - if (var15.tryLoadFileByNames("title.jpg", "")) { // L: 1551 - ++var3; - } - if (var16.tryLoadFileByNames("logo", "")) { // L: 1552 - ++var3; - } + if (var11 >= 1 && var11 < 103) { // L: 703 + var12 = 0; // L: 704 + var13 = 0; // L: 705 + var14 = 0; // L: 706 + var15 = 0; // L: 707 + var16 = 0; // L: 708 - if (var16.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1553 - ++var3; - } + for (var17 = -5; var17 < 109; ++var17) { // L: 709 + var18 = var17 + 5; // L: 710 + if (var18 >= 0 && var18 < 104) { // L: 711 + var12 += Tiles.Tiles_hue[var18]; // L: 712 + var13 += Tiles.Tiles_saturation[var18]; // L: 713 + var14 += Tiles.Tiles_lightness[var18]; // L: 714 + var15 += GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier[var18]; // L: 715 + var16 += class375.field4136[var18]; // L: 716 + } - if (var16.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1554 - ++var3; - } + var19 = var17 - 5; // L: 718 + if (var19 >= 0 && var19 < 104) { // L: 719 + var12 -= Tiles.Tiles_hue[var19]; // L: 720 + var13 -= Tiles.Tiles_saturation[var19]; // L: 721 + var14 -= Tiles.Tiles_lightness[var19]; // L: 722 + var15 -= GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier[var19]; // L: 723 + var16 -= class375.field4136[var19]; // L: 724 + } - if (var16.tryLoadFileByNames("titlebox", "")) { // L: 1555 - ++var3; - } + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 726 727 728 729 + if (var2 < Tiles.Tiles_minPlane) { // L: 732 + Tiles.Tiles_minPlane = var2; + } - if (var16.tryLoadFileByNames("titlebutton", "")) { // L: 1556 - ++var3; - } + var20 = class9.field69[var2][var11][var17] & 255; // L: 733 + int var21 = Tiles.field1092[var2][var11][var17] & 255; // L: 734 + if (var20 > 0 || var21 > 0) { // L: 735 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 736 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 737 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 738 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 739 + int var26 = WorldMapLabelSize.field1570[var11][var17]; // L: 740 + int var27 = WorldMapLabelSize.field1570[var11 + 1][var17]; // L: 741 + int var28 = WorldMapLabelSize.field1570[var11 + 1][var17 + 1]; // L: 742 + int var29 = WorldMapLabelSize.field1570[var11][var17 + 1]; // L: 743 + int var30 = -1; // L: 744 + int var31 = -1; // L: 745 + int var32; + int var33; + if (var20 > 0) { // L: 746 + var32 = var12 * 256 / var15; // L: 747 + var33 = var13 / var16; // L: 748 + int var34 = var14 / var16; // L: 749 + var30 = Script.hslToRgb(var32, var33, var34); // L: 750 + var32 = var32 + Tiles.field1103 & 255; // L: 751 + var34 += Tiles.field1104; // L: 752 + if (var34 < 0) { // L: 753 + var34 = 0; + } else if (var34 > 255) { // L: 754 + var34 = 255; + } - if (var16.tryLoadFileByNames("runes", "")) { // L: 1557 - ++var3; - } + var31 = Script.hslToRgb(var32, var33, var34); // L: 755 + } - if (var16.tryLoadFileByNames("title_mute", "")) { // L: 1558 - ++var3; - } + if (var2 > 0) { // L: 757 + boolean var49 = true; // L: 758 + if (var20 == 0 && Tiles.field1091[var2][var11][var17] != 0) { // L: 759 + var49 = false; + } - if (var16.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1559 - ++var3; - } + if (var21 > 0 && !Login.method1968(var21 - 1).hideUnderlay) { // L: 760 + var49 = false; + } - if (var16.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1560 - ++var3; - } + if (var49 && var22 == var23 && var22 == var24 && var25 == var22) { // L: 761 762 + var10000 = MidiPcmStream.field2489[var2][var11]; + var10000[var17] |= 2340; + } + } - if (var16.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1561 - ++var3; - } + var32 = 0; // L: 765 + if (var31 != -1) { // L: 766 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[Message.method1191(var31, 96)]; + } - if (var16.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1562 - ++var3; - } + if (var21 == 0) { // L: 767 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, Message.method1191(var30, var26), Message.method1191(var30, var27), Message.method1191(var30, var28), Message.method1191(var30, var29), 0, 0, 0, 0, var32, 0); // L: 768 + } else { + var33 = Tiles.field1091[var2][var11][var17] + 1; // L: 771 + byte var50 = class362.field4079[var2][var11][var17]; // L: 772 + FloorOverlayDefinition var35 = Login.method1968(var21 - 1); // L: 773 + int var36 = var35.texture; // L: 774 + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { // L: 777 + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 778 + var37 = -1; // L: 779 + } else if (var35.primaryRgb == 16711935) { // L: 782 + var37 = -2; // L: 783 + var36 = -1; // L: 784 + var38 = -2; // L: 785 + } else { + var37 = Script.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 788 + var39 = var35.hue + Tiles.field1103 & 255; // L: 789 + var40 = var35.lightness + Tiles.field1104; // L: 790 + if (var40 < 0) { // L: 791 + var40 = 0; + } else if (var40 > 255) { // L: 792 + var40 = 255; + } - var16.tryLoadFileByNames("sl_back", ""); // L: 1563 - var16.tryLoadFileByNames("sl_flags", ""); // L: 1564 - var16.tryLoadFileByNames("sl_arrows", ""); // L: 1565 - var16.tryLoadFileByNames("sl_stars", ""); // L: 1566 - var16.tryLoadFileByNames("sl_button", ""); // L: 1567 - var4 = WorldMapIcon_0.method286(); // L: 1571 - if (var3 < var4) { // L: 1572 - Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 1573 - Login.Login_loadingPercent = 50; // L: 1574 + var38 = Script.hslToRgb(var39, var35.saturation, var40); // L: 793 + } + + var39 = 0; // L: 796 + if (var38 != -2) { // L: 797 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[Player.method2148(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 798 + var40 = var35.secondaryHue + Tiles.field1103 & 255; // L: 799 + int var41 = var35.secondaryLightness + Tiles.field1104; // L: 800 + if (var41 < 0) { // L: 801 + var41 = 0; + } else if (var41 > 255) { // L: 802 + var41 = 255; + } + + var38 = Script.hslToRgb(var40, var35.secondarySaturation, var41); // L: 803 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[Player.method2148(var38, 96)]; // L: 804 + } + + var0.addTile(var2, var11, var17, var33, var50, var36, var22, var23, var24, var25, Message.method1191(var30, var26), Message.method1191(var30, var27), Message.method1191(var30, var28), Message.method1191(var30, var29), Player.method2148(var37, var26), Player.method2148(var37, var27), Player.method2148(var37, var28), Player.method2148(var37, var29), var32, var39); // L: 806 + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { // L: 813 + for (var12 = 1; var12 < 103; ++var12) { // L: 814 + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 821 + var17 = 0; // L: 822 + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 825 + var17 = var2 - 1; // L: 826 } else { - Login.Login_loadingText = "Loaded title screen"; // L: 1577 - Login.Login_loadingPercent = 50; // L: 1578 - ItemContainer.updateGameState(5); // L: 1579 - Client.titleLoadingStage = 70; // L: 1580 + var17 = var2; // L: 829 } - } else if (Client.titleLoadingStage == 70) { // L: 1583 - if (!WorldMapIcon_0.archive2.isFullyLoaded()) { // L: 1584 - Login.Login_loadingText = "Loading config - " + WorldMapIcon_0.archive2.loadPercent() + "%"; // L: 1585 - Login.Login_loadingPercent = 60; // L: 1586 - } else { - class228.method4310(WorldMapIcon_0.archive2); // L: 1589 - Archive var19 = WorldMapIcon_0.archive2; // L: 1590 - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var19; // L: 1592 - class235.method4331(WorldMapIcon_0.archive2, WorldMapData_0.archive7); // L: 1594 - Frames.method3429(WorldMapIcon_0.archive2, WorldMapData_0.archive7, Client.isLowDetail); // L: 1595 - class3.method41(WorldMapIcon_0.archive2, WorldMapData_0.archive7); // L: 1596 - DirectByteArrayCopier.method4147(WorldMapIcon_0.archive2); // L: 1597 - var15 = WorldMapIcon_0.archive2; // L: 1598 - var16 = WorldMapData_0.archive7; // L: 1599 - boolean var21 = Client.isMembersWorld; // L: 1600 - Font var17 = SecureRandomCallable.fontPlain11; // L: 1601 - class299.ItemDefinition_archive = var15; // L: 1603 - class8.ItemDefinition_modelArchive = var16; // L: 1604 - Bounds.ItemDefinition_inMembersWorld = var21; // L: 1605 - class52.ItemDefinition_fileCount = class299.ItemDefinition_archive.getGroupFileCount(10); // L: 1606 - ItemComposition.ItemDefinition_fontPlain11 = var17; // L: 1607 - TextureProvider.method2935(WorldMapIcon_0.archive2, class52.archive0, SpriteMask.archive1); // L: 1609 - Archive var5 = WorldMapIcon_0.archive2; // L: 1610 - Archive var6 = WorldMapData_0.archive7; // L: 1611 - SpotAnimationDefinition.SpotAnimationDefinition_archive = var5; // L: 1613 - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var6; // L: 1614 - Archive var7 = WorldMapIcon_0.archive2; // L: 1616 - VarbitComposition.VarbitDefinition_archive = var7; // L: 1618 - Archive var8 = WorldMapIcon_0.archive2; // L: 1620 - VarpDefinition.VarpDefinition_archive = var8; // L: 1622 - class58.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 1623 - MouseHandler.method1151(PlayerComposition.archive3, WorldMapData_0.archive7, ModeWhere.archive8, CollisionMap.archive13); // L: 1625 - class217.method4154(WorldMapIcon_0.archive2); // L: 1626 - Archive var9 = WorldMapIcon_0.archive2; // L: 1627 - EnumComposition.EnumDefinition_archive = var9; // L: 1629 - class22.method227(WorldMapIcon_0.archive2); // L: 1631 - class197.method3828(WorldMapIcon_0.archive2); // L: 1632 - GrandExchangeOffer.varcs = new Varcs(); // L: 1633 - StructComposition.method4734(WorldMapIcon_0.archive2, ModeWhere.archive8, CollisionMap.archive13); // L: 1634 - UserComparator9.method3562(WorldMapIcon_0.archive2, ModeWhere.archive8); // L: 1635 - Archive var10 = WorldMapIcon_0.archive2; // L: 1636 - Archive var11 = ModeWhere.archive8; // L: 1637 - WorldMapElement.WorldMapElement_archive = var11; // L: 1639 - if (var10.isFullyLoaded()) { // L: 1640 - WorldMapElement.WorldMapElement_count = var10.getGroupFileCount(35); // L: 1643 - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 1644 - for (int var12 = 0; var12 < WorldMapElement.WorldMapElement_count; ++var12) { // L: 1645 - byte[] var13 = var10.takeFile(35, var12); // L: 1646 - WorldMapElement.WorldMapElement_cached[var12] = new WorldMapElement(var12); // L: 1647 - if (var13 != null) { // L: 1648 - WorldMapElement.WorldMapElement_cached[var12].decode(new Buffer(var13)); // L: 1649 - WorldMapElement.WorldMapElement_cached[var12].method4576(); // L: 1650 + var0.setTileMinPlane(var2, var12, var11, var17); // L: 831 + } + } + + class9.field69[var2] = null; // L: 834 + Tiles.field1092[var2] = null; // L: 835 + Tiles.field1091[var2] = null; // L: 836 + class362.field4079[var2] = null; // L: 837 + SecureRandomCallable.field1106[var2] = null; // L: 838 + } + + var0.method3466(-50, -10, -50); // L: 840 + + for (var2 = 0; var2 < 104; ++var2) { // L: 841 + for (var3 = 0; var3 < 104; ++var3) { // L: 842 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 843 + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; // L: 846 + var3 = 2; // L: 847 + var4 = 4; // L: 848 + + for (var5 = 0; var5 < 4; ++var5) { // L: 849 + if (var5 > 0) { // L: 850 + var2 <<= 3; // L: 851 + var3 <<= 3; // L: 852 + var4 <<= 3; // L: 853 + } + + for (int var6 = 0; var6 <= var5; ++var6) { // L: 855 + for (int var7 = 0; var7 <= 104; ++var7) { // L: 856 + for (int var8 = 0; var8 <= 104; ++var8) { // L: 857 + short var48; + if ((MidiPcmStream.field2489[var6][var8][var7] & var2) != 0) { // L: 858 + var9 = var7; // L: 859 + var10 = var7; // L: 860 + var11 = var6; // L: 861 + + for (var12 = var6; var9 > 0 && (MidiPcmStream.field2489[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 862 863 + } + + while (var10 < 104 && (MidiPcmStream.field2489[var6][var8][var10 + 1] & var2) != 0) { // L: 864 + ++var10; + } + + label444: + while (var11 > 0) { // L: 865 + for (var13 = var9; var13 <= var10; ++var13) { // L: 866 + if ((MidiPcmStream.field2489[var11 - 1][var8][var13] & var2) == 0) { + break label444; + } + } + + --var11; // L: 867 + } + + label433: + while (var12 < var5) { // L: 869 + for (var13 = var9; var13 <= var10; ++var13) { // L: 870 + if ((MidiPcmStream.field2489[var12 + 1][var8][var13] & var2) == 0) { + break label433; + } + } + + ++var12; // L: 871 + } + + var13 = (var12 + 1 - var11) * (var10 - var9 + 1); // L: 873 + if (var13 >= 8) { // L: 874 + var48 = 240; // L: 875 + var15 = Tiles.Tiles_heights[var12][var8][var9] - var48; // L: 876 + var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 877 + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 878 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 879 + for (var18 = var9; var18 <= var10; ++var18) { // L: 880 + var10000 = MidiPcmStream.field2489[var17][var8]; + var10000[var18] &= ~var2; + } } } } - Login.Login_loadingText = "Loaded config"; // L: 1654 - Login.Login_loadingPercent = 60; // L: 1655 - Client.titleLoadingStage = 80; // L: 1656 - } - } else if (Client.titleLoadingStage == 80) { // L: 1659 - var14 = 0; // L: 1660 - if (LoginScreenAnimation.compass == null) { // L: 1661 - LoginScreenAnimation.compass = BufferedSource.SpriteBuffer_getSprite(ModeWhere.archive8, class60.spriteIds.compass, 0); - } else { - ++var14; // L: 1662 - } + if ((MidiPcmStream.field2489[var6][var8][var7] & var3) != 0) { // L: 884 + var9 = var8; // L: 885 + var10 = var8; // L: 886 + var11 = var6; // L: 887 - if (class236.redHintArrowSprite == null) { // L: 1663 - class236.redHintArrowSprite = BufferedSource.SpriteBuffer_getSprite(ModeWhere.archive8, class60.spriteIds.field3847, 0); - } else { - ++var14; // L: 1664 - } + for (var12 = var6; var9 > 0 && (MidiPcmStream.field2489[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 888 889 + } - if (WorldMapSection1.mapSceneSprites == null) { // L: 1665 - WorldMapSection1.mapSceneSprites = BoundaryObject.method3420(ModeWhere.archive8, class60.spriteIds.mapScenes, 0); - } else { - ++var14; // L: 1666 - } + while (var10 < 104 && (MidiPcmStream.field2489[var6][var10 + 1][var7] & var3) != 0) { // L: 890 + ++var10; + } - if (Client.headIconPkSprites == null) { // L: 1667 - Client.headIconPkSprites = WorldMapLabelSize.method268(ModeWhere.archive8, class60.spriteIds.headIconsPk, 0); - } else { - ++var14; // L: 1668 - } + label497: + while (var11 > 0) { // L: 891 + for (var13 = var9; var13 <= var10; ++var13) { // L: 892 + if ((MidiPcmStream.field2489[var11 - 1][var13][var7] & var3) == 0) { + break label497; + } + } - if (class169.headIconPrayerSprites == null) { // L: 1669 - class169.headIconPrayerSprites = WorldMapLabelSize.method268(ModeWhere.archive8, class60.spriteIds.field3838, 0); - } else { - ++var14; // L: 1670 - } + --var11; // L: 893 + } - if (class13.headIconHintSprites == null) { // L: 1671 - class13.headIconHintSprites = WorldMapLabelSize.method268(ModeWhere.archive8, class60.spriteIds.field3843, 0); - } else { - ++var14; // L: 1672 - } + label486: + while (var12 < var5) { // L: 895 + for (var13 = var9; var13 <= var10; ++var13) { // L: 896 + if ((MidiPcmStream.field2489[var12 + 1][var13][var7] & var3) == 0) { + break label486; + } + } - if (GrandExchangeOfferWorldComparator.mapMarkerSprites == null) { // L: 1673 - GrandExchangeOfferWorldComparator.mapMarkerSprites = WorldMapLabelSize.method268(ModeWhere.archive8, class60.spriteIds.field3839, 0); - } else { - ++var14; // L: 1674 - } + ++var12; // L: 897 + } - if (Frames.crossSprites == null) { // L: 1675 - Frames.crossSprites = WorldMapLabelSize.method268(ModeWhere.archive8, class60.spriteIds.field3845, 0); - } else { - ++var14; // L: 1676 - } + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 899 + if (var13 >= 8) { // L: 900 + var48 = 240; // L: 901 + var15 = Tiles.Tiles_heights[var12][var9][var7] - var48; // L: 902 + var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 903 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 904 - if (ChatChannel.mapDotSprites == null) { // L: 1677 - ChatChannel.mapDotSprites = WorldMapLabelSize.method268(ModeWhere.archive8, class60.spriteIds.field3846, 0); - } else { - ++var14; // L: 1678 - } - - if (ObjectSound.scrollBarSprites == null) { // L: 1679 - ObjectSound.scrollBarSprites = BoundaryObject.method3420(ModeWhere.archive8, class60.spriteIds.field3840, 0); - } else { - ++var14; // L: 1680 - } - - if (Actor.modIconSprites == null) { // L: 1681 - Actor.modIconSprites = BoundaryObject.method3420(ModeWhere.archive8, class60.spriteIds.field3848, 0); - } else { - ++var14; // L: 1682 - } - - if (var14 < 11) { // L: 1683 - Login.Login_loadingText = "Loading sprites - " + var14 * 100 / 12 + "%"; // L: 1684 - Login.Login_loadingPercent = 70; // L: 1685 - } else { - AbstractFont.AbstractFont_modIconSprites = Actor.modIconSprites; // L: 1688 - class236.redHintArrowSprite.normalize(); // L: 1689 - var1 = (int)(Math.random() * 21.0D) - 10; // L: 1690 - int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1691 - var3 = (int)(Math.random() * 21.0D) - 10; // L: 1692 - var4 = (int)(Math.random() * 41.0D) - 20; // L: 1693 - WorldMapSection1.mapSceneSprites[0].shiftColors(var1 + var4, var4 + var2, var4 + var3); // L: 1694 - Login.Login_loadingText = "Loaded sprites"; // L: 1695 - Login.Login_loadingPercent = 70; // L: 1696 - Client.titleLoadingStage = 90; // L: 1697 - } - } else if (Client.titleLoadingStage == 90) { // L: 1700 - if (!ViewportMouse.archive9.isFullyLoaded()) { // L: 1701 - Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1702 - Login.Login_loadingPercent = 90; // L: 1703 - } else { - BoundaryObject.textureProvider = new TextureProvider(ViewportMouse.archive9, ModeWhere.archive8, 20, WorldMapSectionType.clientPreferences.field1072, Client.isLowDetail ? 64 : 128); // L: 1706 - Rasterizer3D.Rasterizer3D_setTextureLoader(BoundaryObject.textureProvider); // L: 1707 - Rasterizer3D.Rasterizer3D_setBrightness(WorldMapSectionType.clientPreferences.field1072); // L: 1708 - Client.titleLoadingStage = 100; // L: 1709 - } - } else if (Client.titleLoadingStage == 100) { // L: 1712 - var14 = BoundaryObject.textureProvider.getLoadedPercentage(); // L: 1713 - if (var14 < 100) { // L: 1714 - Login.Login_loadingText = "Loading textures - " + var14 + "%"; // L: 1715 - Login.Login_loadingPercent = 90; // L: 1716 - } else { - Login.Login_loadingText = "Loaded textures"; // L: 1719 - Login.Login_loadingPercent = 90; // L: 1720 - Client.titleLoadingStage = 110; // L: 1721 - } - } else if (Client.titleLoadingStage == 110) { // L: 1724 - Friend.mouseRecorder = new MouseRecorder(); // L: 1725 - taskHandler.newThreadTask(Friend.mouseRecorder, 10); // L: 1726 - Login.Login_loadingText = "Loaded input handler"; // L: 1727 - Login.Login_loadingPercent = 92; // L: 1728 - Client.titleLoadingStage = 120; // L: 1729 - } else if (Client.titleLoadingStage == 120) { // L: 1732 - if (!LoginScreenAnimation.archive10.tryLoadFileByNames("huffman", "")) { // L: 1733 - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1734 - Login.Login_loadingPercent = 94; // L: 1735 - } else { - Huffman var0 = new Huffman(LoginScreenAnimation.archive10.takeFileByNames("huffman", "")); // L: 1738 - class219.huffman = var0; // L: 1740 - Login.Login_loadingText = "Loaded wordpack"; // L: 1742 - Login.Login_loadingPercent = 94; // L: 1743 - Client.titleLoadingStage = 130; // L: 1744 - } - } else if (Client.titleLoadingStage == 130) { // L: 1747 - if (!PlayerComposition.archive3.isFullyLoaded()) { // L: 1748 - Login.Login_loadingText = "Loading interfaces - " + PlayerComposition.archive3.loadPercent() * 4 / 5 + "%"; // L: 1749 - Login.Login_loadingPercent = 96; // L: 1750 - } else if (!WorldMapSection0.archive12.isFullyLoaded()) { // L: 1753 - Login.Login_loadingText = "Loading interfaces - " + (80 + WorldMapSection0.archive12.loadPercent() / 6) + "%"; // L: 1754 - Login.Login_loadingPercent = 96; // L: 1755 - } else if (!CollisionMap.archive13.isFullyLoaded()) { // L: 1758 - Login.Login_loadingText = "Loading interfaces - " + (96 + CollisionMap.archive13.loadPercent() / 50) + "%"; // L: 1759 - Login.Login_loadingPercent = 96; // L: 1760 - } else { - Login.Login_loadingText = "Loaded interfaces"; // L: 1763 - Login.Login_loadingPercent = 98; // L: 1764 - Client.titleLoadingStage = 140; // L: 1765 - } - } else if (Client.titleLoadingStage == 140) { // L: 1768 - Login.Login_loadingPercent = 100; // L: 1769 - if (!ArchiveLoader.archive19.tryLoadGroupByName(WorldMapCacheName.field333.name)) { // L: 1770 - Login.Login_loadingText = "Loading world map - " + ArchiveLoader.archive19.groupLoadPercentByName(WorldMapCacheName.field333.name) / 10 + "%"; // L: 1771 - } else { - if (SoundSystem.worldMap == null) { // L: 1774 - SoundSystem.worldMap = new WorldMap(); // L: 1775 - SoundSystem.worldMap.init(ArchiveLoader.archive19, class25.archive18, Login.archive20, ScriptEvent.fontBold12, Client.fontsMap, WorldMapSection1.mapSceneSprites); // L: 1776 + for (var17 = var11; var17 <= var12; ++var17) { // L: 905 + for (var18 = var9; var18 <= var10; ++var18) { // L: 906 + var10000 = MidiPcmStream.field2489[var17][var18]; + var10000[var7] &= ~var3; + } + } + } } - Login.Login_loadingText = "Loaded world map"; // L: 1778 - Client.titleLoadingStage = 150; // L: 1779 + if ((MidiPcmStream.field2489[var6][var8][var7] & var4) != 0) { // L: 910 + var9 = var8; // L: 911 + var10 = var8; // L: 912 + var11 = var7; // L: 913 + + for (var12 = var7; var11 > 0 && (MidiPcmStream.field2489[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 914 915 + } + + while (var12 < 104 && (MidiPcmStream.field2489[var6][var8][var12 + 1] & var4) != 0) { // L: 916 + ++var12; + } + + label550: + while (var9 > 0) { // L: 917 + for (var13 = var11; var13 <= var12; ++var13) { // L: 918 + if ((MidiPcmStream.field2489[var6][var9 - 1][var13] & var4) == 0) { + break label550; + } + } + + --var9; // L: 919 + } + + label539: + while (var10 < 104) { // L: 921 + for (var13 = var11; var13 <= var12; ++var13) { // L: 922 + if ((MidiPcmStream.field2489[var6][var10 + 1][var13] & var4) == 0) { + break label539; + } + } + + ++var10; // L: 923 + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 925 + var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 926 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 927 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 928 + for (var15 = var11; var15 <= var12; ++var15) { // L: 929 + var10000 = MidiPcmStream.field2489[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } } - } else if (Client.titleLoadingStage == 150) { // L: 1782 - ItemContainer.updateGameState(10); // L: 1783 } } } - } // L: 1415 1421 1447 1474 1494 1517 1534 1543 1575 1581 1587 1657 1686 1698 1704 1710 1717 1722 1730 1736 1745 1751 1756 1761 1766 1772 1780 1784 1786 - @ObfuscatedName("gs") + } // L: 937 + + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1110901691" + descriptor = "(ILcc;ZS)I", + garbageValue = "174" ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4293 - NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4294 - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4295 - int var3 = var2.x >> 7; // L: 4296 - int var4 = var2.y >> 7; // L: 4297 - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4298 - if (var2.field1007 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4299 - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4300 - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4301 - } - - long var5 = TextureProvider.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4303 - var2.playerCycle = Client.cycle; // L: 4304 - MilliClock.scene.drawEntity(class90.Client_plane, var2.x, var2.y, WorldMapRegion.getTileHeight(var2.field1007 * 64 - 64 + var2.x, var2.field1007 * 64 - 64 + var2.y, class90.Client_plane), var2.field1007 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4305 - } - } + static int method547(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1102 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1103 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1104 + return 1; // L: 1105 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1107 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1108 + return 1; // L: 1109 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1111 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1112 + return 1; // L: 1113 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1115 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1116 + return 1; // L: 1117 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1119 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1120 + return 1; // L: 1121 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1123 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1124 + return 1; // L: 1125 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1127 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1128 + return 1; // L: 1129 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1131 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1132 + return 1; // L: 1133 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1135 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1136 + return 1; // L: 1137 + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1139 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1140 + return 1; // L: 1141 + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1143 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1144 + return 1; // L: 1145 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1147 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color; // L: 1148 + return 1; // L: 1149 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1151 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color2; // L: 1152 + return 1; // L: 1153 + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1155 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1156 + return 1; // L: 1157 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1159 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1160 + return 1; // L: 1161 + } else if (var0 != 1615 && var0 != 1616) { // L: 1163 + return 2; // L: 1167 + } else { + ++class16.Interpreter_intStackSize; // L: 1164 + return 1; // L: 1165 } - - } // L: 4309 + } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index bd6a838f92..26f489691f 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,268 +4,682 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("gb") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1569819591 + intValue = 1988306865 ) @Export("plane") int plane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1280994929 + intValue = 1610249635 ) @Export("height") int height; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 554225733 + intValue = -422238423 ) @Export("centerX") int centerX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1832118377 + intValue = 189641591 ) @Export("centerY") int centerY; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("renderable") public Renderable renderable; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1300389529 + intValue = 1450544677 ) @Export("orientation") int orientation; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1124762067 + intValue = 876164639 ) @Export("startX") int startX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 389479395 + intValue = 691537969 ) @Export("endX") int endX; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1171959885 + intValue = 574238181 ) @Export("startY") int startY; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1972895723 + intValue = -1114926277 ) @Export("endY") int endY; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2090583713 + intValue = 936749737 ) - int field1947; - @ObfuscatedName("b") + int field2191; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1378890207 + intValue = -823788373 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 5598826285352901571L + longValue = 1468949973913714587L ) @Export("tag") public long tag; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 328569779 + intValue = -49778541 ) @Export("flags") int flags; GameObject() { this.tag = 0L; // L: 16 - this.flags = 0; // L: 17 - } // L: 19 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-3" - ) - public static int method3452(int var0) { - --var0; // L: 44 - var0 |= var0 >>> 1; // L: 45 - var0 |= var0 >>> 2; // L: 46 - var0 |= var0 >>> 4; // L: 47 - var0 |= var0 >>> 8; // L: 48 - var0 |= var0 >>> 16; // L: 49 - return var0 + 1; // L: 50 + this.flags = 0; } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BI)Lcl;", - garbageValue = "-1796289150" + descriptor = "(IB)Ljs;", + garbageValue = "53" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); // L: 83 - Buffer var2 = new Buffer(var0); // L: 84 - var2.offset = var2.array.length - 2; // L: 85 - int var3 = var2.readUnsignedShort(); // L: 86 - int var4 = var2.array.length - 2 - var3 - 12; // L: 87 - var2.offset = var4; // L: 88 - int var5 = var2.readInt(); // L: 89 - var1.localIntCount = var2.readUnsignedShort(); // L: 90 - var1.localStringCount = var2.readUnsignedShort(); // L: 91 - var1.intArgumentCount = var2.readUnsignedShort(); // L: 92 - var1.stringArgumentCount = var2.readUnsignedShort(); // L: 93 - int var6 = var2.readUnsignedByte(); // L: 94 - int var7; - int var8; - if (var6 > 0) { // L: 95 - var1.switches = var1.newIterableNodeHashTable(var6); // L: 96 - - for (var7 = 0; var7 < var6; ++var7) { // L: 97 - var8 = var2.readUnsignedShort(); // L: 98 - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? method3452(var8) : 1); // L: 99 - var1.switches[var7] = var9; // L: 100 - - while (var8-- > 0) { // L: 101 - int var10 = var2.readInt(); // L: 102 - int var11 = var2.readInt(); // L: 103 - var9.put(new IntegerNode(var11), (long)var10); // L: 104 - } - } - } - - var2.offset = 0; // L: 108 - var2.readStringCp1252NullTerminatedOrNull(); // L: 109 - var1.opcodes = new int[var5]; // L: 110 - var1.intOperands = new int[var5]; // L: 111 - var1.stringOperands = new String[var5]; // L: 112 - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 113 114 119 - var8 = var2.readUnsignedShort(); // L: 115 - if (var8 == 3) { // L: 116 - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); // L: 117 - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); // L: 118 - } - } - - return var1; // L: 121 - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1120887468" - ) - static final int method3451(int var0, int var1) { - if (var0 == -1) { // L: 565 - return 12345678; + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; } else { - var1 = (var0 & 127) * var1 / 128; // L: 566 - if (var1 < 2) { // L: 567 - var1 = 2; - } else if (var1 > 126) { // L: 568 - var1 = 126; + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19 + var1 = new InvDefinition(); // L: 20 + if (var2 != null) { // L: 21 + var1.decode(new Buffer(var2)); } - return (var0 & 65408) + var1; // L: 569 + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22 + return var1; // L: 23 } } - @ObfuscatedName("fr") + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "(Lcv;I)V", - garbageValue = "871352937" + descriptor = "([Lhu;IIIIIIII)V", + garbageValue = "762293873" ) - static final void method3453(Actor var0) { - if (var0.field1006 != 0) { // L: 3649 - if (var0.targetIndex != -1) { // L: 3650 - Object var1 = null; // L: 3651 - if (var0.targetIndex < 32768) { // L: 3652 - var1 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { // L: 3653 - var1 = Client.players[var0.targetIndex - 32768]; + @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: 10406 + Widget var9 = var0[var8]; // L: 10407 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || DirectByteArrayCopier.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10408 10409 10410 + if (var9.isIf3) { // L: 10411 + if (WorldMapArea.isComponentHidden(var9)) { // L: 10412 + continue; + } + } else if (var9.type == 0 && var9 != Varps.mousedOverWidgetIf1 && WorldMapArea.isComponentHidden(var9)) { // L: 10415 + continue; } - if (var1 != null) { // L: 3654 - int var2 = var0.x - ((Actor)var1).x; // L: 3655 - int var3 = var0.y - ((Actor)var1).y; // L: 3656 - if (var2 != 0 || var3 != 0) { // L: 3657 - var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047; - } - } else if (var0.false0) { // L: 3659 - var0.targetIndex = -1; // L: 3660 - var0.false0 = false; // L: 3661 - } - } - - if (var0.field981 != -1 && (var0.pathLength == 0 || var0.field989 > 0)) { // L: 3664 - var0.orientation = var0.field981; // L: 3665 - var0.field981 = -1; // L: 3666 - } - - int var4 = var0.orientation - var0.rotation & 2047; // L: 3668 - if (var4 == 0 && var0.false0) { // L: 3669 - var0.targetIndex = -1; // L: 3670 - var0.false0 = false; // L: 3671 - } - - if (var4 != 0) { // L: 3673 - ++var0.field957; // L: 3674 - boolean var6; - if (var4 > 1024) { // L: 3675 - var0.rotation -= var0.field1006; // L: 3676 - var6 = true; // L: 3677 - if (var4 < var0.field1006 || var4 > 2048 - var0.field1006) { // L: 3678 - var0.rotation = var0.orientation; // L: 3679 - var6 = false; // L: 3680 - } - - if (var0.movementSequence == var0.idleSequence && (var0.field957 > 25 || var6)) { // L: 3682 - if (var0.turnLeftSequence != -1) { // L: 3683 - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3684 - } - } + int var10 = var9.x + var6; // L: 10417 + int var11 = var7 + var9.y; // L: 10418 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 10423 + var12 = var2; // L: 10424 + var13 = var3; // L: 10425 + var14 = var4; // L: 10426 + var15 = var5; // L: 10427 } else { - var0.rotation += var0.field1006; // L: 3688 - var6 = true; // L: 3689 - if (var4 < var0.field1006 || var4 > 2048 - var0.field1006) { // L: 3690 - var0.rotation = var0.orientation; // L: 3691 - var6 = false; // L: 3692 - } + int var16; + if (var9.type == 9) { // L: 10429 + var16 = var10; // L: 10430 + var17 = var11; // L: 10431 + var18 = var10 + var9.width; // L: 10432 + int var19 = var11 + var9.height; // L: 10433 + if (var18 < var10) { // L: 10434 + var16 = var18; // L: 10436 + var18 = var10; // L: 10437 + } - if (var0.movementSequence == var0.idleSequence && (var0.field957 > 25 || var6)) { // L: 3694 - if (var0.turnRightSequence != -1) { // L: 3695 - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; // L: 3696 + if (var19 < var11) { // L: 10439 + var17 = var19; // L: 10441 + var19 = var11; // L: 10442 + } + + ++var18; // L: 10444 + ++var19; // L: 10445 + var12 = var16 > var2 ? var16 : var2; // L: 10446 + var13 = var17 > var3 ? var17 : var3; // L: 10447 + var14 = var18 < var4 ? var18 : var4; // L: 10448 + var15 = var19 < var5 ? var19 : var5; // L: 10449 + } else { + var16 = var10 + var9.width; // L: 10452 + var17 = var11 + var9.height; // L: 10453 + var12 = var10 > var2 ? var10 : var2; // L: 10454 + var13 = var11 > var3 ? var11 : var3; // L: 10455 + var14 = var16 < var4 ? var16 : var4; // L: 10456 + var15 = var17 < var5 ? var17 : var5; // L: 10457 + } + } + + if (var9 == Client.clickedWidget) { // L: 10459 + Client.field783 = true; // L: 10460 + Client.field784 = var10; // L: 10461 + Client.field845 = var11; // L: 10462 + } + + boolean var32 = false; // L: 10464 + if (var9.field2698) { // L: 10465 + switch(Client.field764) { // L: 10466 + case 0: + var32 = true; // L: 10473 + case 1: + default: + break; + case 2: + if (Client.field765 == var9.id >>> 16) { // L: 10468 + var32 = true; // L: 10469 + } + break; + case 3: + if (var9.id == Client.field765) { // L: 10476 + var32 = true; // L: 10477 } } } - var0.rotation &= 2047; // L: 3700 - } else { - var0.field957 = 0; // L: 3702 - } + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10482 + if (var9.isIf3) { // L: 10483 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 10484 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10485 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10486 + if (var26.isMouseInputEvent) { // L: 10487 + var26.remove(); // L: 10488 + var26.widget.containsMouse = false; // L: 10489 + } + } + if (class34.widgetDragDuration == 0) { // L: 10492 + Client.clickedWidget = null; // L: 10493 + Client.clickedWidgetParent = null; // L: 10494 + } + + if (!Client.isMenuOpen) { // L: 10496 + VerticalAlignment.addCancelMenuEntry(); // L: 10497 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10501 10502 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10503 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10504 + var26.remove(); // L: 10505 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 10511 + var18 = MouseHandler.MouseHandler_y; // L: 10512 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10513 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10514 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10515 + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10517 + if (var9.contentType == 1337) { // L: 10518 + if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10519 + BuddyRankComparator.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 10522 + class14.checkIfMinimapClicked(var9, var10, var11); // L: 10523 + } else { + if (var9.contentType == 1400) { // L: 10526 + UserComparator4.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10527 + } + + if (!Client.isMenuOpen && var33) { // L: 10529 + if (var9.contentType == 1400) { // L: 10530 + UserComparator4.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10531 + } else { + class12.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10534 + } + } + + boolean var21; + int var23; + if (var32) { // L: 10537 + for (int var20 = 0; var20 < var9.field2699.length; ++var20) { // L: 10538 + var21 = false; // L: 10539 + boolean var27 = false; // L: 10540 + if (!var21 && var9.field2699[var20] != null) { // L: 10541 + for (var23 = 0; var23 < var9.field2699[var20].length; ++var23) { // L: 10542 + boolean var24 = false; // L: 10543 + if (var9.field2653 != null) { // L: 10544 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2699[var20][var23]]; // L: 10545 + } + + if (BoundaryObject.method3787(var9.field2699[var20][var23]) || var24) { // L: 10547 + var21 = true; // L: 10548 + if (var9.field2653 != null && var9.field2653[var20] > Client.cycle) { // L: 10549 + break; + } + + byte var31 = var9.field2747[var20][var23]; // L: 10550 + if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10551 10552 10553 10554 10555 + var27 = true; // L: 10557 + break; + } + } + } + } + + if (var27) { // L: 10563 + if (var20 < 10) { // L: 10564 + class376.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 10565 + WorldMapID.Widget_runOnTargetLeave(); // L: 10566 + Strings.selectSpell(var9.id, var9.childIndex, class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var9)), var9.itemId); // L: 10567 + Client.selectedSpellActionName = class11.Widget_getSpellActionName(var9); // L: 10568 + if (Client.selectedSpellActionName == null) { // L: 10569 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + DefaultsGroup.colorStartTag(16777215); // L: 10570 + } + + var23 = var9.field2701[var20]; // L: 10572 + if (var9.field2653 == null) { // L: 10573 + var9.field2653 = new int[var9.field2699.length]; + } + + if (var9.field2692 == null) { // L: 10574 + var9.field2692 = new int[var9.field2699.length]; + } + + if (var23 != 0) { // L: 10575 + if (var9.field2653[var20] == 0) { // L: 10576 + var9.field2653[var20] = var23 + Client.cycle + var9.field2692[var20]; + } else { + var9.field2653[var20] = var23 + Client.cycle; // L: 10577 + } + } else { + var9.field2653[var20] = Integer.MAX_VALUE; // L: 10579 + } + } + + if (!var21 && var9.field2653 != null) { // L: 10581 10582 + var9.field2653[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 10586 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10587 + var33 = true; + } else { + var33 = false; // L: 10588 + } + + boolean var34 = false; // L: 10589 + if ((MouseHandler.MouseHandler_currentButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10590 + var34 = true; + } + + var21 = false; // L: 10591 + if ((MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10592 + var21 = true; + } + + if (var21) { // L: 10593 + PcmPlayer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 10594 + UserComparator4.worldMap.method6197(var17, var18, var33 & var34, var33 & var21); // L: 10595 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && ObjectSound.method1797(DirectByteArrayCopier.getWidgetFlags(var9))) { // L: 10597 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 10598 + Client.field780 = true; // L: 10599 + Client.field727 = var10; // L: 10600 + Client.field782 = var11; // L: 10601 + } + + if (var9.hasListener) { // L: 10603 + ScriptEvent var22; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10604 + var22 = new ScriptEvent(); // L: 10605 + var22.isMouseInputEvent = true; // L: 10606 + var22.widget = var9; // L: 10607 + var22.mouseY = Client.mouseWheelRotation; // L: 10608 + var22.args = var9.onScroll; // L: 10609 + Client.scriptEvents.addFirst(var22); // L: 10610 + } + + if (Client.clickedWidget != null || ClientPacket.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10612 + var21 = false; // L: 10613 + var34 = false; // L: 10614 + var33 = false; // L: 10615 + } + + if (!var9.isClicked && var21) { // L: 10617 + var9.isClicked = true; // L: 10618 + if (var9.onClick != null) { // L: 10619 + var22 = new ScriptEvent(); // L: 10620 + var22.isMouseInputEvent = true; // L: 10621 + var22.widget = var9; // L: 10622 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10623 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10624 + var22.args = var9.onClick; // L: 10625 + Client.scriptEvents.addFirst(var22); // L: 10626 + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10629 10630 + var22 = new ScriptEvent(); // L: 10631 + var22.isMouseInputEvent = true; // L: 10632 + var22.widget = var9; // L: 10633 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10634 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10635 + var22.args = var9.onClickRepeat; // L: 10636 + Client.scriptEvents.addFirst(var22); // L: 10637 + } + + if (var9.isClicked && !var34) { // L: 10640 + var9.isClicked = false; // L: 10641 + if (var9.onRelease != null) { // L: 10642 + var22 = new ScriptEvent(); // L: 10643 + var22.isMouseInputEvent = true; // L: 10644 + var22.widget = var9; // L: 10645 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10646 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10647 + var22.args = var9.onRelease; // L: 10648 + Client.field688.addFirst(var22); // L: 10649 + } + } + + if (var34 && var9.onHold != null) { // L: 10652 10653 + var22 = new ScriptEvent(); // L: 10654 + var22.isMouseInputEvent = true; // L: 10655 + var22.widget = var9; // L: 10656 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10657 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10658 + var22.args = var9.onHold; // L: 10659 + Client.scriptEvents.addFirst(var22); // L: 10660 + } + + if (!var9.containsMouse && var33) { // L: 10663 + var9.containsMouse = true; // L: 10664 + if (var9.onMouseOver != null) { // L: 10665 + var22 = new ScriptEvent(); // L: 10666 + var22.isMouseInputEvent = true; // L: 10667 + var22.widget = var9; // L: 10668 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10669 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10670 + var22.args = var9.onMouseOver; // L: 10671 + Client.scriptEvents.addFirst(var22); // L: 10672 + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10675 10676 + var22 = new ScriptEvent(); // L: 10677 + var22.isMouseInputEvent = true; // L: 10678 + var22.widget = var9; // L: 10679 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10680 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10681 + var22.args = var9.onMouseRepeat; // L: 10682 + Client.scriptEvents.addFirst(var22); // L: 10683 + } + + if (var9.containsMouse && !var33) { // L: 10686 + var9.containsMouse = false; // L: 10687 + if (var9.onMouseLeave != null) { // L: 10688 + var22 = new ScriptEvent(); // L: 10689 + var22.isMouseInputEvent = true; // L: 10690 + var22.widget = var9; // L: 10691 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10692 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10693 + var22.args = var9.onMouseLeave; // L: 10694 + Client.field688.addFirst(var22); // L: 10695 + } + } + + if (var9.onTimer != null) { // L: 10698 + var22 = new ScriptEvent(); // L: 10699 + var22.widget = var9; // L: 10700 + var22.args = var9.onTimer; // L: 10701 + Client.field806.addFirst(var22); // L: 10702 + } + + ScriptEvent var25; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field2760) { // L: 10704 + if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field2760 <= 32) { // L: 10705 + label781: + for (var36 = var9.field2760; var36 < Client.changedVarpCount; ++var36) { // L: 10712 + var23 = Client.changedVarps[var36 & 31]; // L: 10713 + + for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10714 + if (var23 == var9.varTransmitTriggers[var35]) { // L: 10715 + var25 = new ScriptEvent(); // L: 10716 + var25.widget = var9; // L: 10717 + var25.args = var9.onVarTransmit; // L: 10718 + Client.scriptEvents.addFirst(var25); // L: 10719 + break label781; // L: 10720 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10706 + var22.widget = var9; // L: 10707 + var22.args = var9.onVarTransmit; // L: 10708 + Client.scriptEvents.addFirst(var22); // L: 10709 + } + + var9.field2760 = Client.changedVarpCount; // L: 10725 + } + + if (var9.onInvTransmit != null && Client.field791 > var9.field2748) { // L: 10727 + if (var9.invTransmitTriggers != null && Client.field791 - var9.field2748 <= 32) { // L: 10728 + label757: + for (var36 = var9.field2748; var36 < Client.field791; ++var36) { // L: 10735 + var23 = Client.changedItemContainers[var36 & 31]; // L: 10736 + + for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10737 + if (var23 == var9.invTransmitTriggers[var35]) { // L: 10738 + var25 = new ScriptEvent(); // L: 10739 + var25.widget = var9; // L: 10740 + var25.args = var9.onInvTransmit; // L: 10741 + Client.scriptEvents.addFirst(var25); // L: 10742 + break label757; // L: 10743 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10729 + var22.widget = var9; // L: 10730 + var22.args = var9.onInvTransmit; // L: 10731 + Client.scriptEvents.addFirst(var22); // L: 10732 + } + + var9.field2748 = Client.field791; // L: 10748 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2754) { // L: 10750 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2754 <= 32) { // L: 10751 + label733: + for (var36 = var9.field2754; var36 < Client.changedSkillsCount; ++var36) { // L: 10758 + var23 = Client.changedSkills[var36 & 31]; // L: 10759 + + for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10760 + if (var23 == var9.statTransmitTriggers[var35]) { // L: 10761 + var25 = new ScriptEvent(); // L: 10762 + var25.widget = var9; // L: 10763 + var25.args = var9.onStatTransmit; // L: 10764 + Client.scriptEvents.addFirst(var25); // L: 10765 + break label733; // L: 10766 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 10752 + var22.widget = var9; // L: 10753 + var22.args = var9.onStatTransmit; // L: 10754 + Client.scriptEvents.addFirst(var22); // L: 10755 + } + + var9.field2754 = Client.changedSkillsCount; // L: 10771 + } + + if (Client.chatCycle > var9.field2759 && var9.onChatTransmit != null) { // L: 10773 + var22 = new ScriptEvent(); // L: 10774 + var22.widget = var9; // L: 10775 + var22.args = var9.onChatTransmit; // L: 10776 + Client.scriptEvents.addFirst(var22); // L: 10777 + } + + if (Client.field797 > var9.field2759 && var9.onFriendTransmit != null) { // L: 10779 + var22 = new ScriptEvent(); // L: 10780 + var22.widget = var9; // L: 10781 + var22.args = var9.onFriendTransmit; // L: 10782 + Client.scriptEvents.addFirst(var22); // L: 10783 + } + + if (Client.field798 > var9.field2759 && var9.onClanTransmit != null) { // L: 10785 + var22 = new ScriptEvent(); // L: 10786 + var22.widget = var9; // L: 10787 + var22.args = var9.onClanTransmit; // L: 10788 + Client.scriptEvents.addFirst(var22); // L: 10789 + } + + if (Client.field786 > var9.field2759 && var9.field2736 != null) { // L: 10791 + var22 = new ScriptEvent(); // L: 10792 + var22.widget = var9; // L: 10793 + var22.args = var9.field2736; // L: 10794 + Client.scriptEvents.addFirst(var22); // L: 10795 + } + + if (Client.field800 > var9.field2759 && var9.field2655 != null) { // L: 10797 + var22 = new ScriptEvent(); // L: 10798 + var22.widget = var9; // L: 10799 + var22.args = var9.field2655; // L: 10800 + Client.scriptEvents.addFirst(var22); // L: 10801 + } + + if (Client.field801 > var9.field2759 && var9.onStockTransmit != null) { // L: 10803 + var22 = new ScriptEvent(); // L: 10804 + var22.widget = var9; // L: 10805 + var22.args = var9.onStockTransmit; // L: 10806 + Client.scriptEvents.addFirst(var22); // L: 10807 + } + + if (Client.field802 > var9.field2759 && var9.field2743 != null) { // L: 10809 + var22 = new ScriptEvent(); // L: 10810 + var22.widget = var9; // L: 10811 + var22.args = var9.field2743; // L: 10812 + Client.scriptEvents.addFirst(var22); // L: 10813 + } + + if (Client.field803 > var9.field2759 && var9.onMiscTransmit != null) { // L: 10815 + var22 = new ScriptEvent(); // L: 10816 + var22.widget = var9; // L: 10817 + var22.args = var9.onMiscTransmit; // L: 10818 + Client.scriptEvents.addFirst(var22); // L: 10819 + } + + var9.field2759 = Client.cycleCntr; // L: 10821 + if (var9.onKey != null) { // L: 10822 + for (var36 = 0; var36 < Client.field827; ++var36) { // L: 10823 + ScriptEvent var30 = new ScriptEvent(); // L: 10824 + var30.widget = var9; // L: 10825 + var30.keyTyped = Client.field792[var36]; // L: 10826 + var30.keyPressed = Client.field828[var36]; // L: 10827 + var30.args = var9.onKey; // L: 10828 + Client.scriptEvents.addFirst(var30); // L: 10829 + } + } + } + } + + if (!var9.isIf3) { // L: 10834 + if (Client.clickedWidget != null || ClientPacket.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10835 + 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: 10836 + if (var9.mouseOverRedirect >= 0) { // L: 10837 + Varps.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + Varps.mousedOverWidgetIf1 = var9; // L: 10838 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10840 + Player.field1192 = var9; // L: 10841 + } + + if (var9.scrollHeight > var9.height) { // L: 10843 + LoginType.method6344(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 10845 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10846 + if (var9.children != null) { // L: 10847 + 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: 10848 + if (var28 != null) { // L: 10849 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10850 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10851 + if (var29.isMouseInputEvent) { // L: 10852 + var29.remove(); // L: 10853 + var29.widget.containsMouse = false; // L: 10854 + } + } + + if (class34.widgetDragDuration == 0) { // L: 10857 + Client.clickedWidget = null; // L: 10858 + Client.clickedWidgetParent = null; // L: 10859 + } + + if (!Client.isMenuOpen) { // L: 10861 + VerticalAlignment.addCancelMenuEntry(); // L: 10862 + } + } + + class5.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10865 + } + } + } + } + } } - } // L: 3703 + + } // L: 10869 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index bedc2edb43..3ed7b66182 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -4,41 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") +@ObfuscatedName("jt") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("gw") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 646144783 - ) - static int field82; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -327146803 + intValue = 115126989 ) @Export("world") public final int world; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 986642853943479863L + longValue = -3992330306822610567L ) @Export("age") public final long age; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lg;" + descriptor = "Ljn;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("offerName") String offerName; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lkx;BI)V" + descriptor = "(Lnu;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 @@ -48,8 +43,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); // L: 115 int var5 = var1.readInt(); // L: 116 this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 - this.grandExchangeOffer.method166(2); // L: 118 - this.grandExchangeOffer.method168(var2); // L: 119 + this.grandExchangeOffer.method4631(2); // L: 118 + this.grandExchangeOffer.method4632(var2); // L: 119 this.grandExchangeOffer.unitPrice = var4; // L: 120 this.grandExchangeOffer.totalQuantity = var5; // L: 121 this.grandExchangeOffer.currentQuantity = 0; // L: 122 @@ -57,59 +52,85 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; // L: 124 } // L: 125 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "73" + garbageValue = "5" ) @Export("getOfferName") public String getOfferName() { return this.offerName; // L: 128 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "59" + garbageValue = "6" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; // L: 132 } - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "(Lcv;I)V", - garbageValue = "878562406" - ) - static final void method147(Actor var0) { - int var1 = Math.max(1, var0.field999 - Client.cycle); // L: 3639 - int var2 = var0.field1007 * 64 + var0.field992 * 128; // L: 3640 - int var3 = var0.field1007 * 64 + var0.field952 * 128; // L: 3641 - var0.x += (var2 - var0.x) / var1; // L: 3642 - var0.y += (var3 - var0.y) / var1; // L: 3643 - var0.field989 = 0; // L: 3644 - var0.orientation = var0.field1001; // L: 3645 - } // L: 3646 + @ObfuscatedName("f") + @Export("sleepExact") + public static final void sleepExact(long var0) { + if (var0 > 0L) { // L: 9 + if (var0 % 10L == 0L) { // L: 10 + long var2 = var0 - 1L; // L: 11 - @ObfuscatedName("jm") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1637672427" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (WorldMapCacheName.loadInterface(var0)) { // L: 11021 - Widget[] var1 = DefaultsGroup.Widget_interfaceComponents[var0]; // L: 11022 + try { + Thread.sleep(var2); // L: 14 + } catch (InterruptedException var8) { // L: 16 + } - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11023 - Widget var3 = var1[var2]; // L: 11024 - if (var3 != null) { // L: 11025 - var3.modelFrame = 0; // L: 11026 - var3.modelFrameCycle = 0; // L: 11027 + try { + Thread.sleep(1L); // L: 20 + } catch (InterruptedException var7) { // L: 22 + } + } else { + try { + Thread.sleep(var0); // L: 27 + } catch (InterruptedException var6) { // L: 29 } } } - } // L: 11029 + } // L: 31 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1321413959" + ) + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 49 + if (var0 < 0 || var0 >= 65536) { // L: 50 + var0 >>>= 16; // L: 51 + var1 += 16; // L: 52 + } + + if (var0 >= 256) { // L: 54 + var0 >>>= 8; // L: 55 + var1 += 8; // L: 56 + } + + if (var0 >= 16) { // L: 58 + var0 >>>= 4; // L: 59 + var1 += 4; // L: 60 + } + + if (var0 >= 4) { // L: 62 + var0 >>>= 2; // L: 63 + var1 += 2; // L: 64 + } + + if (var0 >= 1) { // L: 66 + var0 >>>= 1; // L: 67 + ++var1; // L: 68 + } + + return var0 + var1; // L: 70 + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 74f99182d8..28d637a8c2 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -7,22 +7,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("is") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("events") public final List events; @@ -35,7 +35,7 @@ public class GrandExchangeEvents { } // L: 67 @ObfuscatedSignature( - descriptor = "(Lkx;Z)V", + descriptor = "(Lnu;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -57,10 +57,10 @@ public class GrandExchangeEvents { } // L: 92 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZS)V", - garbageValue = "19437" + descriptor = "(Ljava/util/Comparator;ZI)V", + garbageValue = "1228337547" ) @Export("sort") public void sort(Comparator var1, boolean var2) { diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 1cf7d4a441..17bccd3a1a 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -1,58 +1,42 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; -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("g") +@ObfuscatedName("jn") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("op") - @ObfuscatedSignature( - descriptor = "Lcg;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("le") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - static Widget field100; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("state") byte state; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1764119781 + intValue = -891448629 ) @Export("id") public int id; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1987297797 + intValue = 100433651 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 795872735 + intValue = 1452615551 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 252650677 + intValue = -1995124161 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 710426357 + intValue = -1624140641 ) @Export("currentPrice") public int currentPrice; @@ -61,7 +45,7 @@ public class GrandExchangeOffer { } // L: 13 @ObfuscatedSignature( - descriptor = "(Lkx;Z)V", + descriptor = "(Lnu;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -73,190 +57,83 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); // L: 21 } // L: 22 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-15" + garbageValue = "-122" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-522457380" + descriptor = "(B)I", + garbageValue = "-20" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "575158813" + descriptor = "(IB)V", + garbageValue = "31" ) - void method166(int var1) { - this.state &= -8; + void method4631(int var1) { + this.state &= -8; // L: 58 this.state = (byte)(this.state | var1 & 7); - } // L: 60 + } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "656048251" + garbageValue = "-1176196261" ) - void method168(int var1) { + void method4632(int var1) { this.state &= -9; if (var1 == 1) { - this.state = (byte)(this.state | 8); // L: 64 + this.state = (byte)(this.state | 8); } - } + } // L: 65 - @ObfuscatedName("ay") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lfu;III)Ldh;", - garbageValue = "779350721" - ) - public static final PcmPlayer method167(TaskHandler var0, int var1, int var2) { - if (StructComposition.field3338 == 0) { // L: 45 - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { // L: 46 - if (var2 < 256) { // L: 47 - var2 = 256; - } - - try { - PcmPlayer var3 = class2.pcmPlayerProvider.player(); // L: 49 - var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 50 - var3.field1427 = 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.field1419 > 0 && PcmPlayer.soundSystem == null) { // L: 56 - PcmPlayer.soundSystem = new SoundSystem(); // L: 57 - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 58 - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 59 - } - - if (PcmPlayer.soundSystem != null) { // L: 61 - if (PcmPlayer.soundSystem.players[var1] != null) { // L: 62 - throw new IllegalArgumentException(); - } - - PcmPlayer.soundSystem.players[var1] = var3; // L: 63 - } - - return var3; // L: 65 - } catch (Throwable var4) { // L: 67 - return new PcmPlayer(); // L: 68 - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(B)I", + descriptor = "([Ljava/lang/String;[IIIB)V", garbageValue = "1" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; // L: 586 - if (WorldMapID.garbageCollector == null || !WorldMapID.garbageCollector.isValid()) { // L: 587 - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 589 + public static void method4633(String[] var0, int[] var1, int var2, int var3) { + if (var2 < var3) { // L: 39 + int var4 = (var3 + var2) / 2; // L: 40 + int var5 = var2; // L: 41 + String var6 = var0[var4]; // L: 42 + var0[var4] = var0[var3]; // L: 43 + var0[var3] = var6; // L: 44 + int var7 = var1[var4]; // L: 45 + var1[var4] = var1[var3]; // L: 46 + var1[var3] = var7; // L: 47 - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 590 - if (var2.isValid()) { // L: 592 - WorldMapID.garbageCollector = var2; // L: 593 - GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 594 - GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 595 - } - } - } catch (Throwable var11) { // L: 600 - } - } - - if (WorldMapID.garbageCollector != null) { // L: 602 - long var9 = Tiles.currentTimeMillis(); // L: 603 - long var3 = WorldMapID.garbageCollector.getCollectionTime(); // L: 604 - if (GameEngine.garbageCollectorLastCollectionTime != -1L) { // L: 605 - long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 606 - long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 607 - if (0L != var7) { // L: 608 - var0 = (int)(100L * var5 / var7); + for (int var8 = var2; var8 < var3; ++var8) { // L: 48 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 49 + String var9 = var0[var8]; // L: 50 + var0[var8] = var0[var5]; // L: 51 + var0[var5] = var9; // L: 52 + int var10 = var1[var8]; // L: 53 + var1[var8] = var1[var5]; // L: 54 + var1[var5++] = var10; // L: 55 } } - GameEngine.garbageCollectorLastCollectionTime = var3; // L: 610 - GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 611 + var0[var3] = var0[var5]; // L: 59 + var0[var5] = var6; // L: 60 + var1[var3] = var1[var5]; // L: 61 + var1[var5] = var7; // L: 62 + method4633(var0, var1, var2, var5 - 1); // L: 63 + method4633(var0, var1, var5 + 1, var3); // L: 64 } - return var0; // L: 613 - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-64" - ) - static final String method187(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10056 10057 - } - - @ObfuscatedName("ku") - @ObfuscatedSignature( - descriptor = "(Lbs;ZS)V", - garbageValue = "-4659" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; // L: 11249 - int var3 = (int)var0.key; // L: 11250 - var0.remove(); // L: 11251 - if (var1 && var2 != -1 && Widget.Widget_loadedInterfaces[var2]) { // L: 11252 11253 11254 - FontName.Widget_archive.clearFilesGroup(var2); // L: 11255 - if (DefaultsGroup.Widget_interfaceComponents[var2] != null) { // L: 11256 - boolean var4 = true; // L: 11257 - - for (int var5 = 0; var5 < DefaultsGroup.Widget_interfaceComponents[var2].length; ++var5) { // L: 11258 - if (DefaultsGroup.Widget_interfaceComponents[var2][var5] != null) { // L: 11259 - if (DefaultsGroup.Widget_interfaceComponents[var2][var5].type != 2) { // L: 11260 - DefaultsGroup.Widget_interfaceComponents[var2][var5] = null; - } else { - var4 = false; // L: 11261 - } - } - } - - if (var4) { // L: 11264 - DefaultsGroup.Widget_interfaceComponents[var2] = null; - } - - Widget.Widget_loadedInterfaces[var2] = false; // L: 11265 - } - } - - ModeWhere.method3871(var2); // L: 11267 - Widget var6 = class237.getWidget(var3); // L: 11268 - if (var6 != null) { // L: 11269 - IsaacCipher.invalidateWidget(var6); - } - - AbstractWorldMapData.method352(); // L: 11270 - if (Client.rootInterface != -1) { // L: 11271 - class228.runIntfCloseListeners(Client.rootInterface, 1); - } - - } // L: 11272 + } // L: 66 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index 1d4d4d2087..81e36e1a47 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,54 +1,90 @@ -import java.awt.FontMetrics; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("p") +@ObfuscatedName("iv") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("qr") - @ObfuscatedSignature( - descriptor = "Llm;" - ) - @Export("sceneMinimapSprite") - static SpritePixels sceneMinimapSprite; - @ObfuscatedName("l") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("ac") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("aa") + @Export("hasFocus") + protected static boolean hasFocus; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lx;Lx;I)I", - garbageValue = "1835867422" + descriptor = "(Ljt;Ljt;I)I", + garbageValue = "-1403961402" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 + return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); // L: 13 + } + + public boolean equals(Object var1) { + return super.equals(var1); } public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 21 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Ljv;", + garbageValue = "1132956175" + ) + public static VarcInt method4606(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23 + var1 = new VarcInt(); // L: 24 + if (var2 != null) { // L: 25 + var1.method4933(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } } - @ObfuscatedName("hu") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(III)Lgz;", - garbageValue = "-1799061438" + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "19" ) - static RouteStrategy method214(int var0, int var1) { - Client.field935.approxDestinationX = var0; // L: 7806 - Client.field935.approxDestinationY = var1; // L: 7807 - Client.field935.approxDestinationSizeX = 1; // L: 7808 - Client.field935.approxDestinationSizeY = 1; // L: 7809 - return Client.field935; // L: 7810 + public static String method4607(String var0) { + int var1 = var0.length(); // L: 180 + char[] var2 = new char[var1]; // L: 181 + byte var3 = 2; // L: 182 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 183 + char var5 = var0.charAt(var4); // L: 184 + if (var3 == 0) { // L: 185 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 186 + var5 = PendingSpawn.method2152(var5); + } + + if (Character.isLetter(var5)) { // L: 187 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 188 + if (Character.isSpaceChar(var5)) { // L: 189 + if (var3 != 2) { // L: 190 + var3 = 1; + } + } else { + var3 = 1; // L: 192 + } + } else { + var3 = 2; + } + + var2[var4] = var5; // L: 193 + } + + return new String(var2); // L: 195 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 6b80e31098..c17fcbc529 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,36 +1,27 @@ +import java.awt.FontMetrics; 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("t") +@ObfuscatedName("iw") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "[Ljy;" ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("gl") - @ObfuscatedGetter( - intValue = -1624406993 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("mt") - @ObfuscatedGetter( - intValue = -755072753 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; + @Export("WorldMapElement_cached") + static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("aq") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lx;Lx;I)I", - garbageValue = "1549101660" + descriptor = "(Ljt;Ljt;I)I", + garbageValue = "-2027428779" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -45,178 +36,89 @@ final class GrandExchangeOfferNameComparator implements Comparator { return super.equals(var1); // L: 64 } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llm;IIII)V", - garbageValue = "-1717498700" + descriptor = "(CLjh;I)C", + garbageValue = "-1148690699" ) - static void method211(SpritePixels var0, int var1, int var2, int var3) { - WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, AttackOption.method2203(var1, var2, var3), var0.pixels.length * 4); // L: 46 - } // L: 47 + @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'; + } - @ObfuscatedName("z") - @Export("Entity_unpackSceneX") - public static int Entity_unpackSceneX(long var0) { - return (int)(var0 >>> 7 & 127L); // L: 68 - } + if (var0 == 199) { // L: 71 + return 'C'; + } - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lig;II)Z", - garbageValue = "754600726" - ) - public static boolean method212(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); // L: 198 - if (var2 == null) { // L: 199 - return false; + 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 { - SpriteBuffer_decode(var2); // L: 200 - return true; // L: 201 + return var0 == 376 ? 'Y' : var0; // L: 90 } } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "2140539566" - ) - @Export("SpriteBuffer_decode") - public static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 205 - var1.offset = var0.length - 2; // L: 206 - class336.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 207 - class105.SpriteBuffer_xOffsets = new int[class336.SpriteBuffer_spriteCount]; // L: 208 - class336.SpriteBuffer_yOffsets = new int[class336.SpriteBuffer_spriteCount]; // L: 209 - class336.SpriteBuffer_spriteWidths = new int[class336.SpriteBuffer_spriteCount]; // L: 210 - class225.SpriteBuffer_spriteHeights = new int[class336.SpriteBuffer_spriteCount]; // L: 211 - class2.SpriteBuffer_pixels = new byte[class336.SpriteBuffer_spriteCount][]; // L: 212 - var1.offset = var0.length - 7 - class336.SpriteBuffer_spriteCount * 8; // L: 213 - class336.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 214 - class336.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 215 - int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 216 - - int var3; - for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 217 - class105.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 218 - class336.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 219 - class336.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 220 - class225.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class336.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 221 - HorizontalAlignment.SpriteBuffer_spritePalette = new int[var2]; // L: 222 - - for (var3 = 1; var3 < var2; ++var3) { // L: 223 - HorizontalAlignment.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 224 - if (HorizontalAlignment.SpriteBuffer_spritePalette[var3] == 0) { // L: 225 - HorizontalAlignment.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; // L: 227 - - for (var3 = 0; var3 < class336.SpriteBuffer_spriteCount; ++var3) { // L: 228 - int var4 = class336.SpriteBuffer_spriteWidths[var3]; // L: 229 - int var5 = class225.SpriteBuffer_spriteHeights[var3]; // L: 230 - int var6 = var4 * var5; // L: 231 - byte[] var7 = new byte[var6]; // L: 232 - class2.SpriteBuffer_pixels[var3] = var7; // L: 233 - int var8 = var1.readUnsignedByte(); // L: 234 - int var9; - if (var8 == 0) { // L: 235 - for (var9 = 0; var9 < var6; ++var9) { // L: 236 - var7[var9] = var1.readByte(); - } - } else if (var8 == 1) { // L: 238 - for (var9 = 0; var9 < var4; ++var9) { // L: 239 - for (int var10 = 0; var10 < var5; ++var10) { // L: 240 - var7[var9 + var4 * var10] = var1.readByte(); // L: 241 - } - } - } - } - - } // L: 246 - - @ObfuscatedName("io") - @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "1502126569" - ) - static final void method199(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; // L: 9859 - int var7 = var3 - var1; // L: 9860 - int var8 = var6 >= 0 ? var6 : -var6; // L: 9861 - int var9 = var7 >= 0 ? var7 : -var7; // L: 9862 - int var10 = var8; // L: 9863 - if (var8 < var9) { // L: 9864 - var10 = var9; - } - - if (var10 != 0) { // L: 9865 - int var11 = (var6 << 16) / var10; // L: 9866 - int var12 = (var7 << 16) / var10; // L: 9867 - if (var12 <= var11) { // L: 9868 - var11 = -var11; - } else { - var12 = -var12; // L: 9869 - } - - int var13 = var5 * var12 >> 17; // L: 9870 - int var14 = var5 * var12 + 1 >> 17; // L: 9871 - int var15 = var5 * var11 >> 17; // L: 9872 - int var16 = var5 * var11 + 1 >> 17; // L: 9873 - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9874 - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9875 - int var17 = var0 + var13; // L: 9876 - int var18 = var0 - var14; // L: 9877 - int var19 = var0 + var6 - var14; // L: 9878 - int var20 = var0 + var13 + var6; // L: 9879 - int var21 = var15 + var1; // L: 9880 - int var22 = var1 - var16; // L: 9881 - int var23 = var7 + var1 - var16; // L: 9882 - int var24 = var7 + var15 + var1; // L: 9883 - Rasterizer3D.method3237(var17, var18, var19); // L: 9884 - Rasterizer3D.method3179(var21, var22, var23, var17, var18, var19, var4); // L: 9885 - Rasterizer3D.method3237(var17, var19, var20); // L: 9886 - Rasterizer3D.method3179(var21, var23, var24, var17, var19, var20, var4); // L: 9887 - } - } // L: 9888 - - @ObfuscatedName("kn") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "408357083" - ) - static String method209(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; // L: 11515 - if (Client.gameBuild == 1) { // L: 11516 - var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { // L: 11517 - var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { // L: 11518 - var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { // L: 11519 - var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { // L: 11520 - var0 = "local"; - } - - String var3 = ""; // L: 11521 - if (AccessFile.field4100 != null) { // L: 11522 - var3 = "/p=" + AccessFile.field4100; - } - - String var4 = "runescape.com"; // L: 11523 - return var2 + var0 + "." + var4 + "/l=" + NPCComposition.clientLanguage + "/a=" + ItemLayer.field1562 + var3 + "/"; // L: 11524 - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index b01f4969e1..f72720993a 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,177 +1,140 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bu") +@ObfuscatedName("bz") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("ny") - @ObfuscatedGetter( - intValue = -1660740811 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lir;" ) - static int field656; - @ObfuscatedName("n") + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("d") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("f") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } // L: 11707 + } // L: 11779 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lx;Lx;I)I", - garbageValue = "2015971420" + descriptor = "(Ljt;Ljt;I)I", + garbageValue = "-1018432181" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { // L: 11710 + if (var2.world == var1.world) { // L: 11782 return 0; } else { - if (this.filterWorlds) { // L: 11711 - if (Client.worldId == var1.world) { // L: 11712 + if (this.filterWorlds) { // L: 11783 + if (Client.worldId == var1.world) { // L: 11784 return -1; } - if (var2.world == Client.worldId) { // L: 11713 + if (var2.world == Client.worldId) { // L: 11785 return 1; } } - return var1.world < var2.world ? -1 : 1; // L: 11715 + return var1.world < var2.world ? -1 : 1; // L: 11787 } } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11719 - } - public boolean equals(Object var1) { - return super.equals(var1); // L: 11723 + return super.equals(var1); // L: 11795 } - @ObfuscatedName("n") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11791 + } + + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "1" + descriptor = "(ILcc;ZB)I", + garbageValue = "20" ) - static int method1375(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 - if (var2 == null) { // L: 15 - return -1; + static int method1217(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3375 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = WorldMapScaleHandler.getWindowedMode(); // L: 3376 + return 1; // L: 3377 } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 - } - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2139827308" - ) - public static boolean method1366() { - ReflectionCheck var0 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 28 - return var0 != null; // L: 29 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILig;IIIZI)V", - garbageValue = "1340227558" - ) - public static void method1376(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class206.musicPlayerStatus = 1; // L: 50 - class206.musicTrackArchive = var1; // L: 51 - class206.musicTrackGroupId = var2; // L: 52 - SoundSystem.musicTrackFileId = var3; // L: 53 - DevicePcmPlayerProvider.musicTrackVolume = var4; - class206.musicTrackBoolean = var5; // L: 55 - class7.pcmSampleLength = var0; // L: 56 - } // L: 57 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "147453853" - ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { // L: 110 - int var3 = var0; // L: 112 - String var2; - if (var1 && var0 >= 0) { // L: 115 - int var4 = 2; // L: 119 - - for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 120 121 123 - var5 /= 10; // L: 122 + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3379 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3380 + if (var3 == 1 || var3 == 2) { // L: 3381 + Tile.setWindowedMode(var3); } - char[] var6 = new char[var4]; // L: 125 - var6[0] = '+'; // L: 126 - - for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 127 - int var8 = var3; // L: 128 - var3 /= 10; // L: 129 - int var9 = var8 - var3 * 10; // L: 130 - if (var9 >= 10) { // L: 131 - var6[var7] = (char)(var9 + 87); - } else { - var6[var7] = (char)(var9 + 48); // L: 132 - } + return 1; // L: 3382 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3384 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Login.clientPreferences.windowMode; // L: 3385 + return 1; // L: 3386 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3388 + if (var0 == 5310) { // L: 3396 + --class16.Interpreter_intStackSize; // L: 3397 + return 1; // L: 3398 + } else if (var0 == 5350) { // L: 3400 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3401 + --class16.Interpreter_intStackSize; // L: 3402 + return 1; // L: 3403 + } else if (var0 == 5351) { // L: 3405 + --Interpreter.Interpreter_stringStackSize; // L: 3406 + return 1; // L: 3407 + } else { + return 2; // L: 3409 } - - var2 = new String(var6); // L: 134 } else { - var2 = Integer.toString(var0, 10); // L: 116 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3389 + if (var3 == 1 || var3 == 2) { // L: 3390 + Login.clientPreferences.windowMode = var3; // L: 3391 + Message.savePreferences(); // L: 3392 + } + + return 1; // L: 3394 } - - return var2; // L: 136 - } else { - return Integer.toString(var0); } } - @ObfuscatedName("l") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1311209187" + descriptor = "(ILcc;ZB)I", + garbageValue = "73" ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; // L: 784 - Login.Login_response2 = "Enter your username/email & password."; // L: 785 - Login.Login_response3 = ""; // L: 786 - Login.loginIndex = 2; // L: 787 - if (var0) { // L: 788 - Login.Login_password = ""; - } - - class248.method4514(); // L: 789 - class8.method88(); // L: 790 - } // L: 791 - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "([BII)I", - garbageValue = "-1467177624" - ) - public static int method1380(byte[] var0, int var1) { - return Player.method1317(var0, 0, var1); // L: 54 - } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1869683138" - ) - static void method1378(Buffer var0) { - if (Client.randomDatData != null) { // L: 11603 - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 11604 + static int method1216(int var0, Script var1, boolean var2) { + if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4108 + if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4113 + if (var0 == 6750) { // L: 4117 + ++Interpreter.Interpreter_stringStackSize; // L: 4118 + return 1; // L: 4119 + } else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4121 + if (var0 == 6754) { // L: 4125 + int var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4126 + NPCComposition var4 = GraphicsObject.getNpcDefinition(var3); // L: 4127 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4128 + return 1; // L: 4129 + } else { + return 2; // L: 4131 + } + } else { + ++class16.Interpreter_intStackSize; // L: 4122 + return 1; // L: 4123 + } + } else { + --class16.Interpreter_intStackSize; // L: 4114 + return 1; // L: 4115 + } } else { - byte[] var1 = Projectile.method2260(); // L: 11607 - var0.writeBytes(var1, 0, var1.length); // L: 11608 + class16.Interpreter_intStackSize -= 2; // L: 4109 + --Interpreter.Interpreter_stringStackSize; // L: 4110 + return 1; // L: 4111 } - } // L: 11605 11609 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index c69a229279..f1d93fe15b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,115 +1,27 @@ 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("f") +@ObfuscatedName("ix") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -308294739 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("lu") - @ObfuscatedGetter( - intValue = -1017040151 - ) - @Export("menuHeight") - static int menuHeight; - - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lx;Lx;B)I", - garbageValue = "2" + descriptor = "(Ljt;Ljt;I)I", + garbageValue = "-838249653" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69 } - public boolean equals(Object var1) { - return super.equals(var1); // L: 77 - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 } - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIIB)Lcl;", - garbageValue = "-37" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = (var1 << 8) + var0; // L: 39 - Script var5 = class4.method46(var3, var0); // L: 42 - if (var5 != null) { // L: 43 - return var5; // L: 44 - } else { - int var6 = (var2 + 40000 << 8) + var0; // L: 48 - var5 = class4.method46(var6, var0); // L: 51 - return var5 != null ? var5 : null; // L: 52 55 - } + public boolean equals(Object var1) { + return super.equals(var1); // L: 77 } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "1998828049" - ) - static final void method163(String var0, int var1) { - PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 208 - var2.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 209 - var2.packetBuffer.writeByte(var1); // L: 210 - var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 211 - Client.packetWriter.addNode(var2); // L: 212 - } // L: 213 - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1940935635" - ) - static void method162(int var0, int var1) { - int var2 = ScriptEvent.fontBold12.stringWidth("Choose Option"); // L: 7985 - - int var3; - int var4; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7986 - var4 = ScriptEvent.fontBold12.stringWidth(WorldMapLabel.method504(var3)); // L: 7987 - if (var4 > var2) { // L: 7988 - var2 = var4; - } - } - - var2 += 8; // L: 7990 - var3 = Client.menuOptionsCount * 15 + 22; // L: 7991 - var4 = var0 - var2 / 2; // L: 7992 - if (var4 + var2 > canvasWidth) { // L: 7993 - var4 = canvasWidth - var2; - } - - if (var4 < 0) { // L: 7994 - var4 = 0; - } - - int var5 = var1; // L: 7995 - if (var3 + var1 > class25.canvasHeight) { // L: 7996 - var5 = class25.canvasHeight - var3; - } - - if (var5 < 0) { // L: 7997 - var5 = 0; - } - - ApproximateRouteStrategy.menuX = var4; // L: 7998 - AbstractUserComparator.menuY = var5; // L: 7999 - CollisionMap.menuWidth = var2; // L: 8000 - menuHeight = Client.menuOptionsCount * 15 + 22; // L: 8001 - } // L: 8002 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 468961b0b7..3fa03b3502 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,136 +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("u") +@ObfuscatedName("ja") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = 1229054001 - ) - static int field102; - @ObfuscatedName("sh") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmn;" - ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("go") - @ObfuscatedGetter( - intValue = -927718985 - ) - static int field103; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lx;Lx;B)I", - garbageValue = "57" + descriptor = "(Ljt;Ljt;S)I", + garbageValue = "22001" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 - } - - public boolean equals(Object var1) { - return super.equals(var1); // L: 51 + return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); } public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 } - @ObfuscatedName("if") + public boolean equals(Object var1) { + return super.equals(var1); // L: 51 + } + + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lbk;IIII)V", - garbageValue = "1420045659" + descriptor = "(III)I", + garbageValue = "1601744693" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (UserComparator9.localPlayer != var0) { // L: 9293 - if (Client.menuOptionsCount < 400) { // L: 9294 - String var4; - int var7; - if (var0.skillLevel == 0) { // L: 9296 - String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9297 - var7 = var0.combatLevel; // L: 9299 - int var8 = UserComparator9.localPlayer.combatLevel; // L: 9300 - int var9 = var8 - var7; // L: 9302 - String var6; - if (var9 < -9) { // L: 9303 - var6 = FileSystem.colorStartTag(16711680); // L: 9304 - } else if (var9 < -6) { // L: 9307 - var6 = FileSystem.colorStartTag(16723968); // L: 9308 - } else if (var9 < -3) { // L: 9311 - var6 = FileSystem.colorStartTag(16740352); // L: 9312 - } else if (var9 < 0) { // L: 9315 - var6 = FileSystem.colorStartTag(16756736); // L: 9316 - } else if (var9 > 9) { // L: 9319 - var6 = FileSystem.colorStartTag(65280); // L: 9320 - } else if (var9 > 6) { // L: 9323 - var6 = FileSystem.colorStartTag(4259584); // L: 9324 - } else if (var9 > 3) { // L: 9327 - var6 = FileSystem.colorStartTag(8453888); // L: 9328 - } else if (var9 > 0) { // L: 9331 - var6 = FileSystem.colorStartTag(12648192); // L: 9332 - } else { - var6 = FileSystem.colorStartTag(16776960); // L: 9335 - } - - var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9337 - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9339 - } - - int var10; - if (Client.isItemSelected == 1) { // L: 9340 - WorldMapManager.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FileSystem.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9341 - } else if (Client.isSpellSelected) { // L: 9344 - if ((GrandExchangeOfferNameComparator.selectedSpellFlags & 8) == 8) { // L: 9345 - WorldMapManager.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FileSystem.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9346 - } - } else { - for (var10 = 7; var10 >= 0; --var10) { // L: 9351 - if (Client.playerMenuActions[var10] != null) { // L: 9352 - short var11 = 0; // L: 9353 - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9354 - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 9355 - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > UserComparator9.localPlayer.combatLevel) { // L: 9356 - var11 = 2000; // L: 9357 - } - - if (UserComparator9.localPlayer.team != 0 && var0.team != 0) { // L: 9359 - if (var0.team == UserComparator9.localPlayer.team) { // L: 9360 - var11 = 2000; - } else { - var11 = 0; // L: 9361 - } - } - } else if (Client.playerOptionsPriorities[var10]) { // L: 9364 - var11 = 2000; - } - - boolean var12 = false; // L: 9365 - var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9366 - WorldMapManager.insertMenuItemNoShift(Client.playerMenuActions[var10], FileSystem.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9367 - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9372 - if (Client.menuOpcodes[var10] == 23) { // L: 9373 - Client.menuTargets[var10] = FileSystem.colorStartTag(16777215) + var4; // L: 9374 - break; - } - } - - } + public static int method4652(int var0, int var1) { + int var2; + if (var1 > var0) { // L: 35 + var2 = var0; // L: 36 + var0 = var1; // L: 37 + var1 = var2; // L: 38 } - } // L: 9378 + + while (var1 != 0) { // L: 40 + var2 = var0 % var1; // L: 41 + var0 = var1; // L: 42 + var1 = var2; // L: 43 + } + + return var0; // L: 45 + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 4004372616..4347c931d2 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,24 +1,20 @@ +import java.awt.Image; 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("k") +@ObfuscatedName("ib") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "[Llm;" - ) - @Export("mapMarkerSprites") - static SpritePixels[] mapMarkerSprites; + @ObfuscatedName("ap") + static Image field3318; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lx;Lx;I)I", - garbageValue = "1040047906" + descriptor = "(Ljt;Ljt;B)I", + garbageValue = "30" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -33,398 +29,26 @@ final class GrandExchangeOfferWorldComparator implements Comparator { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32 } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lby;IB)V", - garbageValue = "-24" + descriptor = "(IIII)I", + garbageValue = "-1074102228" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (AbstractArchive.isWorldMapEvent(var0.type)) { // L: 105 - Interpreter.worldMapEvent = (WorldMapEvent)var2[0]; // L: 106 - WorldMapElement var4 = InvDefinition.WorldMapElement_get(Interpreter.worldMapEvent.mapElement); // L: 107 - var3 = GrandExchangeOfferTotalQuantityComparator.getWorldMapScript(var0.type, var4.objectId, var4.category); // L: 108 - } else { - var17 = (Integer)var2[0]; // L: 111 - var3 = Varcs.getScript(var17); // L: 112 - } - - if (var3 != null) { // L: 114 - Interpreter.Interpreter_intStackSize = 0; // L: 117 - Interpreter.Interpreter_stringStackSize = 0; // L: 118 - var17 = -1; // L: 119 - int[] var5 = var3.opcodes; // L: 120 - int[] var6 = var3.intOperands; // L: 121 - byte var7 = -1; // L: 122 - Interpreter.Interpreter_frameDepth = 0; // L: 123 - Interpreter.field1120 = false; // L: 124 - - try { - int var10; - try { - Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; // L: 126 - int var8 = 0; // L: 127 - class349.Interpreter_stringLocals = new String[var3.localStringCount]; // L: 128 - int var9 = 0; // L: 129 - - int var11; - String var18; - for (var10 = 1; var10 < var2.length; ++var10) { // L: 130 - if (var2[var10] instanceof Integer) { // L: 131 - var11 = (Integer)var2[var10]; // L: 132 - if (var11 == -2147483647) { // L: 133 - var11 = var0.mouseX; - } - - if (var11 == -2147483646) { // L: 134 - var11 = var0.mouseY; - } - - if (var11 == -2147483645) { // L: 135 - var11 = var0.widget != null ? var0.widget.id * 584503877 * -1745850227 : -1; - } - - if (var11 == -2147483644) { // L: 136 - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { // L: 137 - var11 = var0.widget != null ? var0.widget.childIndex * -1240613063 * -572555511 : -1; - } - - if (var11 == -2147483642) { // L: 138 - var11 = var0.dragTarget != null ? var0.dragTarget.id * 584503877 * -1745850227 : -1; - } - - if (var11 == -2147483641) { // L: 139 - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1240613063 * -572555511 : -1; - } - - if (var11 == -2147483640) { // L: 140 - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { // L: 141 - var11 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var8++] = var11; // L: 142 - } else if (var2[var10] instanceof String) { // L: 144 - var18 = (String)var2[var10]; // L: 145 - if (var18.equals("event_opbase")) { // L: 146 - var18 = var0.targetName; - } - - class349.Interpreter_stringLocals[var9++] = var18; // L: 147 - } - } - - var10 = 0; // L: 151 - Interpreter.field1123 = var0.field593; // L: 152 - - while (true) { - ++var10; // L: 154 - if (var10 > var1) { // L: 155 - throw new RuntimeException(); - } - - ++var17; // L: 156 - int var29 = var5[var17]; - int var20; - if (var29 >= 100) { // L: 157 - boolean var32; - if (var3.intOperands[var17] == 1) { // L: 355 - var32 = true; - } else { - var32 = false; // L: 356 - } - - var20 = class304.method5507(var29, var3, var32); // L: 357 - switch(var20) { // L: 358 - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); // L: 361 - } - } else if (var29 == 0) { // L: 158 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6[var17]; // L: 159 - } else if (var29 == ScriptOpcodes.GET_VARP) { // L: 162 - var11 = var6[var17]; // L: 163 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; // L: 164 - } else if (var29 == ScriptOpcodes.SET_VARP) { // L: 167 - var11 = var6[var17]; // L: 168 - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 169 - AbstractWorldMapIcon.changeGameOptions(var11); // L: 170 - } else if (var29 == ScriptOpcodes.SCONST) { // L: 173 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; // L: 174 - } else if (var29 == ScriptOpcodes.JUMP) { // L: 177 - var17 += var6[var17]; // L: 178 - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { // L: 181 - Interpreter.Interpreter_intStackSize -= 2; // L: 182 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 183 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { // L: 186 - Interpreter.Interpreter_intStackSize -= 2; // L: 187 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 188 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { // L: 191 - Interpreter.Interpreter_intStackSize -= 2; // L: 192 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 193 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { // L: 196 - Interpreter.Interpreter_intStackSize -= 2; // L: 197 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 198 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.RETURN) { // L: 201 - if (Interpreter.Interpreter_frameDepth == 0) { // L: 202 - return; - } - - ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 203 - var3 = var34.script; // L: 204 - var5 = var3.opcodes; // L: 205 - var6 = var3.intOperands; // L: 206 - var17 = var34.pc; // L: 207 - Interpreter.Interpreter_intLocals = var34.intLocals; // L: 208 - class349.Interpreter_stringLocals = var34.stringLocals; // L: 209 - } else if (var29 == ScriptOpcodes.GET_VARBIT) { // L: 212 - var11 = var6[var17]; // L: 213 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FontName.getVarbit(var11); // L: 214 - } else if (var29 == ScriptOpcodes.SET_VARBIT) { // L: 217 - var11 = var6[var17]; // L: 218 - WorldMapIcon_1.method377(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 219 - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { // L: 222 - Interpreter.Interpreter_intStackSize -= 2; // L: 223 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 224 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { // L: 227 - Interpreter.Interpreter_intStackSize -= 2; // L: 228 - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 229 - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { // L: 232 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; // L: 233 - } else if (var29 == ScriptOpcodes.ISTORE) { // L: 236 - Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 237 - } else if (var29 == ScriptOpcodes.SLOAD) { // L: 240 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class349.Interpreter_stringLocals[var6[var17]]; // L: 241 - } else if (var29 == ScriptOpcodes.SSTORE) { // L: 244 - class349.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 245 - } else if (var29 == ScriptOpcodes.JOIN_STRING) { // L: 248 - var11 = var6[var17]; // L: 249 - Interpreter.Interpreter_stringStackSize -= var11; // L: 250 - String var31 = WorldMapSection0.method311(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); // L: 251 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31; // L: 252 - } else if (var29 == ScriptOpcodes.POP_INT) { // L: 255 - --Interpreter.Interpreter_intStackSize; // L: 256 - } else if (var29 == ScriptOpcodes.POP_STRING) { // L: 259 - --Interpreter.Interpreter_stringStackSize; // L: 260 - } else { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { // L: 263 - if (var29 == ScriptOpcodes.GET_VARC_INT) { // L: 286 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.varcs.getInt(var6[var17]); // L: 287 - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { // L: 290 - GrandExchangeOffer.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 291 - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { // L: 294 - var11 = var6[var17] >> 16; // L: 295 - var20 = var6[var17] & 65535; // L: 296 - int var21 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 297 - if (var21 < 0 || var21 > 5000) { // L: 298 - throw new RuntimeException(); // L: 299 - } - - Interpreter.Interpreter_arrayLengths[var11] = var21; // L: 301 - byte var22 = -1; // L: 302 - if (var20 == 105) { // L: 303 - var22 = 0; - } - - for (var15 = 0; var15 < var21; ++var15) { // L: 304 - Interpreter.Interpreter_arrays[var11][var15] = var22; - } - } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { // L: 307 - var11 = var6[var17]; // L: 308 - var20 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 309 - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 310 - throw new RuntimeException(); // L: 311 - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; // L: 313 - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { // L: 316 - var11 = var6[var17]; // L: 317 - Interpreter.Interpreter_intStackSize -= 2; // L: 318 - var20 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 319 - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 320 - throw new RuntimeException(); // L: 321 - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 323 - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 326 - var18 = GrandExchangeOffer.varcs.getStringOld(var6[var17]); // L: 327 - if (var18 == null) { // L: 328 - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; // L: 329 - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 332 - GrandExchangeOffer.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 333 - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { // L: 336 - var18 = GrandExchangeOffer.varcs.getString(var6[var17]); // L: 337 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; // L: 338 - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { // L: 341 - GrandExchangeOffer.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 342 - } else { - if (var29 != ScriptOpcodes.SWITCH) { // L: 345 - throw new IllegalStateException(); // L: 351 - } - - IterableNodeHashTable var33 = var3.switches[var6[var17]]; // L: 346 - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 347 - if (var30 != null) { // L: 348 - var17 += var30.integer; - } - } - } else { - var11 = var6[var17]; // L: 264 - Script var12 = Varcs.getScript(var11); // L: 265 - int[] var13 = new int[var12.localIntCount]; // L: 266 - String[] var14 = new String[var12.localStringCount]; // L: 267 - - for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { // L: 268 - var13[var15] = Interpreter.Interpreter_intStack[var15 + (Interpreter.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { // L: 269 - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - Interpreter.Interpreter_intStackSize -= var12.intArgumentCount; // L: 270 - Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount; // L: 271 - ScriptFrame var19 = new ScriptFrame(); // L: 272 - var19.script = var3; // L: 273 - var19.pc = var17; // L: 274 - var19.intLocals = Interpreter.Interpreter_intLocals; // L: 275 - var19.stringLocals = class349.Interpreter_stringLocals; // L: 276 - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; // L: 277 - var3 = var12; // L: 278 - var5 = var12.opcodes; // L: 279 - var6 = var12.intOperands; // L: 280 - var17 = -1; // L: 281 - Interpreter.Interpreter_intLocals = var13; // L: 282 - class349.Interpreter_stringLocals = var14; // L: 283 - } - } - } - } catch (Exception var27) { // L: 371 - StringBuilder var24 = new StringBuilder(30); // L: 373 - var24.append("").append(var3.key).append(" "); // L: 374 - - for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { // L: 375 - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); - } - - var24.append("").append(var7); // L: 376 - SequenceDefinition.RunException_sendStackTrace(var24.toString(), var27); // L: 377 - } - } finally { - if (Interpreter.field1120) { // L: 381 - Interpreter.field1122 = true; // L: 382 - ModeWhere.method3878(); // L: 383 - Interpreter.field1122 = false; // L: 384 - Interpreter.field1120 = false; // L: 385 - } - - } - } - } // L: 115 388 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "1834161075" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 - } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { // L: 88 - for (int var1 = 0; var1 < TriBool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 - if (var0.length == TriBool.ByteArrayPool_alternativeSizes[var1] && class225.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { // L: 90 - ByteArrayPool.ByteArrayPool_arrays[var1][class225.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 - return; // L: 92 - } - } - } - - } - } // L: 78 82 86 - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-508854974" - ) - public static final void method137(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; // L: 94 - ViewportMouse.ViewportMouse_y = var1; // L: 95 - ViewportMouse.ViewportMouse_isInViewport = true; // L: 96 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 97 - ViewportMouse.ViewportMouse_false0 = false; // L: 98 - } // L: 99 - - @ObfuscatedName("w") - static final void method129(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 102 - } // L: 103 - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "(Lhz;I)Z", - garbageValue = "441552279" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { // L: 10061 - return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10062 - int var2 = HealthBar.method2168(var0, var1); // L: 10063 - int var3 = var0.cs1ComparisonValues[var1]; // L: 10064 - if (var0.cs1Comparisons[var1] == 2) { // L: 10065 - if (var2 >= var3) { // L: 10066 - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { // L: 10068 - if (var2 <= var3) { // L: 10069 - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { // L: 10071 - if (var2 == var3) { // L: 10072 - return false; - } - } else if (var3 != var2) { // L: 10074 - return false; - } - } - - return true; // L: 10076 - } + static final int method4609(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 948 + int var4 = var0 & var2 - 1; // L: 949 + int var5 = var1 / var2; // L: 950 + int var6 = var1 & var2 - 1; // L: 951 + int var7 = class5.method83(var3, var5); // L: 952 + int var8 = class5.method83(var3 + 1, var5); // L: 953 + int var9 = class5.method83(var3, var5 + 1); // L: 954 + int var10 = class5.method83(var3 + 1, var5 + 1); // L: 955 + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 958 + int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 959 + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 964 + int var13 = ((65536 - var14) * var9 >> 16) + (var10 * var14 >> 16); // L: 965 + int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 970 + int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); // L: 971 + return var15; // L: 973 } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 370d709db3..c34b891ebf 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("lc") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1297483725 + intValue = -1232421885 ) @Export("compass") public int compass; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1189696731 + intValue = -702943977 ) - public int field3847; - @ObfuscatedName("d") + public int field3898; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -189041471 + intValue = -741104371 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 326124555 + intValue = 479220981 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1371228557 + intValue = 1038498691 ) - public int field3838; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1164105375 - ) - public int field3843; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -981893847 - ) - public int field3839; + public int field3901; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1322267677 + intValue = 427046307 ) - public int field3845; - @ObfuscatedName("q") + public int field3897; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 357472757 + intValue = 1679740513 ) - public int field3846; + public int field3903; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1405787829 + ) + public int field3907; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 234020939 + ) + public int field3902; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -646484081 + ) + public int field3906; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1091910485 + intValue = 387339011 ) - public int field3840; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -20558633 - ) - public int field3848; + public int field3899; public GraphicsDefaults() { this.compass = -1; // L: 7 - this.field3847 = -1; // L: 8 + this.field3898 = -1; // L: 8 this.mapScenes = -1; // L: 9 this.headIconsPk = -1; // L: 10 - this.field3838 = -1; // L: 11 - this.field3843 = -1; // L: 12 - this.field3839 = -1; // L: 13 - this.field3845 = -1; // L: 14 - this.field3846 = -1; // L: 15 - this.field3840 = -1; // L: 16 - this.field3848 = -1; // L: 17 + this.field3901 = -1; // L: 11 + this.field3897 = -1; // L: 12 + this.field3903 = -1; // L: 13 + this.field3907 = -1; // L: 14 + this.field3902 = -1; // L: 15 + this.field3906 = -1; // L: 16 + this.field3899 = -1; // L: 17 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;I)V", - garbageValue = "-1311104999" + descriptor = "(Lir;S)V", + garbageValue = "-3450" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3837.group); // L: 20 + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3896.group); // L: 20 Buffer var3 = new Buffer(var2); // L: 21 while (true) { @@ -98,20 +98,20 @@ public class GraphicsDefaults { switch(var4) { // L: 25 case 1: - var3.readMedium(); // L: 46 + var3.readMedium(); // L: 28 break; case 2: - this.compass = var3.method5833(); // L: 31 - this.field3847 = var3.method5833(); // L: 32 - this.mapScenes = var3.method5833(); // L: 33 - this.headIconsPk = var3.method5833(); // L: 34 - this.field3838 = var3.method5833(); // L: 35 - this.field3843 = var3.method5833(); // L: 36 - this.field3839 = var3.method5833(); // L: 37 - this.field3845 = var3.method5833(); // L: 38 - this.field3846 = var3.method5833(); // L: 39 - this.field3840 = var3.method5833(); // L: 40 - this.field3848 = var3.method5833(); // L: 41 + this.compass = var3.method6597(); // L: 33 + this.field3898 = var3.method6597(); // L: 34 + this.mapScenes = var3.method6597(); // L: 35 + this.headIconsPk = var3.method6597(); // L: 36 + this.field3901 = var3.method6597(); // L: 37 + this.field3897 = var3.method6597(); // L: 38 + this.field3903 = var3.method6597(); // L: 39 + this.field3907 = var3.method6597(); // L: 40 + this.field3902 = var3.method6597(); // L: 41 + this.field3906 = var3.method6597(); // L: 42 + this.field3899 = var3.method6597(); // L: 43 } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 5b035b4485..7d3bead348 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,75 +1,73 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cf") @Implements("GraphicsObject") public final class GraphicsObject extends Renderable { - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 910565899 + intValue = -1860444775 ) @Export("loginBoxCenter") static int loginBoxCenter; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1864450081 + intValue = -1442514319 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 505711675 + intValue = -255937363 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1431922107 + intValue = -1558185979 ) @Export("plane") int plane; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1205773017 + intValue = -799404683 ) @Export("x") int x; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Ljs;" - ) - @Export("sequenceDefinition") - SequenceDefinition sequenceDefinition; - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2064393717 + intValue = -1197647983 ) @Export("y") int y; - @ObfuscatedName("z") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1686573995 + intValue = 921468661 ) @Export("height") int height; - @ObfuscatedName("e") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lkw;" + ) + @Export("sequenceDefinition") + SequenceDefinition sequenceDefinition; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1959033933 + intValue = 1763592485 ) @Export("frame") int frame; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 230901949 + intValue = 1659206025 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("isFinished") boolean isFinished; @@ -78,51 +76,51 @@ public final class GraphicsObject extends Renderable { this.frameCycle = 0; // L: 17 this.isFinished = false; // L: 18 this.id = var1; // L: 21 - this.plane = var2; - this.x = var3; - this.y = var4; - this.height = var5; - this.cycleStart = var7 + var6; - int var8 = AbstractUserComparator.SpotAnimationDefinition_get(this.id).sequence; // L: 27 - if (var8 != -1) { - this.isFinished = false; - this.sequenceDefinition = InterfaceParent.SequenceDefinition_get(var8); + 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 = Varps.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + if (var8 != -1) { // L: 28 + this.isFinished = false; // L: 29 + this.sequenceDefinition = class225.SequenceDefinition_get(var8); // L: 30 } else { - this.isFinished = true; + this.isFinished = true; // L: 32 } - } + } // L: 33 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-83388372" + garbageValue = "1392688450" ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { - this.frameCycle += var1; + if (!this.isFinished) { // L: 36 + this.frameCycle += var1; // L: 37 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) { - this.isFinished = true; + if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 41 + this.isFinished = true; // L: 42 break; } } } - } + } // L: 46 - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" + descriptor = "(I)Lgv;", + garbageValue = "1835906978" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = AbstractUserComparator.SpotAnimationDefinition_get(this.id); // L: 49 + SpotAnimationDefinition var1 = Varps.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; if (!this.isFinished) { // L: 51 var2 = var1.getModel(this.frame); @@ -133,72 +131,49 @@ public final class GraphicsObject extends Renderable { return var2 == null ? null : var2; // L: 53 } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-531258942" + descriptor = "(II)Lkc;", + garbageValue = "-2021558872" ) - public static boolean method2153(int var0) { - return var0 >= WorldMapDecorationType.field2765.id && var0 <= WorldMapDecorationType.field2750.id || var0 == WorldMapDecorationType.field2760.id; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "0" - ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { // L: 22 - throw new RuntimeException(""); + @Export("getNpcDefinition") + public static NPCComposition getNpcDefinition(int var0) { + NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 + if (var1 != null) { // L: 63 + return var1; } else { - 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 - } + byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 + var1 = new NPCComposition(); // L: 65 + var1.id = var0; // L: 66 + if (var2 != null) { // L: 67 + var1.decode(new Buffer(var2)); } + + var1.postDecode(); // L: 68 + NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 + return var1; // L: 70 } } - @ObfuscatedName("ai") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "(ILhd;ZI)V", - garbageValue = "956374800" + descriptor = "(III)V", + garbageValue = "-733559314" ) - static void method2154(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = WorldMapSection0.getWorldMap().getMapArea(var0); // L: 3935 - int var4 = UserComparator9.localPlayer.plane; // L: 3936 - int var5 = (UserComparator9.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; // L: 3937 - int var6 = (UserComparator9.localPlayer.y >> 7) + NetCache.baseY; // L: 3938 - Coord var7 = new Coord(var4, var5, var6); // L: 3939 - WorldMapSection0.getWorldMap().method6536(var3, var7, var1, var2); // L: 3940 - } // L: 3941 + static final void method1913(int var0, int var1) { + class3 var2 = var0 >= 0 ? Client.field820[var0] : IsaacCipher.field4266; // L: 11538 + if (var2 != null && var1 >= 0 && var1 < var2.method46()) { // L: 11539 + class9 var3 = (class9)var2.field27.get(var1); // L: 11540 + if (var3.field66 == -1) { + String var4 = var3.field65; // L: 11542 + PacketWriter var5 = Client.packetWriter; // L: 11543 + PacketBufferNode var6 = ObjectComposition.getPacketBufferNode(ClientPacket.field2316, var5.isaacCipher); // L: 11544 + var6.packetBuffer.writeByte(3 + Friend.stringCp1252NullTerminatedByteSize(var4)); // L: 11545 + var6.packetBuffer.writeByte(var0); // L: 11546 + var6.packetBuffer.writeShort(var1); // L: 11547 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11548 + var5.addNode(var6); // L: 11549 + } + } + } // L: 11541 11550 } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index fe2ea6e0a6..e1c44b2083 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,39 +1,38 @@ -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("cr") +@ObfuscatedName("ct") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("q") - public static short[] field1143; - @ObfuscatedName("d") + @ObfuscatedName("h") + static int[] field1311; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lix;" + descriptor = "Ljg;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljc;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lix;)V" + descriptor = "(Ljg;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); // L: 12 this.definition = var1; // L: 15 } // L: 16 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "954576471" + descriptor = "(IIIIB)V", + garbageValue = "35" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -47,8 +46,8 @@ public class HealthBar extends Node { return; // L: 25 } - if (var7.cycle <= var1) { - var5 = var7; // L: 27 + if (var7.cycle <= var1) { // L: 27 + var5 = var7; } } @@ -66,10 +65,10 @@ public class HealthBar extends Node { } } // L: 31 35 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lcd;", - garbageValue = "-1228863072" + descriptor = "(II)Lcl;", + garbageValue = "-1462227076" ) @Export("get") HealthBarUpdate get(int var1) { @@ -80,7 +79,7 @@ public class HealthBar extends Node { var2 = var3; // L: 43 } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { // L: 47 + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { // L: 47 return var2; } else { var2.remove(); // L: 49 @@ -91,216 +90,13 @@ public class HealthBar extends Node { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-64" + garbageValue = "-1" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5064(); // L: 55 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-391564902" - ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { // L: 188 - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; // L: 189 - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 190 - } - } - - @ObfuscatedName("ha") - @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "2000" - ) - static final void method2166(boolean var0) { - UserComparator5.playPcmPlayers(); // L: 5154 - ++Client.packetWriter.pendingWrites; // L: 5155 - if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5156 - Client.packetWriter.pendingWrites = 0; // L: 5157 - if (!Client.field712 && Client.packetWriter.getSocket() != null) { // L: 5158 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); // L: 5160 - Client.packetWriter.addNode(var1); // L: 5161 - - try { - Client.packetWriter.flush(); // L: 5163 - } catch (IOException var3) { // L: 5165 - Client.field712 = true; // L: 5166 - } - } - - } - } // L: 5169 - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(Lhz;II)I", - garbageValue = "110664163" - ) - static final int method2168(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10080 - try { - int[] var2 = var0.cs1Instructions[var1]; // L: 10082 - int var3 = 0; // L: 10083 - int var4 = 0; // L: 10084 - byte var5 = 0; // L: 10085 - - while (true) { - int var6 = var2[var4++]; // L: 10087 - int var7 = 0; // L: 10088 - byte var8 = 0; // L: 10089 - if (var6 == 0) { // L: 10090 - return var3; - } - - if (var6 == 1) { // L: 10091 - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { // L: 10092 - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { // L: 10093 - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { // L: 10094 - var9 = var2[var4++] << 16; // L: 10095 - var9 += var2[var4++]; // L: 10096 - var10 = class237.getWidget(var9); // L: 10097 - var11 = var2[var4++]; // L: 10098 - if (var11 != -1 && (!class281.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10099 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10100 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10101 - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { // L: 10105 - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { // L: 10106 - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { // L: 10107 - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { // L: 10108 - var7 = UserComparator9.localPlayer.combatLevel; - } - - if (var6 == 9) { // L: 10109 - for (var9 = 0; var9 < 25; ++var9) { // L: 10110 - if (Skills.Skills_enabled[var9]) { // L: 10111 - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { // L: 10114 - var9 = var2[var4++] << 16; // L: 10115 - var9 += var2[var4++]; // L: 10116 - var10 = class237.getWidget(var9); // L: 10117 - var11 = var2[var4++]; // L: 10118 - if (var11 != -1 && (!class281.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10119 - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10120 - if (var11 + 1 == var10.itemIds[var12]) { // L: 10121 - var7 = 999999999; // L: 10122 - break; // L: 10123 - } - } - } - } - - if (var6 == 11) { // L: 10128 - var7 = Client.runEnergy; - } - - if (var6 == 12) { // L: 10129 - var7 = Client.weight; - } - - if (var6 == 13) { // L: 10130 - var9 = Varps.Varps_main[var2[var4++]]; // L: 10131 - int var13 = var2[var4++]; // L: 10132 - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10133 - } - - if (var6 == 14) { // L: 10135 - var9 = var2[var4++]; // L: 10136 - var7 = FontName.getVarbit(var9); // L: 10137 - } - - if (var6 == 15) { // L: 10139 - var8 = 1; - } - - if (var6 == 16) { // L: 10140 - var8 = 2; - } - - if (var6 == 17) { // L: 10141 - var8 = 3; - } - - if (var6 == 18) { // L: 10142 - var7 = (UserComparator9.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; - } - - if (var6 == 19) { // L: 10143 - var7 = (UserComparator9.localPlayer.y >> 7) + NetCache.baseY; - } - - if (var6 == 20) { // L: 10144 - var7 = var2[var4++]; - } - - if (var8 == 0) { // L: 10145 - if (var5 == 0) { // L: 10146 - var3 += var7; - } - - if (var5 == 1) { // L: 10147 - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { // L: 10148 - var3 /= var7; - } - - if (var5 == 3) { // L: 10149 - var3 *= var7; - } - - var5 = 0; // L: 10150 - } else { - var5 = var8; // L: 10152 - } - } - } catch (Exception var14) { // L: 10155 - return -1; // L: 10156 - } - } else { - return -2; - } + return this.updates.method4787(); // L: 55 } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 2bbdb23980..444e2fa64c 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,94 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("jg") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HitSplatDefinition_spritesArchive") static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("HealthBarDefinition_cachedSprites") static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1428765275 + intValue = 1580647969 ) - public int field3312; - @ObfuscatedName("e") + public int field3445; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1329120235 + intValue = -1915373731 ) @Export("int1") public int int1; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1633626953 + intValue = -705328787 ) @Export("int2") public int int2; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -747398397 + intValue = 1087924017 ) @Export("int3") public int int3; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1355792235 + intValue = -1064915775 ) - public int field3316; - @ObfuscatedName("b") + public int field3449; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1028657953 + intValue = -1893940143 ) @Export("int5") public int int5; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1103221155 + intValue = -823709463 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -369560549 + intValue = 2043663533 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1152543359 + intValue = 160646161 ) @Export("width") public int width; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -784760261 + intValue = 1462204015 ) @Export("widthPadding") public int widthPadding; static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 } @@ -99,7 +99,7 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; // L: 19 this.int2 = 255; // L: 20 this.int3 = -1; // L: 21 - this.field3316 = 1; // L: 22 + this.field3449 = 1; // L: 22 this.int5 = 70; // L: 23 this.frontSpriteID = -1; // L: 24 this.backSpriteID = -1; // L: 25 @@ -107,10 +107,10 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; // L: 27 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "0" + descriptor = "(Lnu;I)V", + garbageValue = "588225385" ) @Export("decode") public void decode(Buffer var1) { @@ -124,10 +124,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-782651668" + descriptor = "(Lnu;II)V", + garbageValue = "368953375" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -139,16 +139,16 @@ public class HealthBarDefinition extends DualNode { this.int2 = var1.readUnsignedByte(); } else if (var2 == 4) { // L: 48 this.int3 = 0; - } else if (var2 == 5) { - this.int5 = var1.readUnsignedShort(); // L: 49 + } else if (var2 == 5) { // L: 49 + this.int5 = var1.readUnsignedShort(); } else if (var2 == 6) { // L: 50 var1.readUnsignedByte(); // L: 51 } else if (var2 == 7) { // L: 53 - this.frontSpriteID = var1.method5833(); + this.frontSpriteID = var1.method6597(); } else if (var2 == 8) { // L: 54 - this.backSpriteID = var1.method5833(); - } else if (var2 == 11) { - this.int3 = var1.readUnsignedShort(); // L: 55 + this.backSpriteID = var1.method6597(); + } else if (var2 == 11) { // L: 55 + this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { // L: 56 this.width = var1.readUnsignedByte(); } else if (var2 == 15) { // L: 57 @@ -157,10 +157,10 @@ public class HealthBarDefinition extends DualNode { } // L: 59 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "1655597886" + descriptor = "(I)Loh;", + garbageValue = "1473587494" ) @Export("getFrontSprite") public SpritePixels getFrontSprite() { @@ -171,9 +171,9 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; // L: 64 } else { - var1 = BufferedSource.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 65 - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); // L: 66 + var1 = ModelData0.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 65 + if (var1 != null) { // L: 66 + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } return var1; // L: 68 @@ -181,10 +181,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-211707789" + descriptor = "(I)Loh;", + garbageValue = "-540138434" ) @Export("getBackSprite") public SpritePixels getBackSprite() { @@ -195,38 +195,13 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; // L: 74 } else { - var1 = BufferedSource.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 75 - if (var1 != null) { // L: 76 - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + var1 = ModelData0.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 75 + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 76 } return var1; // L: 78 } } } - - @ObfuscatedName("n") - public static double method4658(double var0, double var2, double var4) { - double var8 = (var0 - var2) / var4; // L: 10 - double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 - return var6 / var4; // L: 14 - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1201121058" - ) - static final boolean method4677(int var0) { - if (var0 < 0) { // L: 8005 - return false; - } else { - int var1 = Client.menuOpcodes[var0]; // L: 8006 - if (var1 >= 2000) { // L: 8007 - var1 -= 2000; - } - - return var1 == 1007; // L: 8008 - } - } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index b6925fa62c..e17b76c172 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -4,41 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("cl") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("se") - @ObfuscatedSignature( - descriptor = "Lio;" - ) - public static class248 field1016; - @ObfuscatedName("id") + @ObfuscatedName("sy") @ObfuscatedGetter( - intValue = -871307957 + longValue = 6142810320644924851L ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("n") + static long field1272; + @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = -1783692297 + longValue = 4363745212267804777L + ) + static long field1277; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1723297803 ) @Export("cycle") int cycle; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2047753623 + intValue = -802786453 ) @Export("health") int health; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1943828551 + intValue = -1934136823 ) @Export("health2") int health2; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1709538301 + intValue = 1369623823 ) @Export("cycleOffset") int cycleOffset; @@ -50,62 +49,57 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; // L: 15 } // L: 16 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "72" + descriptor = "(IIIII)V", + garbageValue = "-2137849778" ) @Export("set") void set(int var1, int var2, int var3, int var4) { this.cycle = var1; // L: 19 this.health = var2; // L: 20 - this.health2 = var3; - this.cycleOffset = var4; - } + this.health2 = var3; // L: 21 + this.cycleOffset = var4; // L: 22 + } // L: 23 - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SB)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1311777255" ) - public static void method1873(String[] var0, short[] var1) { - AbstractSocket.sortItemsByName(var0, var1, 0, var0.length - 1); // L: 9 - } // L: 10 + static final void method2180(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your ignore list").toString(); // L: 182 + class69.addGameMessage(30, "", var1); // L: 184 + } // L: 186 - @ObfuscatedName("v") + @ObfuscatedName("fo") @ObfuscatedSignature( - descriptor = "(IB)Lij;", - garbageValue = "-64" + descriptor = "(I)V", + garbageValue = "-481083146" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; + static final void method2181() { + if (Client.logoutTimer > 0) { // L: 2438 + class23.logOut(); // L: 2439 } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 - var1 = new InvDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 - return var1; // L: 27 + Client.timer.method5578(); // L: 2442 + class20.updateGameState(40); // L: 2443 + Client.field686 = Client.packetWriter.getSocket(); // L: 2444 + Client.packetWriter.removeSocket(); // L: 2445 } - } + } // L: 2440 2446 - @ObfuscatedName("e") + @ObfuscatedName("fw") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-698681386" + descriptor = "(IIB)V", + garbageValue = "59" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 68 - if (var1 == null) { // L: 69 - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 70 71 + static void method2175(int var0, int var1) { + if (Login.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3103 + PacketBufferNode.method3898(class10.archive11, var0, 0, Login.clientPreferences.musicVolume, false); // L: 3104 + Client.field842 = true; // L: 3105 } - } + + } // L: 3107 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 9e1dac19ba..266719c237 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,115 +4,120 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jz") +@ObfuscatedName("kt") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("HitSplatDefinition_archive") static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" + ) + static AbstractArchive field3562; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lir;" ) @Export("HitSplatDefinition_fontsArchive") static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("HitSplatDefinition_cached") static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("HitSplatDefinition_cachedSprites") static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("HitSplatDefinition_cachedFonts") static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1737800845 + intValue = -921028973 ) @Export("fontId") int fontId; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1895359321 + intValue = 1347105069 ) @Export("textColor") public int textColor; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1681619933 + intValue = 1413295459 ) - public int field3364; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -334206497 - ) - int field3365; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 54312143 - ) - int field3366; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1316651061 - ) - int field3367; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -2079925537 - ) - int field3372; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -2039546161 - ) - public int field3378; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 74632649 - ) - public int field3370; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -854871663 - ) - public int field3371; - @ObfuscatedName("p") - String field3358; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1999046971 - ) - public int field3375; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 1539092209 - ) - public int field3368; - @ObfuscatedName("o") - @Export("transforms") - public int[] transforms; + public int field3581; @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -979456213 + intValue = 445711767 + ) + int field3573; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1796599539 + ) + int field3577; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -978444857 + ) + int field3575; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -215883891 + ) + int field3576; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1377029969 + ) + public int field3572; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1878239229 + ) + public int field3584; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 412111735 + ) + public int field3579; + @ObfuscatedName("i") + String field3580; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -700419329 + ) + public int field3586; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1204516257 + ) + public int field3582; + @ObfuscatedName("s") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 931180183 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -351254549 + intValue = -700804289 ) @Export("transformVarp") int transformVarp; @@ -126,25 +131,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; // L: 26 this.textColor = 16777215; // L: 27 - this.field3364 = 70; // L: 28 - this.field3365 = -1; // L: 29 - this.field3366 = -1; // L: 30 - this.field3367 = -1; // L: 31 - this.field3372 = -1; // L: 32 - this.field3378 = 0; // L: 33 - this.field3370 = 0; // L: 34 - this.field3371 = -1; // L: 35 - this.field3358 = ""; // L: 36 - this.field3375 = -1; // L: 37 - this.field3368 = 0; // L: 38 + this.field3581 = 70; // L: 28 + this.field3573 = -1; // L: 29 + this.field3577 = -1; // L: 30 + this.field3575 = -1; // L: 31 + this.field3576 = -1; // L: 32 + this.field3572 = 0; // L: 33 + this.field3584 = 0; // L: 34 + this.field3579 = -1; // L: 35 + this.field3580 = ""; // L: 36 + this.field3586 = -1; // L: 37 + this.field3582 = 0; // L: 38 this.transformVarbit = -1; // L: 40 this.transformVarp = -1; // L: 41 } // L: 43 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1255296319" + descriptor = "(Lnu;I)V", + garbageValue = "1349410227" ) @Export("decode") void decode(Buffer var1) { @@ -158,41 +163,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;IB)V", - garbageValue = "12" + descriptor = "(Lnu;IB)V", + garbageValue = "0" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { // L: 70 - this.fontId = var1.method5833(); + this.fontId = var1.method6597(); } else if (var2 == 2) { // L: 71 this.textColor = var1.readMedium(); } else if (var2 == 3) { // L: 72 - this.field3365 = var1.method5833(); + this.field3573 = var1.method6597(); } else if (var2 == 4) { // L: 73 - this.field3367 = var1.method5833(); + this.field3575 = var1.method6597(); } else if (var2 == 5) { // L: 74 - this.field3366 = var1.method5833(); + this.field3577 = var1.method6597(); } else if (var2 == 6) { // L: 75 - this.field3372 = var1.method5833(); + this.field3576 = var1.method6597(); } else if (var2 == 7) { // L: 76 - this.field3378 = var1.readShort(); + this.field3572 = var1.readShort(); } else if (var2 == 8) { // L: 77 - this.field3358 = var1.readStringCp1252NullCircumfixed(); + this.field3580 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { // L: 78 - this.field3364 = var1.readUnsignedShort(); + this.field3581 = var1.readUnsignedShort(); } else if (var2 == 10) { // L: 79 - this.field3370 = var1.readShort(); + this.field3584 = var1.readShort(); } else if (var2 == 11) { // L: 80 - this.field3371 = 0; + this.field3579 = 0; } else if (var2 == 12) { // L: 81 - this.field3375 = var1.readUnsignedByte(); + this.field3586 = var1.readUnsignedByte(); } else if (var2 == 13) { // L: 82 - this.field3368 = var1.readShort(); + this.field3582 = var1.readShort(); } else if (var2 == 14) { - this.field3371 = var1.readUnsignedShort(); // L: 83 + this.field3579 = var1.readUnsignedShort(); // L: 83 } else if (var2 == 17 || var2 == 18) { // L: 84 this.transformVarbit = var1.readUnsignedShort(); // L: 85 if (this.transformVarbit == 65535) { // L: 86 @@ -227,16 +232,16 @@ public class HitSplatDefinition extends DualNode { } // L: 103 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)Ljz;", - garbageValue = "-718809763" + descriptor = "(I)Lkt;", + garbageValue = "-1486809095" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; // L: 106 if (this.transformVarbit != -1) { // L: 107 - var1 = FontName.getVarbit(this.transformVarbit); + var1 = class2.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { // L: 108 var1 = Varps.Varps_main[this.transformVarp]; } @@ -248,17 +253,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? ScriptFrame.method1222(var2) : null; // L: 112 113 + return var2 != -1 ? StudioGame.method4391(var2) : null; // L: 112 113 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "1367111183" + garbageValue = "1639056635" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3358; // L: 117 + String var2 = this.field3580; // L: 117 while (true) { int var3 = var2.indexOf("%1"); // L: 119 @@ -266,26 +271,26 @@ public class HitSplatDefinition extends DualNode { return var2; // L: 123 } - var2 = var2.substring(0, var3) + GrandExchangeOfferOwnWorldComparator.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 + var2 = var2.substring(0, var3) + WallDecoration.intToString(var1, false) + var2.substring(var3 + 2); // L: 121 } } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-1595522971" + descriptor = "(I)Loh;", + garbageValue = "-1023418983" ) - public SpritePixels method4764() { - if (this.field3365 < 0) { // L: 127 + public SpritePixels method5166() { + if (this.field3573 < 0) { // L: 127 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3365); // L: 128 - if (var1 != null) { - return var1; // L: 129 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3573); // L: 128 + if (var1 != null) { // L: 129 + return var1; } else { - var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3365, 0); // L: 130 + var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3573, 0); // L: 130 if (var1 != null) { // L: 131 - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3365); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3573); } return var1; // L: 133 @@ -293,22 +298,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)Llm;", - garbageValue = "49" + descriptor = "(I)Loh;", + garbageValue = "1414227613" ) - public SpritePixels method4770() { - if (this.field3366 < 0) { // L: 137 + public SpritePixels method5137() { + if (this.field3577 < 0) { // L: 137 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3366); // L: 138 - if (var1 != null) { - return var1; // L: 139 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3577); // L: 138 + if (var1 != null) { // L: 139 + return var1; } else { - var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3366, 0); // L: 140 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3366); // L: 141 + var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3577, 0); // L: 140 + if (var1 != null) { // L: 141 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3577); } return var1; // L: 143 @@ -316,22 +321,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "1511725830" + descriptor = "(I)Loh;", + garbageValue = "-1065428410" ) - public SpritePixels method4769() { - if (this.field3367 < 0) { // L: 147 + public SpritePixels method5138() { + if (this.field3575 < 0) { // L: 147 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3367); // L: 148 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3575); // L: 148 if (var1 != null) { return var1; // L: 149 } else { - var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3367, 0); // L: 150 - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3367); // L: 151 + var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3575, 0); // L: 150 + if (var1 != null) { // L: 151 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3575); } return var1; // L: 153 @@ -339,22 +344,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)Llm;", - garbageValue = "-2138481070" + descriptor = "(I)Loh;", + garbageValue = "-438870038" ) - public SpritePixels method4766() { - if (this.field3372 < 0) { // L: 157 + public SpritePixels method5157() { + if (this.field3576 < 0) { // L: 157 return null; } else { - SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3372); // L: 158 + SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3576); // L: 158 if (var1 != null) { return var1; // L: 159 } else { - var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3372, 0); // L: 160 + var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3576, 0); // L: 160 if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3372); // L: 161 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3576); // L: 161 } return var1; // L: 163 @@ -362,10 +367,10 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lkl;", - garbageValue = "1442657906" + descriptor = "(I)Lkq;", + garbageValue = "513658947" ) @Export("getFont") public Font getFont() { @@ -376,108 +381,28 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { // L: 169 return var1; } else { - AbstractArchive var3 = Frames.field1904; // L: 171 - AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 172 - int var5 = this.fontId; // L: 173 - byte[] var7 = var3.takeFile(var5, 0); // L: 177 - boolean var6; - if (var7 == null) { // L: 178 - var6 = false; // L: 179 - } else { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var7); // L: 182 - var6 = true; // L: 183 + var1 = class236.method4378(field3562, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170 + if (var1 != null) { + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171 } - Font var2; - if (!var6) { // L: 185 - var2 = null; // L: 186 - } else { - byte[] var8 = var4.takeFile(var5, 0); // L: 190 - Font var10; - if (var8 == null) { // L: 192 - var10 = null; // L: 193 - } else { - Font var9 = new Font(var8, class105.SpriteBuffer_xOffsets, class336.SpriteBuffer_yOffsets, class336.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, HorizontalAlignment.SpriteBuffer_spritePalette, class2.SpriteBuffer_pixels); // L: 196 - class105.SpriteBuffer_xOffsets = null; // L: 198 - class336.SpriteBuffer_yOffsets = null; // L: 199 - class336.SpriteBuffer_spriteWidths = null; // L: 200 - class225.SpriteBuffer_spriteHeights = null; // L: 201 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 202 - class2.SpriteBuffer_pixels = null; // L: 203 - var10 = var9; // L: 205 - } - - var2 = var10; // L: 207 - } - - if (var2 != null) { // L: 210 - HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); - } - - return var2; // L: 212 + return var1; // L: 173 } } } - @ObfuscatedName("b") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1153896983" + descriptor = "(IZZZB)Lig;", + garbageValue = "9" ) - public static String method4768(CharSequence var0) { - return ReflectionCheck.method2449('*', var0.length()); // L: 184 - } - - @ObfuscatedName("ht") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-483129503" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[class90.Client_plane][var0][var1]; // L: 7523 - if (var2 == null) { // L: 7524 - MilliClock.scene.removeGroundItemPile(class90.Client_plane, var0, var1); // L: 7525 - } else { - long var3 = -99999999L; // L: 7528 - TileItem var5 = null; // L: 7529 - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7530 7531 7539 - ItemComposition var7 = class281.ItemDefinition_get(var6.id); // L: 7532 - long var11 = (long)var7.price; // L: 7533 - if (var7.isStackable == 1) { - var11 *= (long)(var6.quantity + 1); // L: 7534 - } - - if (var11 > var3) { // L: 7535 - var3 = var11; // L: 7536 - var5 = var6; // L: 7537 - } - } - - if (var5 == null) { // L: 7541 - MilliClock.scene.removeGroundItemPile(class90.Client_plane, var0, var1); // L: 7542 - } else { - var2.addLast(var5); // L: 7545 - TileItem var13 = null; // L: 7546 - TileItem var8 = null; // L: 7547 - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7548 7549 7554 - if (var5.id != var6.id) { // L: 7550 - if (var13 == null) { // L: 7551 - var13 = var6; - } - - if (var6.id != var13.id && var8 == null) { // L: 7552 - var8 = var6; - } - } - } - - long var9 = TextureProvider.calculateTag(var0, var1, 3, false, 0); // L: 7556 - MilliClock.scene.newGroundItemPile(class90.Client_plane, var0, var1, WorldMapRegion.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class90.Client_plane), var5, var9, var13, var8); // L: 7557 - } + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 1674 + if (JagexCache.JagexCache_dat2File != null) { // L: 1675 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, PendingSpawn.JagexCache_idxFiles[var0], 1000000); } - } // L: 7526 7543 7558 + + return new Archive(var4, FriendLoginUpdate.masterDisk, var0, var1, var2, var3); // L: 1676 + } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 1f568fbcea..fa349b8e6c 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -1,244 +1,54 @@ -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("je") +@ObfuscatedName("jd") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lje;" + descriptor = "Ljd;" ) - field3494(0, 0), - @ObfuscatedName("v") + field3468(0, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lje;" + descriptor = "Ljd;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(2, 1), - @ObfuscatedName("d") + HorizontalAlignment_centered(1, 1), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lje;" + descriptor = "Ljd;" ) - field3490(1, 2); + field3469(2, 2); - @ObfuscatedName("e") - @Export("SpriteBuffer_spritePalette") - public static int[] SpriteBuffer_spritePalette; - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1851733283 + intValue = -1248334161 ) @Export("value") public final int value; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1519018517 + intValue = -543417639 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-2086152614" - ) - static int method4924(int var0, Script var1, boolean var2) { - String var3; - int var9; - if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2647 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2648 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2649 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2650 - return 1; // L: 2651 - } else { - String var4; - if (var0 == ScriptOpcodes.APPEND) { // L: 2653 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2654 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2655 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2656 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2657 - return 1; // L: 2658 - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2660 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2661 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2662 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + GrandExchangeOfferOwnWorldComparator.intToString(var9, true); // L: 2663 - return 1; // L: 2664 - } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2666 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2667 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2668 - return 1; // L: 2669 - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { // L: 2671 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2672 - long var13 = ((long)var10 + 11745L) * 86400000L; // L: 2673 - Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2674 - var6 = Interpreter.Interpreter_calendar.get(5); // L: 2675 - int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2676 - int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2677 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2678 - return 1; // L: 2679 - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2681 - if (var0 == ScriptOpcodes.TOSTRING) { // L: 2689 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2690 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 2691 - return 1; // L: 2692 - } else if (var0 == ScriptOpcodes.COMPARE) { // L: 2694 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2695 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ServerPacket.method3810(User.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], NPCComposition.clientLanguage)); // L: 2696 - return 1; // L: 2697 - } else { - int var5; - byte[] var11; - Font var12; - if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 2699 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2700 - Interpreter.Interpreter_intStackSize -= 2; // L: 2701 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2702 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2703 - var11 = CollisionMap.archive13.takeFile(var5, 0); // L: 2704 - var12 = new Font(var11); // L: 2705 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 2706 - return 1; // L: 2707 - } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 2709 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2710 - Interpreter.Interpreter_intStackSize -= 2; // L: 2711 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2712 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2713 - var11 = CollisionMap.archive13.takeFile(var5, 0); // L: 2714 - var12 = new Font(var11); // L: 2715 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 2716 - return 1; // L: 2717 - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 2719 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2720 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2721 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2722 - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 2723 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; // L: 2724 - } - - return 1; // L: 2725 - } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 2727 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2728 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 2729 - return 1; // L: 2730 - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 2732 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2733 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2734 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 2735 - return 1; // L: 2736 - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 2738 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2739 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBar.isCharPrintable((char)var10) ? 1 : 0; // L: 2740 - return 1; // L: 2741 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 2743 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2744 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class225.isAlphaNumeric((char)var10) ? 1 : 0; // L: 2745 - return 1; // L: 2746 - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 2748 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2749 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class69.isCharAlphabetic((char)var10) ? 1 : 0; // L: 2750 - return 1; // L: 2751 - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 2753 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2754 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Strings.isDigit((char)var10) ? 1 : 0; // L: 2755 - return 1; // L: 2756 - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 2758 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2759 - if (var3 != null) { // L: 2760 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2761 - } - - return 1; // L: 2762 - } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 2764 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2765 - Interpreter.Interpreter_intStackSize -= 2; // L: 2766 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2767 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2768 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 2769 - return 1; // L: 2770 - } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 2772 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2773 - StringBuilder var15 = new StringBuilder(var3.length()); // L: 2774 - boolean var16 = false; // L: 2775 - - for (var6 = 0; var6 < var3.length(); ++var6) { // L: 2776 - char var7 = var3.charAt(var6); // L: 2777 - if (var7 == '<') { // L: 2778 - var16 = true; - } else if (var7 == '>') { // L: 2779 - var16 = false; - } else if (!var16) { // L: 2780 - var15.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); // L: 2782 - return 1; // L: 2783 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 2785 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2786 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2787 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 2788 - return 1; // L: 2789 - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 2791 - Interpreter.Interpreter_stringStackSize -= 2; // L: 2792 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2793 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2794 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2795 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 2796 - return 1; // L: 2797 - } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 2799 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2800 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 2801 - return 1; // L: 2802 - } else { - return 2; // L: 2804 - } - } - } else { - Interpreter.Interpreter_stringStackSize -= 2; // L: 2682 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2683 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2684 - if (UserComparator9.localPlayer.appearance != null && UserComparator9.localPlayer.appearance.isFemale) { // L: 2685 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 2686 - } - - return 1; // L: 2687 - } - } - } + return this.id; // L: 19 } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 00bbcb0ac9..2d98a31055 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -2,18 +2,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hp") +@ObfuscatedName("hx") @Implements("Huffman") public class Huffman { - @ObfuscatedName("n") + @ObfuscatedName("qz") + @ObfuscatedSignature( + descriptor = "Lak;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("f") @Export("masks") int[] masks; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("bits") byte[] bits; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("keys") int[] keys; @@ -100,10 +105,10 @@ public class Huffman { } // L: 60 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BII[BIB)I", - garbageValue = "-79" + descriptor = "([BII[BII)I", + garbageValue = "310251163" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -121,7 +126,7 @@ public class Huffman { int var11 = var7 >> 3; // L: 71 int var12 = var7 & 7; // L: 72 var6 &= -var12 >> 31; // L: 73 - int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74 + int var13 = (var10 + var12 - 1 >> 3) + var11; // L: 74 var12 += 24; // L: 76 var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 if (var11 < var13) { // L: 78 @@ -151,10 +156,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([BI[BIII)I", - garbageValue = "1393765026" + descriptor = "([BI[BIIB)I", + garbageValue = "74" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -295,38 +300,12 @@ public class Huffman { } } - @ObfuscatedName("i") + @ObfuscatedName("hw") @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "124" + descriptor = "(I)Z", + garbageValue = "-1260509455" ) - static int method4157(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1125 - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1126 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MusicPatch.Widget_unpackTargetMask(class60.getWidgetFlags(var3)); // L: 1127 - return 1; // L: 1128 - } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1130 - if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1137 - if (var3.dataText == null) { // L: 1138 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1139 - } - - return 1; // L: 1140 - } else { - return 2; // L: 1142 - } - } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1131 - --var4; // L: 1132 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1133 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1134 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; // L: 1135 - } + static final boolean method4311() { + return Client.isMenuOpen; // L: 7813 } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 143017a389..1b825f0da9 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,48 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("lu") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lml;)V" + descriptor = "(Lmf;)V" ) public IgnoreList(LoginType var1) { super(400); // L: 12 this.loginType = var1; // L: 13 } // L: 14 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljn;", - garbageValue = "-315842787" + descriptor = "(I)Llt;", + garbageValue = "-1522637653" ) @Export("newInstance") User newInstance() { return new Ignored(); // L: 17 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)[Ljn;", - garbageValue = "1723641195" + descriptor = "(II)[Llt;", + garbageValue = "1232560537" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; // L: 21 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-631264277" + descriptor = "(Lnu;II)V", + garbageValue = "-696903519" ) @Export("read") public void read(Buffer var1, int var2) { @@ -59,7 +59,7 @@ public class IgnoreList extends UserList { Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 32 if (var4) { // L: 33 Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 34 - if (var8 != null && var8 != var7) { // L: 35 + if (var8 != null && var7 != var8) { // L: 35 if (var7 != null) { // L: 36 this.remove(var8); // L: 37 } else { diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index d4d80bcb60..0619a1e74c 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("lz") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1743470609 + intValue = 2054928513 ) @Export("id") int id; @@ -17,20 +17,20 @@ public class Ignored extends User { Ignored() { } // L: 6 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lke;I)I", - garbageValue = "1892855432" + descriptor = "(Llz;S)I", + garbageValue = "-7783" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; // L: 9 } - @ObfuscatedName("at") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljn;I)I", - garbageValue = "642739557" + descriptor = "(Llt;I)I", + garbageValue = "1200801892" ) @Export("compareTo_user") public int compareTo_user(User var1) { diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 614660397d..35e6857026 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,38 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ly") +@ObfuscatedName("ow") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("pixels") public byte[] pixels; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("palette") public int[] palette; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("subWidth") public int subWidth; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("subHeight") public int subHeight; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("xOffset") public int xOffset; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("yOffset") public int yOffset; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("width") public int width; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("height") public int height; IndexedSprite() { } // L: 15 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 @@ -54,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 31 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 @@ -87,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 49 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 52 @@ -133,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } // L: 85 - @ObfuscatedName("y") - public void method6302(int var1, int var2, int var3, int var4) { + @ObfuscatedName("b") + public void method6951(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 @@ -195,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 } // L: 158 - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 88 @@ -249,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } // L: 113 - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 161 diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 3956df40d8..1c1781913d 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,112 +4,112 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("bf") @Implements("Instrument") public class Instrument { - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("o") + @ObfuscatedName("s") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("j") + @ObfuscatedName("y") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("delayTime") int delayTime; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("delayDecay") int delayDecay; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lde;" + descriptor = "Lbq;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Lbr;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("duration") int duration; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("offset") int offset; @@ -146,10 +146,10 @@ public class Instrument { this.offset = 0; // L: 25 } // L: 50 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class311.clearIntArray(Instrument_samples, 0, var1); // L: 53 + class305.clearIntArray(Instrument_samples, 0, var1); // L: 53 if (var2 < 10) { // L: 54 return Instrument_samples; } else { @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { // L: 179 @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -421,6 +421,6 @@ public class Instrument { this.offset = var1.readUnsignedShort(); // L: 228 this.filter = new AudioFilter(); // L: 229 this.filterEnvelope = new SoundEnvelope(); // L: 230 - this.filter.method2854(var1, this.filterEnvelope); // L: 231 + this.filter.method1133(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 491630d8b5..041eca284d 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,10 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("on") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("n") + @ObfuscatedName("q") + @Export("cacheParentPaths") + static String[] cacheParentPaths; + @ObfuscatedName("f") @Export("array") int[] array; @@ -32,10 +35,10 @@ public class IntHashTable { } // L: 17 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "665276808" + garbageValue = "-1744823882" ) @Export("get") public int get(int var1) { diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 62646dcccd..91d26d1be5 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gq") +@ObfuscatedName("mp") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index f031905803..dd5fcc08c7 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -3,86 +3,170 @@ 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("cv") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("st") + @ObfuscatedName("qd") @ObfuscatedSignature( - descriptor = "Lcp;" + descriptor = "Llb;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("h") + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "Lnu;" ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("n") + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1282105963 + intValue = -860783313 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1429223805 ) @Export("group") int group; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1339179059 + intValue = -196451933 ) @Export("type") int type; - @ObfuscatedName("d") - boolean field575; + @ObfuscatedName("u") + boolean field1136; InterfaceParent() { - this.field575 = false; // L: 8 + this.field1136 = false; // L: 8 } // L: 10 - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "([Lgh;II)Lgh;", - garbageValue = "1668419242" + descriptor = "(ILcc;ZI)I", + garbageValue = "2109711781" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; // L: 17 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 - Enumerated var4 = var2[var3]; // L: 19 - if (var1 == var4.rsOrdinal()) { - return var4; // L: 21 - } - } - - return null; // L: 25 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Ljs;", - garbageValue = "82" - ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 41 - if (var1 != null) { // L: 42 - return var1; + static int method2095(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1006 + var0 -= 1000; // L: 1007 + var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1008 } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 43 - var1 = new SequenceDefinition(); // L: 44 - if (var2 != null) { // L: 45 - var1.decode(new Buffer(var2)); + var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1010 + } + + String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1011 + int[] var5 = null; // L: 1012 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1013 + int var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1014 + if (var6 > 0) { // L: 1015 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]) { // L: 1016 1017 + } } - var1.postDecode(); // L: 46 - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 47 - return var1; // L: 48 + var4 = var4.substring(0, var4.length() - 1); // L: 1019 } + + Object[] var8 = new Object[var4.length() + 1]; // L: 1021 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1022 + if (var4.charAt(var7 - 1) == 's') { // L: 1023 + var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1024 + } + } + + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1026 + if (var7 != -1) { // L: 1027 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 1028 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 1029 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1030 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1031 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1032 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1033 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1034 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1035 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1036 + var3.onVarTransmit = var8; // L: 1037 + var3.varTransmitTriggers = var5; // L: 1038 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1040 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1041 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1042 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1043 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1044 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1045 + var3.onInvTransmit = var8; // L: 1046 + var3.invTransmitTriggers = var5; // L: 1047 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1049 + var3.onStatTransmit = var8; // L: 1050 + var3.statTransmitTriggers = var5; // L: 1051 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1053 + var3.onTargetEnter = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1054 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1055 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1056 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1057 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1058 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1059 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1060 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1061 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1062 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1063 + var3.field2743 = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1064 + var3.onResize = var8; + } else if (var0 == 1428) { // L: 1065 + var3.field2736 = var8; + } else { + if (var0 != 1429) { // L: 1066 + return 2; // L: 1067 + } + + var3.field2655 = var8; + } + + var3.hasListener = true; // L: 1068 + return 1; // L: 1069 } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1182828534" + ) + static void method2096(int var0) { + Login.loginIndex = 12; // L: 1378 + Login.field993 = var0; // L: 1379 + } // L: 1380 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 2b5c0d55f2..0243a49649 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -4,125 +4,92 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("cw") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("y") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("z") + @ObfuscatedName("b") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("k") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("g") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("e") + @ObfuscatedName("h") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1775407691 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("s") + @ObfuscatedName("m") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1832147507 + intValue = -196314347 ) @Export("Interpreter_stringStackSize") static int Interpreter_stringStackSize; - @ObfuscatedName("a") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1349197587 + intValue = -309937971 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lbz;" + descriptor = "[Lbg;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("k") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lp;" ) - @Export("scriptActiveWidget") - static Widget scriptActiveWidget; - @ObfuscatedName("x") + static class3 field941; + @ObfuscatedName("z") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("f") + @ObfuscatedName("i") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("g") + @ObfuscatedName("w") + static boolean field944; + @ObfuscatedName("s") + static boolean field946; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1409766351 + ) + static int field950; + @ObfuscatedName("ag") + static final double field934; + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lav;" + descriptor = "Low;" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("u") - static boolean field1120; - @ObfuscatedName("t") - static boolean field1122; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 365610695 - ) - static int field1123; - @ObfuscatedName("j") - static final double field1124; - @ObfuscatedName("ea") - @ObfuscatedGetter( - intValue = 847561081 - ) - static int field1116; - @ObfuscatedName("gk") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; static { - Interpreter_arrayLengths = new int[5]; // L: 70 - Interpreter_arrays = new int[5][5000]; // L: 71 - Interpreter_intStack = new int[1000]; // L: 72 - Interpreter_stringStack = new String[1000]; // L: 74 - Interpreter_frameDepth = 0; // L: 76 - Interpreter_frames = new ScriptFrame[50]; // L: 77 - Interpreter_calendar = java.util.Calendar.getInstance(); // L: 80 - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 83 - field1120 = false; // L: 86 - field1122 = false; // L: 87 - field1123 = 0; // L: 88 - field1124 = Math.log(2.0D); // L: 92 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1493110038" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { // L: 586 - var1 /= 2; - } - - if (var2 > 192) { // L: 587 - var1 /= 2; - } - - if (var2 > 217) { // L: 588 - var1 /= 2; - } - - if (var2 > 243) { // L: 589 - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 590 - return var3; // L: 591 + Interpreter_arrayLengths = new int[5]; // L: 73 + Interpreter_arrays = new int[5][5000]; // L: 74 + Interpreter_intStack = new int[1000]; // L: 75 + Interpreter_stringStack = new String[1000]; // L: 77 + Interpreter_frameDepth = 0; // L: 79 + Interpreter_frames = new ScriptFrame[50]; // L: 80 + Interpreter_calendar = java.util.Calendar.getInstance(); // L: 86 + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 89 + field944 = false; // L: 92 + field946 = false; // L: 93 + field950 = 0; // L: 94 + field934 = Math.log(2.0D); // L: 98 } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 9582292dad..831cf0b54f 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,27 +1,28 @@ +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("ij") +@ObfuscatedName("js") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; - @ObfuscatedName("v") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2039181525 + intValue = 651568811 ) @Export("size") public int size; @@ -34,55 +35,48 @@ public class InvDefinition extends DualNode { this.size = 0; // L: 12 } // L: 14 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "-26" + descriptor = "(Lnu;B)V", + garbageValue = "86" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 32 - if (var2 == 0) { // L: 33 - return; // L: 36 + int var2 = var1.readUnsignedByte(); // L: 28 + if (var2 == 0) { // L: 29 + return; // L: 32 } - this.decodeNext(var1, var2); // L: 34 + this.decodeNext(var1, var2); // L: 30 } } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-667990593" + descriptor = "(Lnu;IB)V", + garbageValue = "46" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { // L: 39 + if (var2 == 2) { // L: 35 this.size = var1.readUnsignedShort(); } - } // L: 41 + } // L: 37 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)Lic;", - garbageValue = "63" + descriptor = "(Ljava/io/File;I)V", + garbageValue = "1853362286" ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 44 45 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1853243794" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; // L: 1447 - Login.Login_response2 = var1; // L: 1448 - Login.Login_response3 = var2; // L: 1449 - } // L: 1450 + @Export("assertCacheDirExists") + static void assertCacheDirExists(File var0) { + FileSystem.FileSystem_cacheDir = var0; // L: 16 + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 18 + } + } // L: 19 } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index 9e9151e3f7..67be4ab4c2 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("oy") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("c") + @ObfuscatedName("qo") + @ObfuscatedSignature( + descriptor = "Lp;" + ) + static class3 field4266; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1316013603 + intValue = 140655543 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("results") int[] results; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("mm") int[] mm; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 901564777 + intValue = 112204363 ) @Export("aa") int aa; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1322054545 + intValue = -1322370453 ) @Export("bb") int bb; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1647465607 + intValue = 1470929015 ) @Export("cc") int cc; @@ -46,13 +51,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; // L: 18 } - this.method6466(); // L: 20 + this.method7102(); // L: 20 } // L: 21 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "105" + descriptor = "(I)I", + garbageValue = "1779543758" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +69,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "600034731" + garbageValue = "493852824" ) - public final int method6474() { + public final int method7100() { if (this.valuesRemaining == 0) { // L: 32 this.generateMoreResults(); // L: 33 this.valuesRemaining = 256; // L: 34 @@ -78,10 +83,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2032903481" + descriptor = "(B)V", + garbageValue = "56" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,12 +114,12 @@ public final class IsaacCipher { } // L: 58 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-852734098" + garbageValue = "966648246" ) - final void method6466() { + final void method7102() { int var9 = -1640531527; // L: 70 int var8 = -1640531527; // L: 71 int var7 = -1640531527; // L: 72 @@ -241,17 +246,4 @@ public final class IsaacCipher { this.generateMoreResults(); // L: 188 this.valuesRemaining = 256; // L: 189 } // L: 190 - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(Lhz;S)V", - garbageValue = "180" - ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field868) { // L: 10994 - Client.field816[var0.rootIndex] = true; // L: 10995 - } - - } // L: 10997 } diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java index 288a14d86c..506260110a 100644 --- a/runescape-client/src/main/java/ItemComposition.java +++ b/runescape-client/src/main/java/ItemComposition.java @@ -4,285 +4,279 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jj") +@ObfuscatedName("ko") @Implements("ItemComposition") public class ItemComposition extends DualNode { - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lir;" + ) + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgf;" ) @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("s") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("b") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ItemDefinition_cachedSprites") - public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("es") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("w") + static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1001964101 + intValue = 1267309443 ) @Export("id") public int id; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1799325523 + intValue = 424670907 ) @Export("model") int model; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("name") public String name; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 6879929 + intValue = 2040689491 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1688105217 + intValue = 2104208593 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1543947313 + intValue = 742539393 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1306292043 + intValue = -489639743 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1516282991 + intValue = 1453222401 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1944648005 + intValue = -1519618963 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1833299999 + intValue = 2026182297 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 753728935 + intValue = -145355023 ) @Export("price") public int price; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1719700473 + intValue = 807586131 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1669101649 + intValue = -562988651 ) @Export("maleModel") int maleModel; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -2060581313 + intValue = 588950801 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -924111705 + intValue = -1836778797 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -933159689 + intValue = 905532905 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -706743113 + intValue = 259604909 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -224060053 + intValue = 1638435767 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -156140513 + intValue = 1786764469 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1489011567 + intValue = -1184429917 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1126073689 + intValue = -1757489403 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -579174705 + intValue = -882532737 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1575362213 + intValue = -1508147737 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 580683253 + intValue = -1263054825 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @Export("countobj") int[] countobj; - @ObfuscatedName("ab") + @ObfuscatedName("al") @Export("countco") int[] countco; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1429029547 + intValue = -606925415 ) @Export("note") public int note; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1169335275 + intValue = 1122661851 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1218520383 + intValue = 128957167 ) @Export("resizeX") int resizeX; - @ObfuscatedName("av") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1237330743 + intValue = 236584503 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -52672675 + intValue = -1596577521 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bj") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -1894951113 + intValue = -784954209 ) @Export("ambient") public int ambient; - @ObfuscatedName("bn") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 350905955 + intValue = 1528979205 ) @Export("contrast") public int contrast; - @ObfuscatedName("bi") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -358340883 + intValue = 314111875 ) @Export("team") public int team; - @ObfuscatedName("bp") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("br") + @ObfuscatedName("bb") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1240574229 + intValue = 1614992297 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1151278327 + intValue = -1996159711 ) @Export("notedId") int notedId; - @ObfuscatedName("bc") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1976795321 + intValue = -281222303 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bw") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1745623911 + intValue = -103299683 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -334,583 +328,596 @@ public class ItemComposition extends DualNode { this.placeholderTemplate = -1; // L: 79 } // L: 81 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "988700298" + garbageValue = "-1343555162" ) @Export("post") void post() { - } // L: 115 + } // L: 123 - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-2119006987" + descriptor = "(Lnu;I)V", + garbageValue = "175424411" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 119 - if (var2 == 0) { // L: 120 - return; // L: 123 + int var2 = var1.readUnsignedByte(); // L: 127 + if (var2 == 0) { // L: 128 + return; // L: 131 } - this.decodeNext(var1, var2); // L: 121 + this.decodeNext(var1, var2); // L: 129 } } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;IB)V", - garbageValue = "42" + descriptor = "(Lnu;II)V", + garbageValue = "2077895253" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 126 + if (var2 == 1) { // L: 134 this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { // L: 127 + } else if (var2 == 2) { // L: 135 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 128 + } else if (var2 == 4) { // L: 136 this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { // L: 129 + } else if (var2 == 5) { // L: 137 this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { // L: 130 + } else if (var2 == 6) { // L: 138 this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 131 - this.offsetX2d = var1.readUnsignedShort(); // L: 132 - if (this.offsetX2d > 32767) { // L: 133 + } else if (var2 == 7) { // L: 139 + this.offsetX2d = var1.readUnsignedShort(); // L: 140 + if (this.offsetX2d > 32767) { // L: 141 this.offsetX2d -= 65536; } - } else if (var2 == 8) { // L: 135 - this.offsetY2d = var1.readUnsignedShort(); // L: 136 - if (this.offsetY2d > 32767) { // L: 137 - this.offsetY2d -= 65536; + } else if (var2 == 8) { // L: 143 + this.offsetY2d = var1.readUnsignedShort(); // L: 144 + if (this.offsetY2d > 32767) { + this.offsetY2d -= 65536; // L: 145 } - } else if (var2 == 11) { // L: 139 + } else if (var2 == 11) { // L: 147 this.isStackable = 1; - } else if (var2 == 12) { // L: 140 + } else if (var2 == 12) { // L: 148 this.price = var1.readInt(); - } else if (var2 == 16) { // L: 141 + } else if (var2 == 16) { // L: 149 this.isMembersOnly = true; - } else if (var2 == 23) { // L: 142 - this.maleModel = var1.readUnsignedShort(); // L: 143 - this.maleOffset = var1.readUnsignedByte(); // L: 144 - } else if (var2 == 24) { // L: 146 + } else if (var2 == 23) { // L: 150 + this.maleModel = var1.readUnsignedShort(); // L: 151 + this.maleOffset = var1.readUnsignedByte(); // L: 152 + } else if (var2 == 24) { // L: 154 this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { // L: 147 - this.femaleModel = var1.readUnsignedShort(); // L: 148 - this.femaleOffset = var1.readUnsignedByte(); // L: 149 - } else if (var2 == 26) { // L: 151 + } else if (var2 == 25) { // L: 155 + this.femaleModel = var1.readUnsignedShort(); // L: 156 + this.femaleOffset = var1.readUnsignedByte(); // L: 157 + } else if (var2 == 26) { // L: 159 this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { // L: 152 - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 153 - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 154 + } else if (var2 >= 30 && var2 < 35) { // L: 160 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 161 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 162 this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { // L: 156 + } else if (var2 >= 35 && var2 < 40) { // L: 164 this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); } else { int var3; int var4; - if (var2 == 40) { // L: 157 - var3 = var1.readUnsignedByte(); // L: 158 - this.recolorFrom = new short[var3]; // L: 159 - this.recolorTo = new short[var3]; // L: 160 + if (var2 == 40) { // L: 165 + var3 = var1.readUnsignedByte(); // L: 166 + this.recolorFrom = new short[var3]; // L: 167 + this.recolorTo = new short[var3]; // L: 168 - for (var4 = 0; var4 < var3; ++var4) { // L: 161 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 162 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 163 + for (var4 = 0; var4 < var3; ++var4) { // L: 169 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 170 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 171 } - } else if (var2 == 41) { // L: 166 - var3 = var1.readUnsignedByte(); // L: 167 - this.retextureFrom = new short[var3]; // L: 168 - this.retextureTo = new short[var3]; // L: 169 + } else if (var2 == 41) { // L: 174 + var3 = var1.readUnsignedByte(); // L: 175 + this.retextureFrom = new short[var3]; // L: 176 + this.retextureTo = new short[var3]; // L: 177 - for (var4 = 0; var4 < var3; ++var4) { // L: 170 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 171 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 172 + for (var4 = 0; var4 < var3; ++var4) { // L: 178 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 179 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 180 } - } else if (var2 == 42) { // L: 175 - this.shiftClickIndex = var1.readByte(); // L: 176 - } else if (var2 == 65) { // L: 178 + } else if (var2 == 42) { // L: 183 + this.shiftClickIndex = var1.readByte(); // L: 184 + } else if (var2 == 65) { // L: 186 this.isTradable = true; - } else if (var2 == 78) { // L: 179 + } else if (var2 == 78) { // L: 187 this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { // L: 180 + } else if (var2 == 79) { // L: 188 this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { // L: 181 + } else if (var2 == 90) { // L: 189 this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { // L: 182 + } else if (var2 == 91) { // L: 190 this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { // L: 183 + } else if (var2 == 92) { // L: 191 this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { // L: 184 + } else if (var2 == 93) { // L: 192 this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 95) { // L: 185 + } else if (var2 == 95) { // L: 193 this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 186 + } else if (var2 == 97) { // L: 194 this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 187 - this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { // L: 188 - if (this.countobj == null) { // L: 189 - this.countobj = new int[10]; // L: 190 - this.countco = new int[10]; // L: 191 + } else if (var2 == 98) { + this.noteTemplate = var1.readUnsignedShort(); // L: 195 + } else if (var2 >= 100 && var2 < 110) { // L: 196 + if (this.countobj == null) { // L: 197 + this.countobj = new int[10]; // L: 198 + this.countco = new int[10]; // L: 199 } - this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 193 - this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 194 - } else if (var2 == 110) { // L: 196 + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 201 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 202 + } else if (var2 == 110) { // L: 204 this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { // L: 197 + } else if (var2 == 111) { // L: 205 this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { // L: 198 + } else if (var2 == 112) { // L: 206 this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { // L: 199 + } else if (var2 == 113) { // L: 207 this.ambient = var1.readByte(); - } else if (var2 == 114) { // L: 200 + } else if (var2 == 114) { // L: 208 this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { // L: 201 + } else if (var2 == 115) { // L: 209 this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { // L: 202 + } else if (var2 == 139) { // L: 210 this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { // L: 203 + } else if (var2 == 140) { // L: 211 this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { // L: 204 + } else if (var2 == 148) { // L: 212 this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { // L: 205 + } else if (var2 == 149) { // L: 213 this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { // L: 206 - this.params = TextureProvider.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 214 + this.params = class105.readStringIntParameters(var1, this.params); } } - } // L: 208 + } // L: 216 - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;I)V", - garbageValue = "1798328013" + descriptor = "(Lko;Lko;I)V", + garbageValue = "-653906195" ) @Export("genCert") void genCert(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 211 - this.zoom2d = var1.zoom2d; // L: 212 - this.xan2d = var1.xan2d; // L: 213 - this.yan2d = var1.yan2d; // L: 214 - this.zan2d = var1.zan2d; // L: 215 - this.offsetX2d = var1.offsetX2d; // L: 216 - this.offsetY2d = var1.offsetY2d; // L: 217 - this.recolorFrom = var1.recolorFrom; // L: 218 - this.recolorTo = var1.recolorTo; // L: 219 - this.retextureFrom = var1.retextureFrom; // L: 220 - this.retextureTo = var1.retextureTo; // L: 221 - this.name = var2.name; // L: 222 - this.isMembersOnly = var2.isMembersOnly; // L: 223 - this.price = var2.price; // L: 224 - this.isStackable = 1; // L: 225 - } // L: 226 + this.model = var1.model; // L: 219 + this.zoom2d = var1.zoom2d; // L: 220 + this.xan2d = var1.xan2d; // L: 221 + this.yan2d = var1.yan2d; // L: 222 + this.zan2d = var1.zan2d; // L: 223 + this.offsetX2d = var1.offsetX2d; // L: 224 + this.offsetY2d = var1.offsetY2d; // L: 225 + this.recolorFrom = var1.recolorFrom; // L: 226 + this.recolorTo = var1.recolorTo; // L: 227 + this.retextureFrom = var1.retextureFrom; // L: 228 + this.retextureTo = var1.retextureTo; // L: 229 + this.name = var2.name; // L: 230 + this.isMembersOnly = var2.isMembersOnly; // L: 231 + this.price = var2.price; // L: 232 + this.isStackable = 1; // L: 233 + } // L: 234 - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;I)V", - garbageValue = "962521022" + descriptor = "(Lko;Lko;B)V", + garbageValue = "77" ) @Export("genBought") void genBought(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 229 - this.zoom2d = var1.zoom2d; // L: 230 - this.xan2d = var1.xan2d; // L: 231 - this.yan2d = var1.yan2d; // L: 232 - this.zan2d = var1.zan2d; // L: 233 - this.offsetX2d = var1.offsetX2d; // L: 234 - this.offsetY2d = var1.offsetY2d; // L: 235 - this.recolorFrom = var2.recolorFrom; // L: 236 - this.recolorTo = var2.recolorTo; // L: 237 - this.retextureFrom = var2.retextureFrom; // L: 238 - this.retextureTo = var2.retextureTo; // L: 239 - this.name = var2.name; // L: 240 - this.isMembersOnly = var2.isMembersOnly; // L: 241 - this.isStackable = var2.isStackable; // L: 242 - this.maleModel = var2.maleModel; // L: 243 - this.maleModel1 = var2.maleModel1; // L: 244 - this.maleModel2 = var2.maleModel2; // L: 245 - this.femaleModel = var2.femaleModel; // L: 246 - this.femaleModel1 = var2.femaleModel1; // L: 247 - this.femaleModel2 = var2.femaleModel2; // L: 248 - this.maleHeadModel = var2.maleHeadModel; // L: 249 - this.maleHeadModel2 = var2.maleHeadModel2; // L: 250 - this.femaleHeadModel = var2.femaleHeadModel; // L: 251 - this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 252 - this.team = var2.team; // L: 253 - this.groundActions = var2.groundActions; // L: 254 - this.inventoryActions = new String[5]; // L: 255 - if (var2.inventoryActions != null) { // L: 256 + this.model = var1.model; // L: 237 + this.zoom2d = var1.zoom2d; // L: 238 + this.xan2d = var1.xan2d; // L: 239 + this.yan2d = var1.yan2d; // L: 240 + this.zan2d = var1.zan2d; // L: 241 + this.offsetX2d = var1.offsetX2d; // L: 242 + this.offsetY2d = var1.offsetY2d; // L: 243 + this.recolorFrom = var2.recolorFrom; // L: 244 + this.recolorTo = var2.recolorTo; // L: 245 + this.retextureFrom = var2.retextureFrom; // L: 246 + this.retextureTo = var2.retextureTo; // L: 247 + this.name = var2.name; // L: 248 + this.isMembersOnly = var2.isMembersOnly; // L: 249 + this.isStackable = var2.isStackable; // L: 250 + this.maleModel = var2.maleModel; // L: 251 + this.maleModel1 = var2.maleModel1; // L: 252 + this.maleModel2 = var2.maleModel2; // L: 253 + this.femaleModel = var2.femaleModel; // L: 254 + this.femaleModel1 = var2.femaleModel1; // L: 255 + this.femaleModel2 = var2.femaleModel2; // L: 256 + this.maleHeadModel = var2.maleHeadModel; // L: 257 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 258 + this.femaleHeadModel = var2.femaleHeadModel; // L: 259 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 260 + this.team = var2.team; // L: 261 + this.groundActions = var2.groundActions; // L: 262 + this.inventoryActions = new String[5]; // L: 263 + if (var2.inventoryActions != null) { // L: 264 for (int var3 = 0; var3 < 4; ++var3) { this.inventoryActions[var3] = var2.inventoryActions[var3]; } } - this.inventoryActions[4] = "Discard"; // L: 257 - this.price = 0; // L: 258 - } // L: 259 + this.inventoryActions[4] = "Discard"; // L: 265 + this.price = 0; // L: 266 + } // L: 267 - @ObfuscatedName("z") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljj;Ljj;I)V", - garbageValue = "-1559307147" + descriptor = "(Lko;Lko;B)V", + garbageValue = "26" ) @Export("genPlaceholder") void genPlaceholder(ItemComposition var1, ItemComposition var2) { - this.model = var1.model; // L: 262 - this.zoom2d = var1.zoom2d; // L: 263 - this.xan2d = var1.xan2d; // L: 264 - this.yan2d = var1.yan2d; // L: 265 - this.zan2d = var1.zan2d; // L: 266 - this.offsetX2d = var1.offsetX2d; // L: 267 - this.offsetY2d = var1.offsetY2d; // L: 268 - this.recolorFrom = var1.recolorFrom; // L: 269 - this.recolorTo = var1.recolorTo; // L: 270 - this.retextureFrom = var1.retextureFrom; // L: 271 - this.retextureTo = var1.retextureTo; // L: 272 - this.isStackable = var1.isStackable; // L: 273 - this.name = var2.name; // L: 274 - this.price = 0; // L: 275 - this.isMembersOnly = false; // L: 276 - this.isTradable = false; // L: 277 - } // L: 278 + this.model = var1.model; // L: 270 + this.zoom2d = var1.zoom2d; // L: 271 + this.xan2d = var1.xan2d; // L: 272 + this.yan2d = var1.yan2d; // L: 273 + this.zan2d = var1.zan2d; // L: 274 + this.offsetX2d = var1.offsetX2d; // L: 275 + this.offsetY2d = var1.offsetY2d; // L: 276 + this.recolorFrom = var1.recolorFrom; // L: 277 + this.recolorTo = var1.recolorTo; // L: 278 + this.retextureFrom = var1.retextureFrom; // L: 279 + this.retextureTo = var1.retextureTo; // L: 280 + this.isStackable = var1.isStackable; // L: 281 + this.name = var2.name; // L: 282 + this.price = 0; // L: 283 + this.isMembersOnly = false; // L: 284 + this.isTradable = false; // L: 285 + } // L: 286 - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)Lek;", - garbageValue = "-1144241920" + descriptor = "(II)Lfs;", + garbageValue = "427827068" ) @Export("getModelData") public final ModelData getModelData(int var1) { int var3; - if (this.countobj != null && var1 > 1) { // L: 281 - int var2 = -1; // L: 282 + if (this.countobj != null && var1 > 1) { // L: 289 + int var2 = -1; // L: 290 - for (var3 = 0; var3 < 10; ++var3) { // L: 283 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 284 + for (var3 = 0; var3 < 10; ++var3) { // L: 291 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 292 var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 286 - return class281.ItemDefinition_get(var2).getModelData(1); + if (var2 != -1) { // L: 294 + return class23.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, this.model, 0); // L: 288 - if (var4 == null) { // L: 289 + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 296 + if (var4 == null) { // L: 297 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 290 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 298 var4.resize(this.resizeX, this.resizeY, this.resizeZ); } - if (this.recolorFrom != null) { // L: 291 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 292 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 293 + if (this.recolorFrom != null) { // L: 299 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 300 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 301 } } - if (this.retextureFrom != null) { // L: 296 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 297 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 298 + if (this.retextureFrom != null) { // L: 304 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 305 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 306 } } - return var4; // L: 301 + return var4; // L: 309 } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Lef;", - garbageValue = "-2139436436" + descriptor = "(IB)Lgv;", + garbageValue = "100" ) @Export("getModel") public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { // L: 305 - int var2 = -1; // L: 306 + if (this.countobj != null && var1 > 1) { // L: 313 + int var2 = -1; // L: 314 - for (int var3 = 0; var3 < 10; ++var3) { // L: 307 - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 308 + for (int var3 = 0; var3 < 10; ++var3) { // L: 315 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 316 var2 = this.countobj[var3]; } } - if (var2 != -1) { // L: 310 - return class281.ItemDefinition_get(var2).getModel(1); + if (var2 != -1) { // L: 318 + return class23.ItemDefinition_get(var2).getModel(1); } } - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 312 - if (var5 != null) { // L: 313 + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 320 + if (var5 != null) { // L: 321 return var5; } else { - ModelData var6 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, this.model, 0); // L: 314 - if (var6 == null) { // L: 315 + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 322 + if (var6 == null) { // L: 323 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 316 + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 324 var6.resize(this.resizeX, this.resizeY, this.resizeZ); } int var4; - if (this.recolorFrom != null) { // L: 317 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 318 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 319 + if (this.recolorFrom != null) { // L: 325 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 326 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 327 } } - if (this.retextureFrom != null) { // L: 322 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 323 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 324 + if (this.retextureFrom != null) { // L: 330 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 331 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 332 } } - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 327 - var5.isSingleTile = true; // L: 328 - ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 329 - return var5; // L: 330 + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 335 + var5.isSingleTile = true; // L: 336 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 337 + return var5; // L: 338 } } } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(II)Ljj;", - garbageValue = "-309156519" + descriptor = "(II)Lko;", + garbageValue = "-922143531" ) @Export("getCountObj") public ItemComposition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { // L: 334 - int var2 = -1; // L: 335 + if (this.countobj != null && var1 > 1) { // L: 342 + int var2 = -1; // L: 343 - for (int var3 = 0; var3 < 10; ++var3) { // L: 336 + for (int var3 = 0; var3 < 10; ++var3) { // L: 344 if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; // L: 337 + var2 = this.countobj[var3]; // L: 345 } } - if (var2 != -1) { // L: 339 - return class281.ItemDefinition_get(var2); + if (var2 != -1) { // L: 347 + return class23.ItemDefinition_get(var2); } } - return this; // L: 341 + return this; // L: 349 } - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-240048838" + garbageValue = "-1651986730" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; // L: 419 - int var3 = this.maleModel1; // L: 420 - int var4 = this.maleModel2; // L: 421 - if (var1) { // L: 422 - var2 = this.femaleModel; // L: 423 - var3 = this.femaleModel1; // L: 424 - var4 = this.femaleModel2; // L: 425 + int var2 = this.maleModel; // L: 434 + int var3 = this.maleModel1; // L: 435 + int var4 = this.maleModel2; // L: 436 + if (var1) { // L: 437 + var2 = this.femaleModel; // L: 438 + var3 = this.femaleModel1; // L: 439 + var4 = this.femaleModel2; // L: 440 } - if (var2 == -1) { // L: 427 + if (var2 == -1) { // L: 442 return true; } else { - boolean var5 = true; // L: 428 - if (!class8.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 429 + boolean var5 = true; // L: 443 + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 444 var5 = false; } - if (var3 != -1 && !class8.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 430 + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 445 var5 = false; } - if (var4 != -1 && !class8.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 431 + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 446 var5 = false; } - return var5; // L: 432 + return var5; // L: 447 } } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZI)Lek;", - garbageValue = "-324147139" + descriptor = "(ZI)Lfs;", + garbageValue = "-1860444775" ) - public final ModelData method4866(boolean var1) { - int var2 = this.maleModel; // L: 436 - int var3 = this.maleModel1; // L: 437 - int var4 = this.maleModel2; // L: 438 - if (var1) { // L: 439 - var2 = this.femaleModel; // L: 440 - var3 = this.femaleModel1; // L: 441 - var4 = this.femaleModel2; // L: 442 + public final ModelData method5280(boolean var1) { + int var2 = this.maleModel; // L: 451 + int var3 = this.maleModel1; // L: 452 + int var4 = this.maleModel2; // L: 453 + if (var1) { // L: 454 + var2 = this.femaleModel; // L: 455 + var3 = this.femaleModel1; // L: 456 + var4 = this.femaleModel2; // L: 457 } - if (var2 == -1) { // L: 444 + if (var2 == -1) { // L: 459 return null; } else { - ModelData var5 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, var2, 0); // L: 445 - if (var3 != -1) { // L: 446 - ModelData var6 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, var3, 0); // L: 447 - if (var4 != -1) { // L: 448 - ModelData var7 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, var4, 0); // L: 449 - ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 450 - var5 = new ModelData(var8, 3); // L: 451 + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 460 + if (var3 != -1) { // L: 461 + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 462 + if (var4 != -1) { // L: 463 + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 464 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 465 + var5 = new ModelData(var8, 3); // L: 466 } else { - ModelData[] var10 = new ModelData[]{var5, var6}; // L: 454 - var5 = new ModelData(var10, 2); // L: 455 + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 469 + var5 = new ModelData(var10, 2); // L: 470 } } - if (!var1 && this.maleOffset != 0) { // L: 458 + if (!var1 && this.maleOffset != 0) { // L: 473 var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { // L: 459 + if (var1 && this.femaleOffset != 0) { // L: 474 var5.changeOffset(0, this.femaleOffset, 0); } int var9; - if (this.recolorFrom != null) { // L: 460 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 461 - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 462 + if (this.recolorFrom != null) { // L: 475 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 476 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 477 } } - if (this.retextureFrom != null) { // L: 465 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 466 - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 467 + if (this.retextureFrom != null) { // L: 480 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 481 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 482 } } - return var5; // L: 470 + return var5; // L: 485 } } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(ZI)Z", - garbageValue = "-1270984011" + descriptor = "(ZB)Z", + garbageValue = "7" ) - public final boolean method4879(boolean var1) { - int var2 = this.maleHeadModel; // L: 474 - int var3 = this.maleHeadModel2; // L: 475 - if (var1) { // L: 476 - var2 = this.femaleHeadModel; // L: 477 - var3 = this.femaleHeadModel2; // L: 478 + public final boolean method5237(boolean var1) { + int var2 = this.maleHeadModel; // L: 489 + int var3 = this.maleHeadModel2; // L: 490 + if (var1) { // L: 491 + var2 = this.femaleHeadModel; // L: 492 + var3 = this.femaleHeadModel2; // L: 493 } - if (var2 == -1) { // L: 480 + if (var2 == -1) { // L: 495 return true; } else { - boolean var4 = true; // L: 481 - if (!class8.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 482 + boolean var4 = true; // L: 496 + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 497 var4 = false; } - if (var3 != -1 && !class8.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 483 + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 498 var4 = false; } - return var4; // L: 484 + return var4; // L: 499 } } - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ZB)Lek;", - garbageValue = "51" + descriptor = "(ZI)Lfs;", + garbageValue = "1524344527" ) - public final ModelData method4880(boolean var1) { - int var2 = this.maleHeadModel; // L: 488 - int var3 = this.maleHeadModel2; // L: 489 - if (var1) { // L: 490 - var2 = this.femaleHeadModel; // L: 491 - var3 = this.femaleHeadModel2; // L: 492 + public final ModelData method5238(boolean var1) { + int var2 = this.maleHeadModel; // L: 503 + int var3 = this.maleHeadModel2; // L: 504 + if (var1) { // L: 505 + var2 = this.femaleHeadModel; // L: 506 + var3 = this.femaleHeadModel2; // L: 507 } - if (var2 == -1) { // L: 494 + if (var2 == -1) { // L: 509 return null; } else { - ModelData var4 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, var2, 0); // L: 495 - if (var3 != -1) { // L: 496 - ModelData var5 = ModelData.ModelData_get(class8.ItemDefinition_modelArchive, var3, 0); // L: 497 - ModelData[] var6 = new ModelData[]{var4, var5}; // L: 498 - var4 = new ModelData(var6, 2); // L: 499 + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 510 + if (var3 != -1) { // L: 511 + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 512 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 513 + var4 = new ModelData(var6, 2); // L: 514 } int var7; - if (this.recolorFrom != null) { // L: 501 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 502 - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 503 + if (this.recolorFrom != null) { // L: 516 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 517 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 518 } } - if (this.retextureFrom != null) { // L: 506 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 507 - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 508 + if (this.retextureFrom != null) { // L: 521 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 522 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 523 } } - return var4; // L: 511 + return var4; // L: 526 } } - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIB)I", - garbageValue = "-45" + garbageValue = "1" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 516 + IterableNodeHashTable var4 = this.params; // L: 531 int var3; - if (var4 == null) { // L: 518 - var3 = var2; // L: 519 + if (var4 == null) { // L: 533 + var3 = var2; // L: 534 } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 522 - if (var5 == null) { // L: 523 - var3 = var2; // L: 524 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 537 + if (var5 == null) { // L: 538 + var3 = var2; // L: 539 } else { - var3 = var5.integer; // L: 527 + var3 = var5.integer; // L: 542 } } - return var3; // L: 529 + return var3; // L: 544 } - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1156032782" + descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "-299" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class69.method1258(this.params, var1, var2); // L: 533 + IterableNodeHashTable var4 = this.params; // L: 549 + String var3; + if (var4 == null) { // L: 551 + var3 = var2; // L: 552 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 555 + if (var5 == null) { // L: 556 + var3 = var2; // L: 557 + } else { + var3 = (String)var5.obj; // L: 560 + } + } + + return var3; // L: 562 } - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "47" + descriptor = "(I)I", + garbageValue = "415969206" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 537 - if (this.shiftClickIndex >= 0) { // L: 538 - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1210205769 * -1719700473 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 566 + if (this.shiftClickIndex >= 0) { // L: 567 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 807586131 * 1487168219 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 539 + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 568 } } else { return -1; diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 0845f56a00..16ce06f69d 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -3,19 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("cu") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("v") + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("headIconPkSprites") + static SpritePixels[] headIconPkSprites; + @ObfuscatedName("o") @Export("ids") int[] ids; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("quantities") int[] quantities; @@ -28,142 +40,93 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; // L: 9 } // L: 11 - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(CLgp;S)C", - garbageValue = "-10976" + descriptor = "([BIIB)Z", + garbageValue = "-116" ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { // L: 117 - if (var0 >= 192 && var0 <= 198) { // L: 118 - return 'A'; + static final boolean method2092(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 181 + Buffer var4 = new Buffer(var0); // L: 182 + int var5 = -1; // L: 183 + + label72: + while (true) { + int var6 = var4.method6595(); // L: 185 + if (var6 == 0) { // L: 186 + return var3; // L: 217 } - if (var0 == 199) { // L: 119 - return 'C'; - } + var5 += var6; // L: 187 + int var7 = 0; // L: 188 + boolean var8 = false; // L: 189 - if (var0 >= 200 && var0 <= 203) { // L: 120 - return 'E'; - } + while (true) { + int var9; + while (!var8) { // L: 191 + var9 = var4.readUShortSmart(); // L: 197 + if (var9 == 0) { // L: 198 + continue label72; + } - if (var0 >= 204 && var0 <= 207) { // L: 121 - return 'I'; - } + var7 += var9 - 1; // L: 199 + int var10 = var7 & 63; // L: 200 + int var11 = var7 >> 6 & 63; // L: 201 + int var12 = var4.readUnsignedByte() >> 2; // L: 202 + int var13 = var11 + var1; // L: 203 + int var14 = var10 + var2; // L: 204 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 205 + ObjectComposition var15 = class19.getObjectDefinition(var5); // L: 206 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 207 + if (!var15.needsModelFiles()) { // L: 208 + ++Client.field657; // L: 209 + var3 = false; // L: 210 + } - if (var0 == 209 && var1 != Language.Language_ES) { // L: 122 - return 'N'; - } + var8 = true; // L: 212 + } + } + } - if (var0 >= 210 && var0 <= 214) { // L: 123 - return 'O'; - } + var9 = var4.readUShortSmart(); // L: 192 + if (var9 == 0) { // L: 193 + break; + } - if (var0 >= 217 && var0 <= 220) { // L: 124 - return 'U'; + var4.readUnsignedByte(); // L: 194 } - - if (var0 == 221) { // L: 125 - return 'Y'; - } - - if (var0 == 223) { // L: 126 - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { // L: 127 - return 'a'; - } - - if (var0 == 231) { // L: 128 - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { // L: 129 - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { // L: 130 - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { // L: 131 - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { // L: 132 - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { // L: 133 - return 'u'; - } - - if (var0 == 253 || var0 == 255) { // L: 134 - return 'y'; - } - } - - if (var0 == 338) { // L: 136 - return 'O'; - } else if (var0 == 339) { // L: 137 - return 'o'; - } else if (var0 == 376) { // L: 138 - return 'Y'; - } else { - return var0; // L: 139 } } - @ObfuscatedName("eu") + @ObfuscatedName("fi") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "752478045" + descriptor = "(IB)V", + garbageValue = "87" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { // L: 1033 - if (Client.gameState == 0) { // L: 1034 - class1.client.method1078(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1035 - Client.loginState = 0; // L: 1036 - Client.field696 = 0; // L: 1037 - Client.field786 = 0; // L: 1038 - Client.timer.method5211(var0); // L: 1039 - if (var0 != 20) { // L: 1040 - class23.method234(false); - } - } - - if (var0 != 20 && var0 != 40 && UserComparator6.field2008 != null) { // L: 1042 1043 - UserComparator6.field2008.close(); // L: 1044 - UserComparator6.field2008 = null; // L: 1045 - } - - if (Client.gameState == 25) { // L: 1048 - Client.field720 = 0; // L: 1049 - Client.field785 = 0; // L: 1050 - Client.field717 = 1; // L: 1051 - Client.field718 = 0; // L: 1052 - Client.field719 = 1; // L: 1053 - } - - if (var0 != 5 && var0 != 10) { // L: 1055 - if (var0 == 20) { // L: 1058 - class69.method1255(LoginScreenAnimation.archive10, ModeWhere.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1059 - } else if (var0 == 11) { // L: 1061 - class69.method1255(LoginScreenAnimation.archive10, ModeWhere.archive8, false, 4); // L: 1062 - } else { - WorldMapLabel.method499(); // L: 1064 - } - } else { - class69.method1255(LoginScreenAnimation.archive10, ModeWhere.archive8, true, 0); // L: 1056 - } - - Client.gameState = var0; // L: 1065 + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + class23.logOut(); // L: 2365 + switch(var0) { // L: 2366 + case 1: + Login.loginIndex = 24; // L: 2370 + class9.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2371 + break; + case 2: + class10.method129(); // L: 2377 } - } // L: 1066 + + } // L: 2381 + + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-217021781" + ) + static void method2093() { + PacketBufferNode var0 = ObjectComposition.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); // L: 3613 + var0.packetBuffer.writeByte(WorldMapScaleHandler.getWindowedMode()); // L: 3614 + var0.packetBuffer.writeShort(InterfaceParent.canvasWidth); // L: 3615 + var0.packetBuffer.writeShort(GameEngine.canvasHeight); // L: 3616 + Client.packetWriter.addNode(var0); // L: 3617 + } // L: 3618 } diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java index 5ff76c94fc..c9fc9d8ffb 100644 --- a/runescape-client/src/main/java/ItemLayer.java +++ b/runescape-client/src/main/java/ItemLayer.java @@ -4,72 +4,231 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("fk") @Implements("ItemLayer") public final class ItemLayer { - @ObfuscatedName("bl") + @ObfuscatedName("tm") @ObfuscatedGetter( - intValue = 1549080399 + intValue = 1448149945 ) - static int field1562; - @ObfuscatedName("n") + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("gv") @ObfuscatedGetter( - intValue = -208446657 + intValue = -761869701 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 765081793 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 879742501 + intValue = -1863896899 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 734392269 + intValue = 1265231529 ) @Export("y") int y; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("first") Renderable first; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("second") Renderable second; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("third") Renderable third; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = -6966472749415094835L + longValue = 9107611929187585679L ) @Export("tag") long tag; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1439885111 + intValue = 777440775 ) @Export("height") int height; ItemLayer() { - } // L: 13 + } - @ObfuscatedName("e") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-81" + descriptor = "(Lir;Lir;IZI)Lfb;", + garbageValue = "1187690117" ) - public static void method2938() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 155 - } // L: 156 + @Export("loadFrames") + public static Frames loadFrames(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; // L: 11 + int[] var5 = var0.getGroupFileIds(var2); // L: 12 + + for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 + byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 + if (var7 == null) { // L: 15 + var4 = false; // L: 16 + } else { + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; + byte[] var9; + if (var3) { // L: 21 + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); // L: 22 + } + + if (var9 == null) { + var4 = false; + } + } + } + + if (!var4) { + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { // L: 29 + return null; // L: 30 + } + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)[Lgg;", + garbageValue = "746692675" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2370, ServerPacket.field2351, ServerPacket.field2431, ServerPacket.field2353, ServerPacket.field2354, ServerPacket.field2355, ServerPacket.field2356, ServerPacket.field2357, ServerPacket.field2358, ServerPacket.field2359, ServerPacket.field2432, ServerPacket.field2426, ServerPacket.field2362, ServerPacket.field2363, ServerPacket.field2422, ServerPacket.field2380, ServerPacket.field2366, ServerPacket.field2364, ServerPacket.field2368, ServerPacket.field2369, ServerPacket.field2352, ServerPacket.field2433, ServerPacket.field2367, ServerPacket.field2373, ServerPacket.field2374, ServerPacket.field2428, ServerPacket.field2376, ServerPacket.field2377, ServerPacket.field2378, ServerPacket.field2379, ServerPacket.field2393, ServerPacket.field2392, ServerPacket.field2446, ServerPacket.field2383, ServerPacket.field2384, ServerPacket.field2385, ServerPacket.field2361, ServerPacket.field2387, ServerPacket.field2409, ServerPacket.field2382, ServerPacket.field2413, ServerPacket.field2391, ServerPacket.field2375, ServerPacket.field2372, ServerPacket.field2388, ServerPacket.field2436, ServerPacket.field2396, ServerPacket.field2390, ServerPacket.field2398, ServerPacket.field2399, ServerPacket.field2400, ServerPacket.field2401, ServerPacket.field2402, ServerPacket.field2403, ServerPacket.field2394, ServerPacket.field2405, ServerPacket.field2406, ServerPacket.field2407, ServerPacket.field2408, ServerPacket.field2448, ServerPacket.field2410, ServerPacket.field2411, ServerPacket.field2412, ServerPacket.field2381, ServerPacket.field2414, ServerPacket.field2415, ServerPacket.field2371, ServerPacket.field2417, ServerPacket.field2418, ServerPacket.field2419, ServerPacket.field2395, ServerPacket.field2421, ServerPacket.field2386, ServerPacket.field2423, ServerPacket.field2424, ServerPacket.field2425, ServerPacket.field2416, ServerPacket.field2427, ServerPacket.field2404, ServerPacket.field2350, ServerPacket.field2365, ServerPacket.field2434, ServerPacket.field2430, ServerPacket.field2360, ServerPacket.field2397, ServerPacket.field2435, ServerPacket.field2429, ServerPacket.field2437, ServerPacket.field2438, ServerPacket.field2439, ServerPacket.field2389, ServerPacket.field2441, ServerPacket.field2442, ServerPacket.field2443, ServerPacket.field2444, ServerPacket.field2445, ServerPacket.field2440}; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;B)V", + garbageValue = "-52" + ) + public static void method3268(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; // L: 18 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 + } // L: 20 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Lim;", + garbageValue = "21" + ) + public static GameBuild method3270(int var0) { + GameBuild[] var1 = class23.method344(); // L: 23 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24 + GameBuild var3 = var1[var2]; // L: 25 + if (var0 == var3.buildId) { + return var3; // L: 27 + } + } + + return null; // L: 31 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1891094165" + ) + static void method3271() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 42 + if (ArchiveDiskActionHandler.field3239 == 0) { // L: 43 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 44 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 45 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 46 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 47 + } + + ArchiveDiskActionHandler.field3239 = 600; // L: 49 + } + } // L: 51 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;II)I", + garbageValue = "-1650238788" + ) + public static int method3273(CharSequence var0, int var1) { + if (var1 >= 2 && var1 <= 36) { // L: 103 + boolean var3 = false; // L: 104 + boolean var4 = false; // L: 105 + int var5 = 0; // L: 106 + int var6 = var0.length(); // L: 107 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 108 + char var8 = var0.charAt(var7); // L: 109 + if (var7 == 0) { // L: 110 + if (var8 == '-') { // L: 111 + var3 = true; // L: 112 + continue; + } + + if (var8 == '+') { // L: 115 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 117 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 118 + var10 = var8 - '7'; + } else { + if (var8 < 'a' || var8 > 'z') { // L: 119 + throw new NumberFormatException(); // L: 120 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 121 + throw new NumberFormatException(); + } + + if (var3) { // L: 122 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 123 + if (var9 / var1 != var5) { // L: 124 + throw new NumberFormatException(); + } + + var5 = var9; // L: 125 + var4 = true; // L: 126 + } + + if (!var4) { // L: 128 + throw new NumberFormatException(); + } else { + return var5; // L: 131 + } + } else { + throw new IllegalArgumentException("" + var1); + } + } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 0d76aa9b07..aeeff15c9b 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,18 +4,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jw") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgj;)V" + descriptor = "(Lmz;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; // L: 26 } // L: 27 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lgj;" + descriptor = "()Lmz;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lgj;" + descriptor = "()Lmz;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); // L: 45 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lgj;)Lgj;" + descriptor = "(Lmz;)Lmz;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lgj;" + descriptor = "()Lmz;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgj;Lgj;)V" + descriptor = "(Lmz;Lmz;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 66a497b426..b571898c83 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,30 +4,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jm") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljw;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("head") DualNode head; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgj;" + descriptor = "Lmz;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Ljf;)V" + descriptor = "(Ljw;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; // L: 9 @@ -50,8 +50,12 @@ public class IterableDualNodeQueueIterator implements Iterator { } public void remove() { - this.last.removeDual(); // L: 34 - this.last = null; // L: 35 + if (this.last == null) { // L: 33 + throw new IllegalStateException(); + } else { + this.last.removeDual(); // L: 34 + this.last = null; // L: 35 + } } // L: 36 public boolean hasNext() { diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index a42d26e64b..414deb562e 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,20 +5,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jc") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) - Node field3568; + Node field3385; public IterableNodeDeque() { this.sentinel = new Node(); // L: 7 @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; // L: 12 } // L: 13 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { // L: 16 @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lga;)V" + descriptor = "(Lmh;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 26 } // L: 27 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lga;)V" + descriptor = "(Lmh;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; // L: 34 } // L: 35 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("last") public Node last() { - return this.method5062((Node)null); // L: 46 + return this.method4788((Node)null); // L: 46 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lga;)Lga;" + descriptor = "(Lmh;)Lmh;" ) - Node method5062(Node var1) { + Node method4788(Node var1) { Node var2; if (var1 == null) { // L: 51 var2 = this.sentinel.previous; @@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection { } if (var2 == this.sentinel) { // L: 53 - this.field3568 = null; // L: 54 + this.field3385 = null; // L: 54 return null; // L: 55 } else { - this.field3568 = var2.previous; // L: 57 + this.field3385 = var2.previous; // L: 57 return var2; // L: 58 } } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("previous") public Node previous() { - Node var1 = this.field3568; // L: 62 + Node var1 = this.field3385; // L: 62 if (var1 == this.sentinel) { // L: 63 - this.field3568 = null; // L: 64 + this.field3385 = null; // L: 64 return null; // L: 65 } else { - this.field3568 = var1.previous; // L: 67 + this.field3385 = var1.previous; // L: 67 return var1; // L: 68 } } - @ObfuscatedName("e") - int method5063() { + @ObfuscatedName("g") + int method4826() { int var1 = 0; // L: 72 for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 @@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 78 } - @ObfuscatedName("q") - public boolean method5064() { + @ObfuscatedName("h") + public boolean method4787() { return this.sentinel.previous == this.sentinel; // L: 82 } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()[Lga;" + descriptor = "()[Lmh;" ) - Node[] method5034() { - Node[] var1 = new Node[this.method5063()]; // L: 86 + Node[] method4833() { + Node[] var1 = new Node[this.method4826()]; // L: 86 int var2 = 0; // L: 87 for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 @@ -144,11 +144,11 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 93 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lga;)Z" + descriptor = "(Lmh;)Z" ) - boolean method5037(Node var1) { + boolean method4791(Node var1) { this.addFirst(var1); // L: 127 return true; // L: 128 } @@ -157,12 +157,52 @@ public class IterableNodeDeque implements Iterable, Collection { return new IterableNodeDequeDescendingIterator(this); // L: 97 } + public int size() { + return this.method4826(); // L: 101 + } + + public boolean isEmpty() { + return this.method4787(); // L: 105 + } + + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 132 + } + public boolean contains(Object var1) { throw new RuntimeException(); // L: 109 } + public boolean addAll(Collection var1) { + throw new RuntimeException(); // L: 140 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 144 + } + + public void clear() { + this.rsClear(); // L: 152 + } // L: 153 + + public boolean equals(Object var1) { + return super.equals(var1); // L: 160 + } + + public int hashCode() { + return super.hashCode(); // L: 164 + } + + public boolean add(Object var1) { + return this.method4791((Node)var1); // L: 156 + } + public Object[] toArray() { - return this.method5034(); // L: 113 + return this.method4833(); // L: 113 + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); // L: 148 } public Object[] toArray(Object[] var1) { @@ -175,53 +215,13 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; // L: 123 } - public boolean remove(Object var1) { - throw new RuntimeException(); // L: 132 - } - public boolean containsAll(Collection var1) { throw new RuntimeException(); // L: 136 } - public boolean removeAll(Collection var1) { - throw new RuntimeException(); // L: 144 - } - - public boolean equals(Object var1) { - return super.equals(var1); // L: 160 - } - - public int hashCode() { - return super.hashCode(); // L: 164 - } - - public int size() { - return this.method5063(); // L: 101 - } - - public boolean add(Object var1) { - return this.method5037((Node)var1); // L: 156 - } - - public boolean addAll(Collection var1) { - throw new RuntimeException(); // L: 140 - } - - public boolean isEmpty() { - return this.method5064(); // L: 105 - } - - public void clear() { - this.rsClear(); // L: 152 - } // L: 153 - - public boolean retainAll(Collection var1) { - throw new RuntimeException(); // L: 148 - } - - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lga;Lga;)V" + descriptor = "(Lmh;Lmh;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 5884e2af79..08108f760c 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,38 +4,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jx") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljc;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) - Node field3578; - @ObfuscatedName("d") + Node field3383; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Ljv;)V" + descriptor = "(Ljc;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; // L: 9 this.setDeque(var1); // L: 12 } // L: 13 - @ObfuscatedName("e") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljv;)V" + descriptor = "(Ljc;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,30 +43,13 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); // L: 17 } // L: 18 - @ObfuscatedName("q") + @ObfuscatedName("o") @Export("start") void start() { - this.field3578 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.field3383 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 this.last = null; // L: 22 } // L: 23 - public Object next() { - Node var1 = this.field3578; // L: 26 - if (var1 == this.deque.sentinel) { // L: 27 - var1 = null; // L: 28 - this.field3578 = null; // L: 29 - } else { - this.field3578 = var1.previous; // L: 31 - } - - this.last = var1; // L: 32 - return var1; // L: 33 - } - - public boolean hasNext() { - return this.deque.sentinel != this.field3578; // L: 37 - } - public void remove() { if (this.last == null) { // L: 41 throw new IllegalStateException(); @@ -75,4 +58,21 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.last = null; // L: 43 } } // L: 44 + + public boolean hasNext() { + return this.deque.sentinel != this.field3383; // L: 37 + } + + public Object next() { + Node var1 = this.field3383; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field3383 = null; // L: 29 + } else { + this.field3383 = var1.previous; // L: 31 + } + + this.last = var1; // L: 32 + return var1; // L: 33 + } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index b329b89ab9..af24668c05 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,31 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("me") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("size") int size; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lga;" + descriptor = "[Lmh;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("current") Node current; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } // L: 21 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(J)Lga;" + descriptor = "(J)Lmh;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; // L: 35 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lga;J)V" + descriptor = "(Lmh;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable { var1.key = var2; // L: 45 } // L: 46 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("clear") public void clear() { for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 @@ -103,9 +103,9 @@ public final class IterableNodeHashTable implements Iterable { this.current = null; // L: 58 } // L: 59 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); // L: 63 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index a585ed4568..caa96f2b7d 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,33 +4,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("mq") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("head") Node head; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("index") int index; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Llg;)V" + descriptor = "(Lme;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; // L: 10 @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); // L: 14 } // L: 15 - @ObfuscatedName("e") + @ObfuscatedName("f") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; // L: 18 @@ -46,28 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; // L: 20 } // L: 21 - public Object next() { - Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 - var1 = this.head; // L: 25 - this.head = var1.previous; // L: 26 - this.last = var1; // L: 27 - return var1; // L: 28 - } else { - do { - if (this.index >= this.hashTable.size) { // L: 30 - return null; // L: 38 - } - - var1 = this.hashTable.buckets[this.index++].previous; // L: 31 - } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 - - this.head = var1.previous; // L: 33 - this.last = var1; // L: 34 - return var1; // L: 35 - } - } - public boolean hasNext() { if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 return true; @@ -93,4 +71,26 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; // L: 58 } } // L: 59 + + public Object next() { + Node var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 + var1 = this.head; // L: 25 + this.head = var1.previous; // L: 26 + this.last = var1; // L: 27 + return var1; // L: 28 + } else { + do { + if (this.index >= this.hashTable.size) { // L: 30 + return null; // L: 38 + } + + var1 = this.hashTable.buckets[this.index++].previous; // L: 31 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 + + this.head = var1.previous; // L: 33 + this.last = var1; // L: 34 + return var1; // L: 35 + } + } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index 41afb54e66..06413cde30 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -4,226 +4,53 @@ 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("fp") +@ObfuscatedName("dd") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("rg") - @ObfuscatedGetter( - intValue = 1085994163 - ) - static int field2070; - @ObfuscatedName("rv") - @ObfuscatedGetter( - intValue = -1320857685 - ) - static int field2056; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("JagexCache_locationFile") static File JagexCache_locationFile; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("cacheDir") static File cacheDir; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2009341667 + intValue = 502349843 ) @Export("idxCount") static int idxCount; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lnx;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lnx;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lme;" + descriptor = "Lnx;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2115151197 - ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("p") - @Export("operatingSystemName") - static String operatingSystemName; - @ObfuscatedName("m") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; static { - JagexCache_randomDat = null; + JagexCache_randomDat = null; // L: 22 JagexCache_dat2File = null; // L: 23 JagexCache_idx255File = null; // L: 24 } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lkx;I)Ljava/lang/String;", - garbageValue = "2062963895" + descriptor = "(I)I", + garbageValue = "1018942980" ) - public static String method3683(Buffer var0) { - return WorldMapRegion.method642(var0, 32767); // L: 22 + static final int method2541() { + return ViewportMouse.ViewportMouse_y; // L: 91 } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-638014439" - ) - static int method3686(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.ADD) { // L: 2488 - Interpreter.Interpreter_intStackSize -= 2; // L: 2489 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2490 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2491 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + var4; // L: 2492 - return 1; // L: 2493 - } else if (var0 == ScriptOpcodes.SUB) { // L: 2495 - Interpreter.Interpreter_intStackSize -= 2; // L: 2496 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2497 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2498 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 - var4; // L: 2499 - return 1; // L: 2500 - } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2502 - Interpreter.Interpreter_intStackSize -= 2; // L: 2503 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2504 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2505 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 * var4; // L: 2506 - return 1; // L: 2507 - } else if (var0 == ScriptOpcodes.DIV) { // L: 2509 - Interpreter.Interpreter_intStackSize -= 2; // L: 2510 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2511 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2512 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 / var4; // L: 2513 - return 1; // L: 2514 - } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2516 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2517 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var9); // L: 2518 - return 1; // L: 2519 - } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2521 - var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2522 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var9 + 1)); // L: 2523 - return 1; // L: 2524 - } else if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2526 - Interpreter.Interpreter_intStackSize -= 5; // L: 2527 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2528 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2529 - int var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2530 - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2531 - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 2532 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + (var4 - var9) * (var11 - var10) / (var6 - var10); // L: 2533 - return 1; // L: 2534 - } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2536 - Interpreter.Interpreter_intStackSize -= 2; // L: 2537 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2538 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2539 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + var4 * var9 / 100; // L: 2540 - return 1; // L: 2541 - } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2543 - Interpreter.Interpreter_intStackSize -= 2; // L: 2544 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2545 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2546 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 | 1 << var4; // L: 2547 - return 1; // L: 2548 - } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2550 - Interpreter.Interpreter_intStackSize -= 2; // L: 2551 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2552 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2553 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 & -1 - (1 << var4); // L: 2554 - return 1; // L: 2555 - } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2557 - Interpreter.Interpreter_intStackSize -= 2; // L: 2558 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2559 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2560 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var9 & 1 << var4) != 0 ? 1 : 0; // L: 2561 - return 1; // L: 2562 - } else if (var0 == ScriptOpcodes.MOD) { // L: 2564 - Interpreter.Interpreter_intStackSize -= 2; // L: 2565 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2566 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2567 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 % var4; // L: 2568 - return 1; // L: 2569 - } else if (var0 == ScriptOpcodes.POW) { // L: 2571 - Interpreter.Interpreter_intStackSize -= 2; // L: 2572 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2573 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2574 - if (var9 == 0) { // L: 2575 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, (double)var4); // L: 2576 - } - - return 1; // L: 2577 - } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2579 - Interpreter.Interpreter_intStackSize -= 2; // L: 2580 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2581 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2582 - if (var9 == 0) { // L: 2583 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2584 - return 1; // L: 2585 - } else { - switch(var4) { // L: 2587 - case 0: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2605 - break; // L: 2606 - case 1: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9; // L: 2610 - break; // L: 2611 - case 2: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var9); // L: 2595 - break; // L: 2596 - case 3: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var9); // L: 2600 - break; // L: 2601 - case 4: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var9)); // L: 2615 - break; - default: - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, 1.0D / (double)var4); // L: 2590 - } - - return 1; // L: 2619 - } - } else if (var0 == ScriptOpcodes.AND) { // L: 2621 - Interpreter.Interpreter_intStackSize -= 2; // L: 2622 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2623 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2624 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 & var4; // L: 2625 - return 1; // L: 2626 - } else if (var0 == ScriptOpcodes.OR) { // L: 2628 - Interpreter.Interpreter_intStackSize -= 2; // L: 2629 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2630 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2631 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 | var4; // L: 2632 - return 1; // L: 2633 - } else if (var0 == ScriptOpcodes.SCALE) { // L: 2635 - Interpreter.Interpreter_intStackSize -= 3; // L: 2636 - long var3 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2637 - long var5 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2638 - long var7 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2639 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var7 * var3 / var5); // L: 2640 - return 1; // L: 2641 - } else { - return 2; // L: 2643 - } - } -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 6d9384fac6..a5a57396ff 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -1,4 +1,3 @@ -import java.applet.Applet; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; @@ -9,99 +8,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("af") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("ph") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lbi;" + descriptor = "Laf;" ) @Export("KeyHandler_instance") public static KeyHandler KeyHandler_instance; - @ObfuscatedName("ar") + @ObfuscatedName("cn") + @Export("KeyHandler_pressedKeys") + public static boolean[] KeyHandler_pressedKeys; + @ObfuscatedName("cq") + static int[] field257; + @ObfuscatedName("ck") + @ObfuscatedGetter( + intValue = 414508597 + ) + static int field258; + @ObfuscatedName("cu") + @ObfuscatedGetter( + intValue = -1317034497 + ) + static int field259; + @ObfuscatedName("cb") + static char[] field252; + @ObfuscatedName("cv") + static int[] field256; + @ObfuscatedName("cj") + public static int[] field262; + @ObfuscatedName("cy") + @ObfuscatedGetter( + intValue = 298211417 + ) + public static int field263; + @ObfuscatedName("cs") + @ObfuscatedGetter( + intValue = -1511679855 + ) + static int field264; + @ObfuscatedName("cr") + @ObfuscatedGetter( + intValue = 531816263 + ) + static int field265; + @ObfuscatedName("cd") + @ObfuscatedGetter( + intValue = 357930861 + ) + static int field271; + @ObfuscatedName("cl") + @ObfuscatedGetter( + intValue = -515618943 + ) + @Export("KeyHandler_idleCycles") + static volatile int KeyHandler_idleCycles; + @ObfuscatedName("ci") + @Export("KeyHandler_keyCodes") + static int[] KeyHandler_keyCodes; + @ObfuscatedName("de") @ObfuscatedSignature( descriptor = "Lli;" ) - static Bounds field409; - @ObfuscatedName("cr") - @Export("KeyHandler_pressedKeys") - public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cs") - public static int[] field407; - @ObfuscatedName("ce") - @ObfuscatedGetter( - intValue = -65232469 - ) - public static int field416; - @ObfuscatedName("cu") - @ObfuscatedGetter( - intValue = -1002446749 - ) - public static int field417; - @ObfuscatedName("ci") - static char[] field422; - @ObfuscatedName("cy") - static int[] field428; - @ObfuscatedName("cm") - public static int[] field420; - @ObfuscatedName("cc") - @ObfuscatedGetter( - intValue = -1646570973 - ) - public static int field421; - @ObfuscatedName("co") - @ObfuscatedGetter( - intValue = -1868848877 - ) - public static int field418; - @ObfuscatedName("cx") - @ObfuscatedGetter( - intValue = 284809291 - ) - public static int field423; - @ObfuscatedName("cg") - @ObfuscatedGetter( - intValue = -1588472735 - ) - public static int field424; - @ObfuscatedName("ch") - @ObfuscatedGetter( - intValue = 1023513531 - ) - @Export("KeyHandler_idleCycles") - public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cl") - @Export("KeyHandler_keyCodes") - static int[] KeyHandler_keyCodes; - @ObfuscatedName("hz") - @ObfuscatedGetter( - intValue = -1023846245 - ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -1825492875 - ) - @Export("selectedItemId") - static int selectedItemId; + @Export("js5Socket") + static AbstractSocket js5Socket; static { KeyHandler_instance = new KeyHandler(); // L: 13 KeyHandler_pressedKeys = new boolean[112]; // L: 100 - field407 = new int[128]; // L: 103 - field416 = 0; // L: 104 - field417 = 0; // L: 105 - field422 = new char[128]; // L: 106 - field428 = new int[128]; // L: 107 - field420 = new int[128]; // L: 108 - field421 = 0; // L: 109 - field418 = 0; // L: 110 - field423 = 0; // L: 111 - field424 = 0; // L: 112 + field257 = new int[128]; // L: 103 + field258 = 0; // L: 104 + field259 = 0; // L: 105 + field252 = new char[128]; // L: 106 + field256 = new int[128]; // L: 107 + field262 = new int[128]; // L: 108 + field263 = 0; // L: 109 + field264 = 0; // L: 110 + field265 = 0; // L: 111 + field271 = 0; // L: 112 KeyHandler_idleCycles = 0; // L: 113 KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 114 } @@ -109,188 +94,161 @@ public final class KeyHandler implements KeyListener, FocusListener { KeyHandler() { } // L: 116 + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 233 + char var2 = var1.getKeyChar(); // L: 234 + if (var2 != 0 && var2 != '\uffff') { // L: 235 + boolean var3; + if ((var2 <= 0 || var2 >= 128) && (var2 < 160 || var2 > 255)) { // L: 238 + label53: { + if (var2 != 0) { // L: 242 + char[] var4 = class300.cp1252AsciiExtension; // L: 244 + + for (int var5 = 0; var5 < var4.length; ++var5) { // L: 245 + char var6 = var4[var5]; // L: 246 + if (var2 == var6) { // L: 248 + var3 = true; // L: 249 + break label53; + } + } + } + + var3 = false; // L: 256 + } + } else { + var3 = true; // L: 239 + } + + if (var3) { // L: 258 + int var7 = field265 + 1 & 127; // L: 259 + if (var7 != field264) { // L: 260 + field256[field265] = -1; // L: 261 + field252[field265] = var2; // L: 262 + field265 = var7; // L: 263 + } + } + } + } + + var1.consume(); // L: 268 + } // L: 269 + + public final void focusGained(FocusEvent var1) { + } // L: 271 + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 274 + field259 = -1; // L: 275 + } + + } // L: 277 + public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 137 - var2 = KeyHandler_keyCodes[var2]; // L: 138 - if ((var2 & 128) != 0) { + if (KeyHandler_instance != null) { // L: 191 + int var2 = var1.getKeyCode(); // L: 192 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 193 + var2 = KeyHandler_keyCodes[var2]; // L: 194 + if ((var2 & 128) != 0) { // L: 195 var2 = -1; } } else { - var2 = -1; + var2 = -1; // L: 197 } - if (field417 >= 0 && var2 >= 0) { - field407[field417] = var2; - field417 = field417 + 1 & 127; // L: 144 - if (field417 == field416) { // L: 145 - field417 = -1; + if (field259 >= 0 && var2 >= 0) { // L: 198 + field257[field259] = var2; // L: 199 + field259 = field259 + 1 & 127; // L: 200 + if (field258 == field259) { // L: 201 + field259 = -1; } } int var3; - if (var2 >= 0) { - var3 = field423 + 1 & 127; - if (var3 != field418) { - field428[field423] = var2; // L: 150 - field422[field423] = 0; // L: 151 - field423 = var3; + if (var2 >= 0) { // L: 203 + var3 = field265 + 1 & 127; // L: 204 + if (var3 != field264) { // L: 205 + field256[field265] = var2; // L: 206 + field252[field265] = 0; // L: 207 + field265 = var3; // L: 208 } } - var3 = var1.getModifiers(); // L: 155 - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { - var1.consume(); // L: 157 + var3 = var1.getModifiers(); // L: 211 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 212 + var1.consume(); // L: 213 } } - } // L: 160 + } // L: 216 public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 165 + if (KeyHandler_instance != null) { // L: 219 + int var2 = var1.getKeyCode(); // L: 220 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 221 var2 = KeyHandler_keyCodes[var2] & -129; } else { - var2 = -1; // L: 166 + var2 = -1; // L: 222 } - if (field417 >= 0 && var2 >= 0) { - field407[field417] = ~var2; // L: 168 - field417 = field417 + 1 & 127; // L: 169 - if (field417 == field416) { - field417 = -1; + if (field259 >= 0 && var2 >= 0) { // L: 223 + field257[field259] = ~var2; // L: 224 + field259 = field259 + 1 & 127; // L: 225 + if (field258 == field259) { // L: 226 + field259 = -1; } } } - var1.consume(); // L: 173 - } // L: 174 + var1.consume(); // L: 229 + } // L: 230 - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { // L: 177 - char var2 = var1.getKeyChar(); // L: 178 - if (var2 != 0 && var2 != '\uffff' && FaceNormal.method3421(var2)) { // L: 179 - int var3 = field423 + 1 & 127; // L: 180 - if (var3 != field418) { // L: 181 - field428[field423] = -1; // L: 182 - field422[field423] = var2; // L: 183 - field423 = var3; // L: 184 - } - } - } - - var1.consume(); // L: 188 - } // L: 189 - - public final void focusGained(FocusEvent var1) { - } // L: 191 - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { // L: 194 - field417 = -1; // L: 195 - } - - } // L: 197 - - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "1009251772" + descriptor = "(Ljava/lang/String;II)V", + garbageValue = "703180001" ) - public static void method912(Applet var0, String var1) { - class60.applet = var0; // L: 22 - if (var1 != null) { // L: 23 - class60.field454 = var1; - } + static final void method462(String var0, int var1) { + PacketBufferNode var2 = ObjectComposition.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); // L: 250 + var2.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 251 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 252 + var2.packetBuffer.method6606(var1); // L: 253 + Client.packetWriter.addNode(var2); // L: 254 + } // L: 255 - } // L: 24 - - @ObfuscatedName("h") + @ObfuscatedName("in") @ObfuscatedSignature( - descriptor = "(Lkx;IIIIIII)V", - garbageValue = "-1349171106" + descriptor = "(Lhu;III)V", + garbageValue = "388736615" ) - @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: 130 - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 131 - - while (true) { - var7 = var0.readUnsignedByte(); // L: 133 - if (var7 == 0) { // L: 134 - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -ArchiveLoader.method1237(var2 + 932731 + var4, var5 + 556238 + var3) * 8; // L: 135 - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 136 - } - break; - } - - if (var7 == 1) { // L: 139 - int var8 = var0.readUnsignedByte(); // L: 140 - if (var8 == 1) { // L: 141 - var8 = 0; - } - - if (var1 == 0) { // L: 142 - 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: 143 - } - break; - } - - if (var7 <= 49) { // L: 146 - class200.field2399[var1][var2][var3] = var0.readByte(); // L: 147 - Tiles.field530[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 148 - class1.field1[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 149 - } else if (var7 <= 81) { // L: 152 - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 153 - } else { - Tiles.field517[var1][var2][var3] = (byte)(var7 - 81); // L: 156 - } - } + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 10016 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 10017 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 10018 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 10019 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 10020 + var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2; } else { - while (true) { - var7 = var0.readUnsignedByte(); // L: 161 - if (var7 == 0) { // L: 162 - break; - } - - if (var7 == 1) { // L: 163 - var0.readUnsignedByte(); // L: 164 - break; - } - - if (var7 <= 49) { // L: 167 - var0.readUnsignedByte(); - } - } + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 10021 } - } // L: 170 + if (var0.yAlignment == 0) { // L: 10022 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 10023 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 10024 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 10025 + } else if (var0.yAlignment == 4) { // L: 10026 + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 10027 + } - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2146586711" - ) - public static void method913() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 216 - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 217 - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 218 - } // L: 219 - - @ObfuscatedName("kt") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "534090329" - ) - static final void method911() { - Client.field858 = Client.cycleCntr; // L: 11445 - ClanChat_inClanChat = true; // L: 11446 - } // L: 11447 + } // L: 10028 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index db547fc439..4a452acfb0 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,58 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("jq") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("KitDefinition_archive") - static AbstractArchive KitDefinition_archive; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("KitDefinition_modelsArchive") - static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("d") + public static AbstractArchive KitDefinition_archive; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1172594075 + intValue = -827532557 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("KitDefinition_cached") public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -765113367 + intValue = -2145544887 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("models2") int[] models2; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("models") int[] models; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("nonSelectable") public boolean nonSelectable; @@ -69,178 +63,178 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; // L: 22 } // L: 24 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1001378689" + descriptor = "(Lnu;I)V", + garbageValue = "-1899530791" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 44 - if (var2 == 0) { // L: 45 - return; // L: 48 + int var2 = var1.readUnsignedByte(); // L: 38 + if (var2 == 0) { // L: 39 + return; // L: 42 } - this.decodeNext(var1, var2); // L: 46 + this.decodeNext(var1, var2); // L: 40 } } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "1463228330" + descriptor = "(Lnu;IB)V", + garbageValue = "0" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 51 + if (var2 == 1) { // L: 45 this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { // L: 52 - var3 = var1.readUnsignedByte(); // L: 53 - this.models2 = new int[var3]; // L: 54 + if (var2 == 2) { // L: 46 + var3 = var1.readUnsignedByte(); // L: 47 + this.models2 = new int[var3]; // L: 48 - for (var4 = 0; var4 < var3; ++var4) { // L: 55 + for (var4 = 0; var4 < var3; ++var4) { // L: 49 this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { // L: 57 + } else if (var2 == 3) { // L: 51 this.nonSelectable = true; - } else if (var2 == 40) { // L: 58 - var3 = var1.readUnsignedByte(); // L: 59 - this.recolorFrom = new short[var3]; // L: 60 - this.recolorTo = new short[var3]; // L: 61 + } else if (var2 == 40) { // 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) { // L: 62 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 + for (var4 = 0; var4 < var3; ++var4) { // L: 56 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58 } - } else if (var2 == 41) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - this.retextureFrom = new short[var3]; // L: 69 - this.retextureTo = new short[var3]; // L: 70 + } else if (var2 == 41) { // L: 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) { // L: 71 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 + for (var4 = 0; var4 < var3; ++var4) { // L: 65 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67 } - } else if (var2 >= 60 && var2 < 70) { // L: 76 + } else if (var2 >= 60 && var2 < 70) { // L: 70 this.models[var2 - 60] = var1.readUnsignedShort(); } } - } // L: 78 + } // L: 72 - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-48" + descriptor = "(S)Z", + garbageValue = "28242" ) @Export("ready") public boolean ready() { - if (this.models2 == null) { // L: 81 + if (this.models2 == null) { // L: 75 return true; } else { - boolean var1 = true; // L: 82 + boolean var1 = true; // L: 76 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83 - if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77 + if (!class266.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } - return var1; // L: 84 + return var1; // L: 78 } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)Lek;", - garbageValue = "-41" + descriptor = "(B)Lfs;", + garbageValue = "63" ) @Export("getModelData") public ModelData getModelData() { - if (this.models2 == null) { // L: 88 + if (this.models2 == null) { // L: 82 return null; } else { - ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 + ModelData[] var1 = new ModelData[this.models2.length]; // L: 83 - for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 - var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84 + var1[var2] = ModelData.ModelData_get(class266.KitDefinition_modelsArchive, this.models2[var2], 0); } ModelData var4; - if (var1.length == 1) { // L: 92 + if (var1.length == 1) { // L: 86 var4 = var1[0]; } else { - var4 = new ModelData(var1, var1.length); // L: 93 + var4 = new ModelData(var1, var1.length); // L: 87 } int var3; - if (this.recolorFrom != null) { // L: 94 - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95 - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96 + if (this.recolorFrom != null) { // 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) { // L: 99 - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100 - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101 + if (this.retextureFrom != null) { // L: 93 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95 } } - return var4; // L: 104 + return var4; // L: 98 } } - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-121" - ) - public boolean method4640() { - boolean var1 = true; // L: 108 - - for (int var2 = 0; var2 < 5; ++var2) { // L: 109 - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110 - var1 = false; - } - } - - return var1; // L: 112 - } - @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)Lek;", - garbageValue = "2061268949" + descriptor = "(I)Z", + garbageValue = "1694348620" + ) + public boolean method4950() { + boolean var1 = true; // L: 102 + + for (int var2 = 0; var2 < 5; ++var2) { // L: 103 + if (this.models[var2] != -1 && !class266.KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104 + var1 = false; + } + } + + return var1; // L: 106 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Lfs;", + garbageValue = "-2136913772" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; // L: 116 - int var2 = 0; // L: 117 + ModelData[] var1 = new ModelData[5]; // L: 110 + int var2 = 0; // L: 111 - for (int var3 = 0; var3 < 5; ++var3) { // L: 118 - if (this.models[var3] != -1) { // L: 119 - var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); + for (int var3 = 0; var3 < 5; ++var3) { // L: 112 + if (this.models[var3] != -1) { // L: 113 + var1[var2++] = ModelData.ModelData_get(class266.KitDefinition_modelsArchive, this.models[var3], 0); } } - ModelData var5 = new ModelData(var1, var2); // L: 121 + ModelData var5 = new ModelData(var1, var2); // L: 115 int var4; - if (this.recolorFrom != null) { // L: 122 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123 - var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124 + if (this.recolorFrom != null) { // 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) { // L: 127 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128 - var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129 + if (this.retextureFrom != null) { // L: 121 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122 + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123 } } - return var5; // L: 132 + return var5; // L: 126 } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index 2dc6ab48e3..b1644a4f17 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,97 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("jh") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Ljh;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Lgp;" + descriptor = "[Ljh;" ) @Export("Language_valuesOrdered") static final Language[] Language_valuesOrdered; - @ObfuscatedName("e") - final String field2387; - @ObfuscatedName("q") + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lcy;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("gr") + @ObfuscatedGetter( + intValue = 2000557037 + ) + static int field3357; + @ObfuscatedName("g") + final String field3352; + @ObfuscatedName("h") @Export("language") final String language; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 426516807 + intValue = 862102775 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field2420, 0, "GB"); // L: 10 - Language_DE = new Language("DE", "de", "German", ModeWhere.field2420, 1, "DE"); // L: 11 - Language_FR = new Language("FR", "fr", "French", ModeWhere.field2420, 2, "FR"); // L: 12 - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2420, 3, "BR"); // L: 13 - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2405, 4, "NL"); // L: 14 - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2405, 5, "ES"); // L: 15 - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2420, 6, "MX"); // L: 16 - Language[] var0 = new Language[]{Language_FR, Language_DE, Language_ES, Language_NL, Language_PT, Language_EN, Language_ES_MX}; // L: 25 - Language_valuesOrdered = new Language[var0.length]; // L: 28 - Language[] var2 = var0; // L: 30 + Language_EN = new Language("EN", "en", "English", ModeWhere.field3373, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field3373, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field3373, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3373, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3363, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3363, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3373, 6, "MX"); // L: 16 + Language[] var0 = method4693(); + Language_valuesOrdered = new Language[var0.length]; + Language[] var1 = var0; // L: 26 - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 - Language var4 = var2[var3]; // L: 32 - if (Language_valuesOrdered[var4.id] != null) { // L: 34 - throw new IllegalStateException(); // L: 35 + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 27 + Language var3 = var1[var2]; // L: 28 + if (Language_valuesOrdered[var3.id] != null) { // L: 30 + throw new IllegalStateException(); // L: 31 } - Language_valuesOrdered[var4.id] = var4; // L: 37 + Language_valuesOrdered[var3.id] = var3; // L: 33 } - } // L: 41 + } // L: 37 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgw;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljb;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field2387 = var1; // L: 44 + this.field3352 = var1; // L: 44 this.language = var2; // L: 45 this.id = var5; // L: 46 if (var6 != null) { // L: 47 @@ -106,36 +117,60 @@ public class Language implements Enumerated { } // L: 53 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-40" - ) - @Export("getLanguage") - String getLanguage() { - return this.language; // L: 56 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 60 } + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-429051103" + ) + @Export("getLanguage") + String getLanguage() { + return this.language; // L: 56 + } + public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69 } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lgp;", - garbageValue = "-86" + descriptor = "(IIB)I", + garbageValue = "31" ) - public static Language method3854(int var0) { + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 + if (var2 == null) { // L: 22 + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)[Ljh;", + garbageValue = "-79" + ) + static Language[] method4693() { + return new Language[]{Language_EN, Language_PT, Language_DE, Language_ES_MX, Language_NL, Language_FR, Language_ES}; // L: 40 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)Ljh;", + garbageValue = "13" + ) + public static Language method4691(int var0) { return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65 } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index cae94c686c..5a2c73e14c 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("mc") @Implements("Link") public class Link { - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lmc;" ) @Export("previous") public Link previous; - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lmc;" ) @Export("next") public Link next; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("remove") public void remove() { if (this.next != null) { // L: 8 diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index d374a01a46..def317aca2 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("jp") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lmc;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgm;" + descriptor = "Lmc;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lgm;)V" + descriptor = "(Lmc;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Lgm;" + descriptor = "()Lmc;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "()Lgm;" + descriptor = "()Lmc;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index f7c47a0d19..6c44d36820 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -4,168 +4,139 @@ 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("cg") @Implements("Login") public class Login { - @ObfuscatedName("v") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("d") + @ObfuscatedName("sg") + @ObfuscatedSignature( + descriptor = "Lcm;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -798516213 + intValue = 1122392293 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Low;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Llm;" - ) - @Export("leftTitleSprite") - static SpritePixels leftTitleSprite; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Llm;" - ) - @Export("rightTitleSprite") - static SpritePixels rightTitleSprite; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "[Lly;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -491759097 + intValue = -1338288751 + ) + static int field1018; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lci;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1015989971 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1990930167 + intValue = 1156735553 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1379115269 + intValue = 1968264881 ) - static int field1206; - @ObfuscatedName("at") + static int field993; + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1813136613 + intValue = -1162562217 ) - static int field1207; - @ObfuscatedName("al") + static int field994; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1401481889 + intValue = -233331579 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("as") + @ObfuscatedName("af") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("ah") + @ObfuscatedName("av") @Export("Login_username") static String Login_username; - @ObfuscatedName("ap") + @ObfuscatedName("az") @Export("Login_password") static String Login_password; - @ObfuscatedName("af") - static boolean field1222; - @ObfuscatedName("av") - static boolean field1216; + @ObfuscatedName("an") + static boolean field1003; + @ObfuscatedName("ah") + static boolean field1012; + @ObfuscatedName("br") + static boolean field1005; @ObfuscatedName("bn") - static boolean field1217; - @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -557955143 + intValue = -819418163 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bg") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 933074711 + intValue = -2104276991 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bm") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1816463307 + intValue = -1497007259 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1081007071 + intValue = -1387381071 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedGetter( - longValue = -6454888937678848821L + longValue = 5781312275370513963L ) - static long field1213; - @ObfuscatedName("by") + static long field991; + @ObfuscatedName("bg") @ObfuscatedGetter( - longValue = 2692717295757623997L + longValue = -4852859935044639761L ) - static long field1226; - @ObfuscatedName("eg") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("fontPlain12") - static Font fontPlain12; + static long field1016; static { xPadding = 0; // L: 38 loginBoxX = xPadding + 202; // L: 55 Login_loadingPercent = 10; // L: 57 Login_loadingText = ""; // L: 58 - field1206 = -1; // L: 65 - field1207 = 1; // L: 68 + field993 = -1; // L: 65 + field994 = 1; // L: 68 loginIndex = 0; // L: 72 Login_response0 = ""; // L: 73 Login_response1 = ""; // L: 74 @@ -173,61 +144,60 @@ public class Login { Login_response3 = ""; // L: 76 Login_username = ""; // L: 77 Login_password = ""; // L: 78 - field1222 = false; // L: 85 - field1216 = false; // L: 86 - field1217 = true; // L: 89 + field1003 = false; // L: 85 + field1012 = false; // L: 86 + field1005 = true; // L: 89 currentLoginField = 0; // L: 90 worldSelectOpen = false; // L: 94 hoveredWorldIndex = -1; // L: 102 worldSelectPage = 0; // L: 103 worldSelectPagesCount = 0; // L: 104 new DecimalFormat("##0.00"); // L: 107 - new class171(); - field1213 = -1L; // L: 115 - field1226 = -1L; // L: 116 + new class124(); + field991 = -1L; // L: 115 + field1016 = -1L; // L: 116 } - @ObfuscatedName("y") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "2056829974" + descriptor = "(II)Lke;", + garbageValue = "-1050375469" ) - public static boolean method2244(int var0) { - return (var0 >> 30 & 1) != 0; // L: 25 - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "23" - ) - static int method2223(int var0, Script var1, boolean var2) { - Widget var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1307 - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1308 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MusicPatch.Widget_unpackTargetMask(class60.getWidgetFlags(var3)); // L: 1309 - return 1; // L: 1310 - } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1312 - if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1319 - if (var3.dataText == null) { // L: 1320 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1321 - } - - return 1; // L: 1322 - } else { - return 2; // L: 1324 - } + public static FloorOverlayDefinition method1968(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; } else { - int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1313 - --var4; // L: 1314 - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1315 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1316 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 + var1 = new FloorOverlayDefinition(); // L: 29 + if (var2 != null) { // L: 30 + var1.decode(new Buffer(var2), var0); } - return 1; // L: 1317 + var1.postDecode(); // L: 31 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lne;", + garbageValue = "283131350" + ) + public static class373 method1969(int var0) { + int var1 = class371.field4124[var0]; // L: 11 + if (var1 == 1) { // L: 12 + return class373.field4126; // L: 13 + } else if (var1 == 2) { // L: 15 + return class373.field4128; // L: 16 + } else { + return var1 == 3 ? class373.field4134 : null; // L: 18 19 21 + } + } + + @ObfuscatedName("u") + public static int method1967(long var0) { + return (int)(var0 >>> 0 & 127L); // L: 56 + } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 143a79d26c..740aadc643 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,64 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gc") @Implements("LoginPacket") -public class LoginPacket implements class190 { - @ObfuscatedName("n") +public class LoginPacket implements class201 { + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgc;" ) - public static final LoginPacket field2342; - @ObfuscatedName("v") + public static final LoginPacket field2456; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgc;" ) - static final LoginPacket field2339; - @ObfuscatedName("d") + static final LoginPacket field2454; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgc;" ) - public static final LoginPacket field2336; - @ObfuscatedName("c") + public static final LoginPacket field2451; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgc;" ) - public static final LoginPacket field2338; - @ObfuscatedName("y") + public static final LoginPacket field2452; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgv;" + descriptor = "Lgc;" ) - public static final LoginPacket field2337; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgv;" - ) - static final LoginPacket field2340; + public static final LoginPacket field2450; @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Lgv;" + descriptor = "Lgc;" + ) + static final LoginPacket field2449; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "[Lgc;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2092030193 + intValue = 819348427 ) @Export("id") public final int id; static { - field2342 = new LoginPacket(14, 0); // L: 5 - field2339 = new LoginPacket(15, 4); // L: 6 - field2336 = new LoginPacket(16, -2); // L: 7 - field2338 = new LoginPacket(18, -2); // L: 8 - field2337 = new LoginPacket(19, -2); // L: 9 - field2340 = new LoginPacket(27, 0); // L: 10 - LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = Tiles.method1217(); + field2456 = new LoginPacket(14, 0); // L: 5 + field2454 = new LoginPacket(15, 4); // L: 6 + field2451 = new LoginPacket(16, -2); // L: 7 + field2452 = new LoginPacket(18, -2); // L: 8 + field2450 = new LoginPacket(19, -2); // L: 9 + field2449 = new LoginPacket(27, 0); // L: 10 + LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 + LoginPacket[] var0 = PacketWriter.method2386(); // 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 } } @@ -72,137 +72,28 @@ public class LoginPacket implements class190 { ) LoginPacket(int var1, int var2) { this.id = var1; - } + } // L: 27 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(CI)B", - garbageValue = "1633316338" + descriptor = "(II)Lka;", + garbageValue = "1973214574" ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 - var1 = (byte)var0; - } else if (var0 == 8364) { // L: 13 - var1 = -128; - } else if (var0 == 8218) { // L: 14 - var1 = -126; - } else if (var0 == 402) { // L: 15 - var1 = -125; - } else if (var0 == 8222) { // L: 16 - var1 = -124; - } else if (var0 == 8230) { // L: 17 - var1 = -123; - } else if (var0 == 8224) { // L: 18 - var1 = -122; - } else if (var0 == 8225) { // L: 19 - var1 = -121; - } else if (var0 == 710) { // L: 20 - var1 = -120; - } else if (var0 == 8240) { // L: 21 - var1 = -119; - } else if (var0 == 352) { // L: 22 - var1 = -118; - } else if (var0 == 8249) { // L: 23 - var1 = -117; - } else if (var0 == 338) { // L: 24 - var1 = -116; - } else if (var0 == 381) { // L: 25 - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; // L: 26 - } else if (var0 == 8217) { // L: 27 - var1 = -110; - } else if (var0 == 8220) { // L: 28 - var1 = -109; - } else if (var0 == 8221) { // L: 29 - var1 = -108; - } else if (var0 == 8226) { // L: 30 - var1 = -107; - } else if (var0 == 8211) { // L: 31 - var1 = -106; - } else if (var0 == 8212) { // L: 32 - var1 = -105; - } else if (var0 == 732) { // L: 33 - var1 = -104; - } else if (var0 == 8482) { // L: 34 - var1 = -103; - } else if (var0 == 353) { // L: 35 - var1 = -102; - } else if (var0 == 8250) { // L: 36 - var1 = -101; - } else if (var0 == 339) { // L: 37 - var1 = -100; - } else if (var0 == 382) { // L: 38 - var1 = -98; - } else if (var0 == 376) { // L: 39 - var1 = -97; + @Export("StructDefinition_getStructDefinition") + public static StructComposition StructDefinition_getStructDefinition(int var0) { + StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 19 + if (var1 != null) { // L: 20 + return var1; } else { - var1 = 63; // L: 40 - } - - return var1; // L: 41 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIII)Llm;", - garbageValue = "-560730174" - ) - static SpritePixels method3816(int var0, int var1, int var2) { - return (SpritePixels)WorldMapRegion.WorldMapRegion_cachedSprites.get(AttackOption.method2203(var0, var1, var2)); // L: 42 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "818544201" - ) - public static void method3815() { - try { - if (class206.musicPlayerStatus == 1) { // L: 66 - int var0 = VertexNormal.midiPcmStream.method3912(); // L: 67 - if (var0 > 0 && VertexNormal.midiPcmStream.isReady()) { // L: 68 - var0 -= class7.pcmSampleLength; // L: 69 - if (var0 < 0) { // L: 70 - var0 = 0; - } - - VertexNormal.midiPcmStream.setPcmStreamVolume(var0); // L: 71 - return; // L: 72 - } - - VertexNormal.midiPcmStream.clear(); // L: 74 - VertexNormal.midiPcmStream.removeAll(); // L: 75 - if (class206.musicTrackArchive != null) { // L: 76 - class206.musicPlayerStatus = 2; - } else { - class206.musicPlayerStatus = 0; // L: 77 - } - - class204.musicTrack = null; // L: 78 - class182.soundCache = null; // L: 79 + byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 21 + var1 = new StructComposition(); // L: 22 + if (var2 != null) { // L: 23 + var1.decode(new Buffer(var2)); } - } catch (Exception var2) { // L: 82 - var2.printStackTrace(); // L: 83 - VertexNormal.midiPcmStream.clear(); // L: 84 - class206.musicPlayerStatus = 0; // L: 85 - class204.musicTrack = null; // L: 86 - class182.soundCache = null; // L: 87 - class206.musicTrackArchive = null; // L: 88 + + var1.postDecode(); // L: 24 + StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 25 + return var1; // L: 26 } - - } // L: 90 - - @ObfuscatedName("ju") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-73" - ) - static void method3812(int var0, int var1) { - MenuAction var2 = class195.tempMenuAction; // L: 10986 - AbstractWorldMapIcon.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 10988 - class195.tempMenuAction = null; // L: 10990 - } // L: 10991 + } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 76c3ec0cb4..11a8bea1aa 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -4,283 +4,271 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("ci") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("dg") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "Llm;" - ) - @Export("compass") - static SpritePixels compass; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Low;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("z") - int[] field1045; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1212643041 - ) - int field1046; - @ObfuscatedName("q") - int[] field1047; - @ObfuscatedName("l") - int[] field1048; - @ObfuscatedName("s") - int[] field1049; - @ObfuscatedName("b") - int[] field1057; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1072742705 - ) - int field1051; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1152282493 - ) - int field1052; @ObfuscatedName("k") - int[] field1053; - @ObfuscatedName("i") - int[] field1054; - @ObfuscatedName("x") - int[] field1064; - @ObfuscatedName("f") - int[] field1056; + int[] field1281; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -812562451 + intValue = 1755494733 ) - int field1050; - @ObfuscatedName("u") + int field1294; + @ObfuscatedName("h") + int[] field1283; + @ObfuscatedName("n") + int[] field1282; + @ObfuscatedName("l") + int[] field1278; + @ObfuscatedName("m") + int[] field1286; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1252461573 + intValue = 1742549311 ) - int field1058; + int field1287; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -422706029 + ) + int field1288; + @ObfuscatedName("j") + int[] field1293; + @ObfuscatedName("r") + int[] field1290; + @ObfuscatedName("q") + int[] field1291; @ObfuscatedName("t") + int[] field1292; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1614703881 + intValue = -1149455035 ) - int field1059; + int field1285; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1716591161 + ) + int field1295; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1587500061 + ) + int field1279; @ObfuscatedSignature( - descriptor = "([Lly;)V" + descriptor = "([Low;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1045 = new int[256]; // L: 13 - this.field1046 = 0; // L: 14 - this.field1051 = 0; // L: 19 - this.field1052 = 0; // L: 20 - this.field1050 = 0; // L: 25 - this.field1058 = 0; // L: 26 - this.field1059 = 0; // L: 27 + this.field1281 = new int[256]; // L: 13 + this.field1294 = 0; // L: 14 + this.field1287 = 0; // L: 19 + this.field1288 = 0; // L: 20 + this.field1285 = 0; // L: 25 + this.field1295 = 0; // L: 26 + this.field1279 = 0; // L: 27 this.sprites = var1; // L: 30 this.initColors(); // L: 31 } // L: 32 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-16274" + descriptor = "(I)V", + garbageValue = "-1543224256" ) @Export("initColors") void initColors() { - this.field1048 = new int[256]; // L: 35 + this.field1282 = new int[256]; // L: 35 int var1; for (var1 = 0; var1 < 64; ++var1) { // L: 36 - this.field1048[var1] = var1 * 262144; + this.field1282[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { // L: 37 - this.field1048[var1 + 64] = var1 * 1024 + 16711680; + this.field1282[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { // L: 38 - this.field1048[var1 + 128] = var1 * 4 + 16776960; + this.field1282[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { // L: 39 - this.field1048[var1 + 192] = 16777215; + this.field1282[var1 + 192] = 16777215; } - this.field1049 = new int[256]; // L: 40 + this.field1278 = new int[256]; // L: 40 for (var1 = 0; var1 < 64; ++var1) { // L: 41 - this.field1049[var1] = var1 * 1024; + this.field1278[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { // L: 42 - this.field1049[var1 + 64] = var1 * 4 + 65280; + this.field1278[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { // L: 43 - this.field1049[var1 + 128] = var1 * 262144 + 65535; + this.field1278[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { // L: 44 - this.field1049[var1 + 192] = 16777215; + this.field1278[var1 + 192] = 16777215; } - this.field1057 = new int[256]; // L: 45 + this.field1286 = new int[256]; // L: 45 for (var1 = 0; var1 < 64; ++var1) { // L: 46 - this.field1057[var1] = var1 * 4; + this.field1286[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { // L: 47 - this.field1057[var1 + 64] = var1 * 262144 + 255; + this.field1286[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { // L: 48 - this.field1057[var1 + 128] = var1 * 1024 + 16711935; + this.field1286[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { // L: 49 - this.field1057[var1 + 192] = 16777215; + this.field1286[var1 + 192] = 16777215; } - this.field1047 = new int[256]; // L: 50 - this.field1050 = 0; // L: 51 - this.field1064 = new int[32768]; // L: 52 - this.field1056 = new int[32768]; // L: 53 - this.method1928((IndexedSprite)null); // L: 54 - this.field1053 = new int[32768]; // L: 55 - this.field1054 = new int[32768]; // L: 56 + this.field1283 = new int[256]; // L: 50 + this.field1285 = 0; // L: 51 + this.field1291 = new int[32768]; // L: 52 + this.field1292 = new int[32768]; // L: 53 + this.method2211((IndexedSprite)null); // L: 54 + this.field1293 = new int[32768]; // L: 55 + this.field1290 = new int[32768]; // L: 56 } // L: 57 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "143600222" + garbageValue = "1034389776" ) - void method1926() { - this.field1048 = null; // L: 60 - this.field1049 = null; - this.field1057 = null; - this.field1047 = null; // L: 63 - this.field1064 = null; // L: 64 - this.field1056 = null; // L: 65 - this.field1053 = null; // L: 66 - this.field1054 = null; // L: 67 - this.field1050 = 0; // L: 68 - this.field1058 = 0; // L: 69 + void method2192() { + this.field1282 = null; // L: 60 + this.field1278 = null; // L: 61 + this.field1286 = null; // L: 62 + this.field1283 = null; // L: 63 + this.field1291 = null; // L: 64 + this.field1292 = null; // L: 65 + this.field1293 = null; // L: 66 + this.field1290 = null; // L: 67 + this.field1285 = 0; // L: 68 + this.field1295 = 0; // L: 69 } // L: 70 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "67" + descriptor = "(III)V", + garbageValue = "-71179079" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1053 == null) { // L: 73 + if (this.field1293 == null) { // L: 73 this.initColors(); // L: 74 } - if (this.field1059 == 0) { // L: 76 - this.field1059 = var2; // L: 77 + if (this.field1279 == 0) { // L: 76 + this.field1279 = var2; // L: 77 } - int var3 = var2 - this.field1059; // L: 79 - if (var3 >= 256) { + int var3 = var2 - this.field1279; // L: 79 + if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1059 = var2; - if (var3 > 0) { - this.method1930(var3); + this.field1279 = var2; // L: 81 + if (var3 > 0) { // L: 82 + this.method2187(var3); // L: 83 } - this.method1959(var1); - } + this.method2210(var1); // L: 85 + } // L: 86 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1510812052" + descriptor = "(IB)V", + garbageValue = "-30" ) - final void method1930(int var1) { - this.field1050 += var1 * 128; + final void method2187(int var1) { + this.field1285 += 128 * var1; // L: 89 int var2; - if (this.field1050 > this.field1064.length) { // L: 90 - this.field1050 -= this.field1064.length; // L: 91 - var2 = (int)(Math.random() * 12.0D); - this.method1928(this.sprites[var2]); // L: 93 + if (this.field1285 > this.field1291.length) { // L: 90 + this.field1285 -= this.field1291.length; // L: 91 + var2 = (int)(Math.random() * 12.0D); // L: 92 + this.method2211(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.field1053[var3 + var2] - this.field1064[var2 + this.field1050 & this.field1064.length - 1] * var1 / 6; - if (var6 < 0) { + for (int var5 = 0; var5 < var4; ++var5) { // L: 98 + var6 = this.field1293[var3 + var2] - this.field1291[var2 + this.field1285 & this.field1291.length - 1] * var1 / 6; // L: 99 + if (var6 < 0) { // L: 100 var6 = 0; } - this.field1053[var2++] = var6; + this.field1293[var2++] = var6; // L: 101 } - byte var15 = 10; + 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) { // L: 107 var10 = (int)(Math.random() * 100.0D); // L: 108 if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 - this.field1053[var9 + var8] = 255; + this.field1293[var8 + var9] = 255; } else { - this.field1053[var8 + var9] = 0; // L: 110 + this.field1293[var9 + var8] = 0; // L: 110 } } } - if (this.field1051 > 0) { // L: 113 - this.field1051 -= var1 * 4; + if (this.field1287 > 0) { // L: 113 + this.field1287 -= var1 * 4; } - if (this.field1052 > 0) { // L: 114 - this.field1052 -= var1 * 4; + if (this.field1288 > 0) { // L: 114 + this.field1288 -= var1 * 4; } - if (this.field1051 == 0 && this.field1052 == 0) { // L: 115 + if (this.field1287 == 0 && this.field1288 == 0) { // L: 115 var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 if (var7 == 0) { // L: 117 - this.field1051 = 1024; + this.field1287 = 1024; } if (var7 == 1) { // L: 118 - this.field1052 = 1024; + this.field1288 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120 - this.field1045[var7] = this.field1045[var7 + var1]; + this.field1281[var7] = this.field1281[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121 - this.field1045[var7] = (int)(Math.sin((double)this.field1046 / 14.0D) * 16.0D + Math.sin((double)this.field1046 / 15.0D) * 14.0D + Math.sin((double)this.field1046 / 16.0D) * 12.0D); // L: 122 - ++this.field1046; // L: 123 + this.field1281[var7] = (int)(Math.sin((double)this.field1294 / 14.0D) * 16.0D + Math.sin((double)this.field1294 / 15.0D) * 14.0D + Math.sin((double)this.field1294 / 16.0D) * 12.0D); // L: 122 + ++this.field1294; // L: 123 } - this.field1058 += var1; // L: 125 + this.field1295 += var1; // L: 125 var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 if (var7 > 0) { // L: 127 short var16 = 128; // L: 128 @@ -290,13 +278,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1058 * 100; ++var11) { // L: 131 + for (var11 = 0; var11 < this.field1295 * 100; ++var11) { // L: 131 var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 - this.field1053[var12 + (var13 << 7)] = 192; // L: 134 + this.field1293[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1058 = 0; // L: 136 + this.field1295 = 0; // L: 136 int var14; for (var11 = 0; var11 < 256; ++var11) { // L: 137 @@ -304,16 +292,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; // L: 139 for (var14 = -var7; var14 < 128; ++var14) { // L: 140 - if (var14 + var7 < 128) { // L: 141 - var12 += this.field1053[var13 + var14 + var7]; + if (var7 + var14 < 128) { // L: 141 + var12 += this.field1293[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { // L: 142 - var12 -= this.field1053[var14 + var13 - (var7 + 1)]; + var12 -= this.field1293[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { // L: 143 - this.field1054[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1290[var14 + var13] = var12 / (var7 * 2 + 1); } } } @@ -324,15 +312,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { // L: 148 var14 = var13 * 128; // L: 149 if (var13 + var7 < 256) { // L: 150 - var12 += this.field1054[var11 + var14 + var7 * 128]; + var12 += this.field1290[var11 + var14 + var7 * 128]; } if (var13 - (var7 + 1) >= 0) { // L: 151 - var12 -= this.field1054[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1290[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { // L: 152 - this.field1053[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1293[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -340,66 +328,66 @@ public class LoginScreenAnimation { } // L: 156 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "696665844" + garbageValue = "-1592134518" ) - final int method1931(int var1, int var2, int var3) { + final int method2188(int var1, int var2, int var3) { int var4 = 256 - var3; // L: 159 - return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; // L: 160 + return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) >> 8; // L: 160 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-557955143" + descriptor = "(IB)V", + garbageValue = "110" ) - final void method1959(int var1) { - int var2 = this.field1047.length; // L: 164 - if (this.field1051 > 0) { // L: 165 - this.method1933(this.field1051, this.field1049); // L: 166 - } else if (this.field1052 > 0) { // L: 168 - this.method1933(this.field1052, this.field1057); // L: 169 + final void method2210(int var1) { + int var2 = this.field1283.length; // L: 164 + if (this.field1287 > 0) { // L: 165 + this.method2190(this.field1287, this.field1278); // L: 166 + } else if (this.field1288 > 0) { // L: 168 + this.method2190(this.field1288, this.field1286); // L: 169 } else { for (int var3 = 0; var3 < var2; ++var3) { // L: 172 - this.field1047[var3] = this.field1048[var3]; + this.field1283[var3] = this.field1282[var3]; } } - this.method1934(var1); // L: 174 + this.method2191(var1); // L: 174 } // L: 175 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I[II)V", - garbageValue = "-1988316375" + descriptor = "(I[IB)V", + garbageValue = "-100" ) - final void method1933(int var1, int[] var2) { - int var3 = this.field1047.length; // L: 178 + final void method2190(int var1, int[] var2) { + int var3 = this.field1283.length; // L: 178 for (int var4 = 0; var4 < var3; ++var4) { // L: 179 if (var1 > 768) { // L: 180 - this.field1047[var4] = this.method1931(this.field1048[var4], var2[var4], 1024 - var1); + this.field1283[var4] = this.method2188(this.field1282[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1047[var4] = var2[var4]; // L: 181 + this.field1283[var4] = var2[var4]; // L: 181 } else { - this.field1047[var4] = this.method1931(var2[var4], this.field1048[var4], 256 - var1); // L: 182 + this.field1283[var4] = this.method2188(var2[var4], this.field1282[var4], 256 - var1); // L: 182 } } } // L: 184 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "25" + garbageValue = "1" ) - final void method1934(int var1) { + final void method2191(int var1) { int var2 = 0; // L: 187 for (int var3 = 1; var3 < 255; ++var3) { // L: 188 - int var4 = (256 - var3) * this.field1045[var3] / 256; // L: 189 + int var4 = (256 - var3) * this.field1281[var3] / 256; // L: 189 int var5 = var4 + var1; // L: 190 int var6 = 0; // L: 191 int var7 = 128; // L: 192 @@ -408,22 +396,22 @@ public class LoginScreenAnimation { var5 = 0; // L: 195 } - if (var5 + 128 >= FileSystem.rasterProvider.width) { // L: 197 - var7 = FileSystem.rasterProvider.width - var5; // L: 198 + if (var5 + 128 >= GameEngine.rasterProvider.width) { // L: 197 + var7 = GameEngine.rasterProvider.width - var5; // L: 198 } - int var8 = var5 + (var3 + 8) * FileSystem.rasterProvider.width; // L: 200 - var2 += var6; // L: 201 + int var8 = var5 + (var3 + 8) * GameEngine.rasterProvider.width; + var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { // L: 202 - int var10 = this.field1053[var2++]; // L: 203 + int var10 = this.field1293[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.field1047[var10]; // L: 208 - int var14 = FileSystem.rasterProvider.pixels[var8]; // L: 209 - FileSystem.rasterProvider.pixels[var8++] = -16777216 | (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) + ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) >> 8; // L: 210 + var10 = this.field1283[var10]; // L: 208 + int var14 = GameEngine.rasterProvider.pixels[var8]; // L: 209 + GameEngine.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; // L: 210 } else { ++var8; // L: 212 } @@ -434,21 +422,21 @@ public class LoginScreenAnimation { } // L: 216 - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lly;B)V", - garbageValue = "1" + descriptor = "(Low;I)V", + garbageValue = "742969714" ) - final void method1928(IndexedSprite var1) { + final void method2211(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1064.length; ++var2) { // L: 219 - this.field1064[var2] = 0; + for (var2 = 0; var2 < this.field1291.length; ++var2) { // L: 219 + this.field1291[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { // L: 220 var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 - this.field1064[var3] = (int)(Math.random() * 256.0D); // L: 222 + this.field1291[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; @@ -457,13 +445,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { // L: 225 for (var4 = 1; var4 < 127; ++var4) { // L: 226 var5 = var4 + (var3 << 7); // L: 227 - this.field1056[var5] = (this.field1064[var5 - 128] + this.field1064[var5 + 1] + this.field1064[var5 + 128] + this.field1064[var5 - 1]) / 4; // L: 228 + this.field1292[var5] = (this.field1291[var5 + 128] + this.field1291[var5 - 128] + this.field1291[var5 + 1] + this.field1291[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1064; // L: 231 - this.field1064 = this.field1056; // L: 232 - this.field1056 = var8; // L: 233 + int[] var8 = this.field1291; // L: 231 + this.field1291 = this.field1292; // L: 232 + this.field1292 = var8; // L: 233 } if (var1 != null) { // L: 235 @@ -475,7 +463,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; // L: 240 int var6 = var3 + var1.yOffset + 16; // L: 241 int var7 = var5 + (var6 << 7); // L: 242 - this.field1064[var7] = 0; // L: 243 + this.field1291[var7] = 0; // L: 243 } } } @@ -485,76 +473,148 @@ public class LoginScreenAnimation { @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "742705358" + descriptor = "(CI)Z", + garbageValue = "932731" ) - static char method1927(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 61 62 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-1637981491" - ) - @Export("parseIntCustomRadix") - public static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { // L: 80 - boolean var3 = false; // L: 81 - boolean var4 = false; // L: 82 - int var5 = 0; // L: 83 - int var6 = var0.length(); // L: 84 - - for (int var7 = 0; var7 < var6; ++var7) { // L: 85 - char var8 = var0.charAt(var7); // L: 86 - if (var7 == 0) { // L: 87 - if (var8 == '-') { // L: 88 - var3 = true; // L: 89 - continue; - } - - if (var8 == '+') { // L: 92 - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { // L: 94 - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { // L: 95 - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { // L: 96 - throw new NumberFormatException(); // L: 97 - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { // L: 98 - throw new NumberFormatException(); - } - - if (var3) { // L: 99 - var10 = -var10; - } - - int var9 = var10 + var5 * var1; // L: 100 - if (var9 / var1 != var5) { // L: 101 - throw new NumberFormatException(); - } - - var5 = var9; // L: 102 - var4 = true; // L: 103 - } - - if (!var4) { // L: 105 - throw new NumberFormatException(); - } else { - return var5; // L: 106 - } + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 199 + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; // L: 200 } else { - throw new IllegalArgumentException("" + var1); + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 201 } } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "-57" + ) + static final void method2185(int var0, int var1, boolean var2) { + if (!var2 || var0 != class105.field1327 || Language.field3357 != var1) { // L: 4784 + class105.field1327 = var0; // L: 4787 + Language.field3357 = var1; // L: 4788 + class20.updateGameState(25); // L: 4789 + class2.drawLoadingMessage("Loading - please wait.", true); // L: 4790 + int var3 = ItemLayer.baseX; // L: 4791 + int var4 = Tile.baseY; // L: 4792 + ItemLayer.baseX = (var0 - 6) * 8; // L: 4793 + Tile.baseY = (var1 - 6) * 8; // L: 4794 + int var5 = ItemLayer.baseX - var3; // L: 4795 + int var6 = Tile.baseY - var4; // L: 4796 + var3 = ItemLayer.baseX; // L: 4797 + var4 = Tile.baseY; // L: 4798 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 4799 + NPC var19 = Client.npcs[var7]; // L: 4800 + if (var19 != null) { // L: 4801 + for (var9 = 0; var9 < 10; ++var9) { // L: 4802 + var10000 = var19.pathX; // L: 4803 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 4804 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 4806 + var19.y -= var6 * 128; // L: 4807 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 4810 + Player var22 = Client.players[var7]; // L: 4811 + if (var22 != null) { // L: 4812 + for (var9 = 0; var9 < 10; ++var9) { // L: 4813 + var10000 = var22.pathX; // L: 4814 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 4815 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 4817 + var22.y -= var6 * 128; // L: 4818 + } + } + + byte var20 = 0; // L: 4821 + byte var8 = 104; // L: 4822 + byte var21 = 1; // L: 4823 + if (var5 < 0) { // L: 4824 + var20 = 103; // L: 4825 + var8 = -1; // L: 4826 + var21 = -1; // L: 4827 + } + + byte var10 = 0; // L: 4829 + byte var11 = 104; // L: 4830 + byte var12 = 1; // L: 4831 + if (var6 < 0) { // L: 4832 + var10 = 103; // L: 4833 + var11 = -1; // L: 4834 + var12 = -1; // L: 4835 + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { // L: 4837 + for (var14 = var10; var14 != var11; var14 += var12) { // L: 4838 + int var15 = var13 + var5; // L: 4839 + int var16 = var14 + var6; // L: 4840 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 4841 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 4842 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 4843 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 4847 4848 4852 + var18.x -= var5; // L: 4849 + var18.y -= var6; // L: 4850 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 4851 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 4854 + Client.destinationX -= var5; // L: 4855 + Client.destinationY -= var6; // L: 4856 + } + + Client.soundEffectCount = 0; // L: 4858 + Client.isCameraLocked = false; // L: 4859 + ModeWhere.cameraX -= var5 << 7; // L: 4860 + ReflectionCheck.cameraZ -= var6 << 7; // L: 4861 + class6.oculusOrbFocalPointX -= var5 << 7; // L: 4862 + Players.oculusOrbFocalPointY -= var6 << 7; // L: 4863 + Client.field833 = -1; // L: 4864 + Client.graphicsObjects.clear(); // L: 4865 + Client.projectiles.clear(); // L: 4866 + + for (var14 = 0; var14 < 4; ++var14) { // L: 4867 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 4785 4868 + + @ObfuscatedName("hk") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1808852837" + ) + static final void method2198(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7817 + 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: 7818 + Client.field812[var4] = true; + } + } + + } // L: 7820 } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index 0698ed6dc4..dc211a1316 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,89 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") +@ObfuscatedName("mf") @Implements("LoginType") public class LoginType { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) - static final LoginType field4068; - @ObfuscatedName("d") + static final LoginType field4088; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) - static final LoginType field4066; - @ObfuscatedName("c") + static final LoginType field4085; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) - static final LoginType field4064; - @ObfuscatedName("y") + static final LoginType field4084; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) - static final LoginType field4074; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lml;" - ) - static final LoginType field4069; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lml;" - ) - static final LoginType field4070; + static final LoginType field4087; @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) - static final LoginType field4071; - @ObfuscatedName("q") + static final LoginType field4094; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmf;" ) - public static final LoginType field4072; - @ObfuscatedName("l") + static final LoginType field4089; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lmf;" + ) + static final LoginType field4091; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lmf;" + ) + public static final LoginType field4086; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2066001733 + intValue = -1665967971 ) - public final int field4073; - @ObfuscatedName("s") - final String field4067; + final int field4092; + @ObfuscatedName("l") + final String field4093; static { - oldscape = new LoginType(4, 0, "", ""); // L: 5 - field4068 = new LoginType(7, 1, "", ""); // L: 6 - field4066 = new LoginType(2, 2, "", ""); // L: 7 - field4064 = new LoginType(5, 3, "", ""); // L: 8 - field4074 = new LoginType(1, 4, "", ""); // L: 9 - field4069 = new LoginType(0, 5, "", ""); // L: 10 - field4070 = new LoginType(8, 6, "", ""); // L: 11 - field4071 = new LoginType(6, 7, "", ""); // L: 12 - field4072 = new LoginType(3, -1, "", "", true, new LoginType[]{oldscape, field4068, field4066, field4074, field4064}); // L: 13 + oldscape = new LoginType(0, 0, "", ""); // L: 5 + field4088 = new LoginType(8, 1, "", ""); // L: 6 + field4085 = new LoginType(6, 2, "", ""); // L: 7 + field4084 = new LoginType(2, 3, "", ""); // L: 8 + field4087 = new LoginType(4, 4, "", ""); // L: 9 + field4094 = new LoginType(1, 5, "", ""); // L: 10 + field4089 = new LoginType(3, 6, "", ""); // L: 11 + field4091 = new LoginType(7, 7, "", ""); // L: 12 + field4086 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4088, field4085, field4087, field4084}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4073 = var1; // L: 18 - this.field4067 = var4; // L: 19 + this.field4092 = var1; // L: 18 + this.field4093 = var4; // L: 19 } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lml;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmf;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4073 = var1; // L: 23 - this.field4067 = var4; // L: 24 + this.field4092 = var1; // L: 23 + this.field4093 = var4; // L: 24 } // L: 25 public String toString() { - return this.field4067; // L: 28 + return this.field4093; // L: 28 } + + @ObfuscatedName("is") + @ObfuscatedSignature( + descriptor = "(Lhu;IIIIIII)V", + garbageValue = "14464839" + ) + static final void method6344(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field669) { // L: 10031 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 10032 + } + + Client.field669 = false; // L: 10033 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10034 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10035 + var0.scrollY -= 4; // L: 10036 + class29.invalidateWidget(var0); // L: 10037 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10039 + var0.scrollY += 4; // L: 10040 + class29.invalidateWidget(var0); // L: 10041 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10043 + var7 = var3 * (var3 - 32) / var4; // L: 10044 + if (var7 < 8) { // L: 10045 + var7 = 8; + } + + int var8 = var6 - var2 - 16 - var7 / 2; // L: 10046 + int var9 = var3 - 32 - var7; // L: 10047 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 10048 + class29.invalidateWidget(var0); // L: 10049 + Client.field669 = true; // L: 10050 + } + } + + if (Client.mouseWheelRotation != 0) { // L: 10053 + var7 = var0.width; // L: 10054 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10055 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 10056 + class29.invalidateWidget(var0); // L: 10057 + } + } + + } // L: 10060 } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 8006723fa2..bac9c828a0 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,121 +4,261 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("cx") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -280091935 + intValue = -908888193 ) @Export("param0") int param0; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1430754159 + intValue = 367044629 ) @Export("param1") int param1; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1286467611 + intValue = -384608333 ) @Export("opcode") int opcode; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1909904707 + intValue = 668116437 ) @Export("identifier") int identifier; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("action") String action; MenuAction() { - } // L: 11701 + } // L: 11773 - @ObfuscatedName("gu") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1250415572" + descriptor = "(Lnk;II)V", + garbageValue = "843658366" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { // L: 4187 - var2 = 1; + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 189 + if (var2) { // L: 190 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - if (var3 < 1) { // L: 4188 - var3 = 1; - } + int var3 = var0.readBits(2); // L: 191 + Player var4 = Client.players[var1]; // L: 192 + if (var3 == 0) { // L: 193 + if (var2) { // L: 194 + var4.field1189 = false; // L: 195 + } else if (Client.localPlayerIndex == var1) { // L: 198 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (ItemLayer.baseX + var4.pathX[0] >> 13 << 14) + (Tile.baseY + var4.pathY[0] >> 13); // L: 199 + if (var4.field1237 != -1) { // L: 200 + Players.Players_orientations[var1] = var4.field1237; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 201 + } - int var5 = var3 - 334; // L: 4189 - int var6; - if (var5 < 0) { // L: 4191 - var6 = Client.field779; - } else if (var5 >= 100) { // L: 4192 - var6 = Client.field913; + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 202 + Client.players[var1] = null; // L: 203 + if (var0.readBits(1) != 0) { // L: 204 + WorldMapDecoration.updateExternalPlayer(var0, var1); + } + + } } else { - var6 = (Client.field913 - Client.field779) * var5 / 100 + Client.field779; // L: 4193 - } - - int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4194 - int var8; - int var9; - short var15; - if (var7 < Client.field918) { // L: 4195 - var15 = Client.field918; // L: 4196 - var6 = var15 * var2 * 334 / (var3 * 512); // L: 4197 - if (var6 > Client.field690) { // L: 4198 - var6 = Client.field690; // L: 4199 - var8 = var3 * var6 * 512 / (var15 * 334); // L: 4200 - var9 = (var2 - var8) / 2; // L: 4201 - if (var4) { // L: 4202 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4203 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4204 - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4205 + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 207 + var5 = var0.readBits(3); // L: 208 + var6 = var4.pathX[0]; // L: 209 + var7 = var4.pathY[0]; // L: 210 + if (var5 == 0) { // L: 211 + --var6; // L: 212 + --var7; // L: 213 + } else if (var5 == 1) { // L: 215 + --var7; + } else if (var5 == 2) { // L: 216 + ++var6; // L: 217 + --var7; // L: 218 + } else if (var5 == 3) { // L: 220 + --var6; + } else if (var5 == 4) { // L: 221 + ++var6; + } else if (var5 == 5) { // L: 222 + --var6; // L: 223 + ++var7; // L: 224 + } else if (var5 == 6) { // L: 226 + ++var7; + } else if (var5 == 7) { // L: 227 + ++var6; // L: 228 + ++var7; // L: 229 } - var0 += var9; // L: 4207 - var2 -= var9 * 2; // L: 4208 - } - } else if (var7 > Client.field846) { // L: 4211 - var15 = Client.field846; // L: 4212 - var6 = var15 * var2 * 334 / (var3 * 512); // L: 4213 - if (var6 < Client.field916) { // L: 4214 - var6 = Client.field916; // L: 4215 - var8 = var15 * var2 * 334 / (var6 * 512); // L: 4216 - var9 = (var3 - var8) / 2; // L: 4217 - if (var4) { // L: 4218 - Rasterizer2D.Rasterizer2D_resetClip(); // L: 4219 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4220 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4221 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 231 + var4.resetPath(var6, var7); // L: 232 + var4.field1189 = false; // L: 233 + } else if (var2) { // L: 235 + var4.field1189 = true; // L: 236 + var4.tileX = var6; // L: 237 + var4.tileY = var7; // L: 238 + } else { + var4.field1189 = false; // L: 241 + var4.method2120(var6, var7, Players.field1351[var1]); // L: 242 } - var1 += var9; // L: 4223 - var3 -= var9 * 2; // L: 4224 + } else if (var3 == 2) { // L: 246 + var5 = var0.readBits(4); // L: 247 + var6 = var4.pathX[0]; // L: 248 + var7 = var4.pathY[0]; // L: 249 + if (var5 == 0) { // L: 250 + var6 -= 2; // L: 251 + var7 -= 2; // L: 252 + } else if (var5 == 1) { // L: 254 + --var6; // L: 255 + var7 -= 2; // L: 256 + } else if (var5 == 2) { // L: 258 + var7 -= 2; + } else if (var5 == 3) { // L: 259 + ++var6; // L: 260 + var7 -= 2; // L: 261 + } else if (var5 == 4) { // L: 263 + var6 += 2; // L: 264 + var7 -= 2; // L: 265 + } else if (var5 == 5) { // L: 267 + var6 -= 2; // L: 268 + --var7; // L: 269 + } else if (var5 == 6) { // L: 271 + var6 += 2; // L: 272 + --var7; // L: 273 + } else if (var5 == 7) { // L: 275 + var6 -= 2; + } else if (var5 == 8) { // L: 276 + var6 += 2; + } else if (var5 == 9) { // L: 277 + var6 -= 2; // L: 278 + ++var7; // L: 279 + } else if (var5 == 10) { // L: 281 + var6 += 2; // L: 282 + ++var7; // L: 283 + } else if (var5 == 11) { // L: 285 + var6 -= 2; // L: 286 + var7 += 2; // L: 287 + } else if (var5 == 12) { // L: 289 + --var6; // L: 290 + var7 += 2; // L: 291 + } else if (var5 == 13) { // L: 293 + var7 += 2; + } else if (var5 == 14) { // L: 294 + ++var6; // L: 295 + var7 += 2; // L: 296 + } else if (var5 == 15) { // L: 298 + var6 += 2; // L: 299 + var7 += 2; // L: 300 + } + + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 302 + if (var2) { // L: 306 + var4.field1189 = true; // L: 307 + var4.tileX = var6; // L: 308 + var4.tileY = var7; // L: 309 + } else { + var4.field1189 = false; // L: 312 + var4.method2120(var6, var7, Players.field1351[var1]); // L: 313 + } + } else { + var4.resetPath(var6, var7); // L: 303 + var4.field1189 = false; // L: 304 + } + + } else { + var5 = var0.readBits(1); // L: 317 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 318 + var6 = var0.readBits(12); // L: 319 + var7 = var6 >> 10; // L: 320 + var8 = var6 >> 5 & 31; // L: 321 + if (var8 > 15) { // L: 322 + var8 -= 32; + } + + var9 = var6 & 31; // L: 323 + if (var9 > 15) { // L: 324 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 325 + var11 = var9 + var4.pathY[0]; // L: 326 + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 327 + if (var2) { // L: 331 + var4.field1189 = true; // L: 332 + var4.tileX = var10; // L: 333 + var4.tileY = var11; // L: 334 + } else { + var4.field1189 = false; // L: 337 + var4.method2120(var10, var11, Players.field1351[var1]); // L: 338 + } + } else { + var4.resetPath(var10, var11); // L: 328 + var4.field1189 = false; // L: 329 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 340 + if (Client.localPlayerIndex == var1) { // L: 341 + class26.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 344 + var7 = var6 >> 28; // L: 345 + var8 = var6 >> 14 & 16383; // L: 346 + var9 = var6 & 16383; // L: 347 + var10 = (var8 + ItemLayer.baseX + var4.pathX[0] & 16383) - ItemLayer.baseX; // L: 348 + var11 = (var9 + Tile.baseY + var4.pathY[0] & 16383) - Tile.baseY; // L: 349 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 350 + var4.resetPath(var10, var11); // L: 351 + var4.field1189 = false; // L: 352 + } else if (var2) { // L: 354 + var4.field1189 = true; // L: 355 + var4.tileX = var10; // L: 356 + var4.tileY = var11; // L: 357 + } else { + var4.field1189 = false; // L: 360 + var4.method2120(var10, var11, Players.field1351[var1]); // L: 361 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 363 + if (Client.localPlayerIndex == var1) { // L: 364 + class26.Client_plane = var4.plane; + } + + } } } + } // L: 196 205 244 315 342 365 - Client.viewportZoom = var3 * var6 / 334; // L: 4227 - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4228 - int[] var14 = new int[9]; // L: 4230 - - for (var9 = 0; var9 < var14.length; ++var9) { // L: 4231 - int var10 = var9 * 32 + 15 + 128; // L: 4232 - int var11 = var10 * 3 + 600; // L: 4235 - int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4238 - int var12 = SecureRandomCallable.method1233(var11, var3); // L: 4239 - var14[var9] = var12 * var13 >> 16; // L: 4240 - } - - Scene.Scene_buildVisiblityMap(var14, 500, 800, var2 * 334 / var3, 334); // L: 4242 + @ObfuscatedName("ko") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1382275645" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (InterfaceParent.clanChat != null) { // L: 11514 + PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); // L: 11515 + var1.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var0)); // L: 11516 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11517 + Client.packetWriter.addNode(var1); // L: 11518 } - - Client.viewportOffsetX = var0; // L: 4245 - Client.viewportOffsetY = var1; // L: 4246 - Client.viewportWidth = var2; // L: 4247 - Client.viewportHeight = var3; // L: 4248 - } // L: 4249 + } // L: 11519 } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 2a619a5173..188aa6134d 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,58 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bs") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("bq") + @ObfuscatedName("ca") + public static char field591; + @ObfuscatedName("dn") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lep;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("n") + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -916897149 + intValue = -845346373 ) @Export("count") int count; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2019207433 + intValue = 31951867 ) @Export("cycle") int cycle; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1490859287 + intValue = -1009586671 ) @Export("type") int type; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("sender") String sender; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Llw;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("prefix") String prefix; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("text") String text; @@ -65,10 +67,10 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); // L: 19 } // L: 20 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-313070172" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "-1" ) @Export("set") void set(int var1, String var2, String var3, String var4) { @@ -84,20 +86,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); // L: 35 } // L: 36 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-22" + descriptor = "(I)V", + garbageValue = "358595620" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 } // L: 40 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-624975397" + garbageValue = "42063064" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -108,30 +110,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-547685075" + descriptor = "(B)V", + garbageValue = "-75" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = InterfaceParent.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + this.isFromFriend0 = class13.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 } // L: 51 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "6" + descriptor = "(I)V", + garbageValue = "1647458411" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 } // L: 55 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "170822627" + garbageValue = "-1249487016" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -142,46 +144,109 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-33" + descriptor = "(I)V", + garbageValue = "620284728" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = InterfaceParent.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + this.isFromIgnored0 = class13.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 } // L: 66 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1712388135" + garbageValue = "-1679854800" ) @Export("fillSenderUsername") final void fillSenderUsername() { - if (this.sender != null) { // L: 69 - this.senderUsername = new Username(Calendar.method4153(this.sender), loginType); + if (this.sender != null) { + this.senderUsername = new Username(class1.method24(this.sender), AbstractUserComparator.loginType); // L: 69 } else { this.senderUsername = null; // L: 70 } } // L: 71 - @ObfuscatedName("kg") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lhz;IIIB)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-1076003545" ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); // L: 11389 - if (var4 != null) { // L: 11390 - if (Client.minimapState < 3) { // L: 11391 - LoginScreenAnimation.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11392 + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 95 + + try { + var0 = class15.getPreferencesFile("", class27.field208.name, true); // L: 97 + Buffer var1 = Login.clientPreferences.toBuffer(); // L: 98 + var0.write(var1.array, 0, var1.offset); // L: 99 + } catch (Exception var3) { // L: 101 + } + + try { + if (var0 != null) { // L: 103 + var0.closeSync(true); // L: 104 + } + } catch (Exception var2) { // L: 107 + } + + } // L: 108 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1080419559" + ) + static final int method1191(int var0, int var1) { + if (var0 == -1) { // L: 991 + return 12345678; + } else { + var1 = (var0 & 127) * var1 / 128; // L: 992 + if (var1 < 2) { // L: 993 + var1 = 2; + } else if (var1 > 126) { // L: 994 + var1 = 126; } + return (var0 & 65408) + var1; // L: 995 } - } // L: 11393 + } + + @ObfuscatedName("ic") + @ObfuscatedSignature( + descriptor = "([Lhu;IIIZI)V", + garbageValue = "1850842206" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9981 + Widget var6 = var0[var5]; // L: 9982 + if (var6 != null && var6.parentId == var1) { // L: 9983 9984 + class401.alignWidgetSize(var6, var2, var3, var4); // L: 9985 + KeyHandler.alignWidgetPosition(var6, var2, var3); // L: 9986 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9987 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 9988 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9989 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 9990 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 9991 + UserList.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 9993 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index b3de47c453..ee18e117e8 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,79 +6,299 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("dc") @Implements("Messages") public class Messages { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ljf;" + descriptor = "Ljw;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2111099267 + intValue = -1148627417 ) @Export("Messages_count") static int Messages_count; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1166914345 + ) + public static int field1377; static { Messages_channels = new HashMap(); // L: 9 Messages_hashTable = new IterableNodeHashTable(1024); // L: 10 Messages_queue = new IterableDualNodeQueue(); // L: 11 - Messages_count = 0; // L: 12 + Messages_count = 0; } - @ObfuscatedName("n") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 - if (var0 % 37L == 0L) { // L: 17 - return null; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(CS)B", + garbageValue = "252" + ) + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + var1 = (byte)var0; + } else if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { // L: 14 + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { // L: 16 + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { // L: 18 + var1 = -122; + } else if (var0 == 8225) { // L: 19 + var1 = -121; + } else if (var0 == 710) { // L: 20 + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { // L: 22 + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; // L: 26 + } else if (var0 == 8217) { // L: 27 + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { // L: 29 + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { // L: 31 + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; + } else { + var1 = 63; // L: 40 + } + + return var1; // L: 41 + } + + @ObfuscatedName("ej") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2277 + class9.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2278 + class9.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2279 + class9.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2280 + Login.loginIndex = 3; // L: 2281 + Login.field994 = 1; // L: 2282 + } else if (var0 == 4) { // L: 2284 + InterfaceParent.method2096(0); // L: 2285 + } else if (var0 == 5) { // L: 2287 + Login.field994 = 2; // L: 2288 + class9.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: 2289 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2291 + if (var0 == 7) { // L: 2294 + class9.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2295 + class9.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2296 + class9.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2297 + class9.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2298 + class9.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2299 + class9.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2300 + class9.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2301 + class9.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2302 + class9.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2303 + class9.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: 2304 + InterfaceParent.method2096(1); // L: 2305 + } else if (var0 == 19) { // L: 2307 + class9.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2308 + class9.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2309 + class9.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2310 + class9.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2311 + class9.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2312 + class9.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2313 + class9.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2314 + class9.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2315 + class9.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) { + class9.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2316 + } else if (var0 == 37) { // L: 2317 + class9.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2318 + class9.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2319 + Login.loginIndex = 8; // L: 2320 } else { - int var2 = 0; // L: 18 - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22 - ++var2; // L: 21 + if (var0 == 56) { // L: 2322 + class9.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2323 + class20.updateGameState(11); // L: 2324 + return; // L: 2325 } - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 24 25 34 - long var6 = var0; // L: 26 - var0 /= 37L; // L: 27 - var8 = class299.base37Table[(int)(var6 - 37L * var0)]; // L: 28 - if (var8 == '_') { // L: 29 - int var9 = var5.length() - 1; // L: 30 - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31 - var8 = 160; // L: 32 - } + if (var0 == 57) { // L: 2327 + class9.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2328 + class20.updateGameState(11); // L: 2329 + return; // L: 2330 } - var5.reverse(); // L: 36 - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37 - return var5.toString(); // L: 38 + if (var0 == 61) { // L: 2332 + Login.loginIndex = 7; // L: 2333 + } else { + class9.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2335 + } } } else { - return null; + class9.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2292 } - } - @ObfuscatedName("c") + class20.updateGameState(10); // L: 2336 + } // L: 2337 + + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "618047929" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1889624441" ) - static void method2372() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 50 - } // L: 51 + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3150 + Login.clientPreferences.roofsHidden = !Login.clientPreferences.roofsHidden; // L: 3151 + Message.savePreferences(); // L: 3152 + if (Login.clientPreferences.roofsHidden) { // L: 3153 + class69.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + class69.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3154 + } + } + + if (var0.equalsIgnoreCase("displayfps")) { // L: 3156 + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3157 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { + Client.showMouseOverText = !Client.showMouseOverText; // L: 3158 + } + + if (Client.staffModLevel >= 2) { // L: 3159 + if (var0.equalsIgnoreCase("errortest")) { // L: 3160 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3161 + UserComparator4.worldMap.showCoord = !UserComparator4.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3162 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3163 + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { + System.gc(); // L: 3164 + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3165 + HealthBarUpdate.method2181(); + } + + if (var0.equalsIgnoreCase("setclantransmit")) { // L: 3166 + Client.field786 = Client.cycleCntr; // L: 3167 + Client.field800 = Client.cycleCntr; // L: 3168 + } + } + + PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); // L: 3172 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3173 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3174 + Client.packetWriter.addNode(var1); // L: 3175 + } // L: 3176 + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1512801898" + ) + static final void method2367(int var0) { + var0 = Math.min(Math.max(var0, 0), 255); // L: 11155 + if (var0 != Login.clientPreferences.musicVolume) { // L: 11156 + if (Login.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11157 + PacketBufferNode.method3898(class8.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11158 + Client.field842 = false; // L: 11159 + } else if (var0 == 0) { // L: 11161 + class232.method4360(); // L: 11162 + Client.field842 = false; // L: 11163 + } else if (class210.musicPlayerStatus != 0) { // L: 11166 + class375.musicTrackVolume = var0; + } else { + class210.midiPcmStream.setPcmStreamVolume(var0); // L: 11167 + } + + Login.clientPreferences.musicVolume = var0; // L: 11169 + Message.savePreferences(); // L: 11170 + } + + } // L: 11172 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index b04bb6b9a9..76d1c7495a 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,38 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hs") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("l") - static final byte[] field2500; @ObfuscatedName("n") + static final byte[] field2519; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lnu;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("division") int division; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("trackLengths") int[] trackLengths; + @ObfuscatedName("e") + int[] field2522; + @ObfuscatedName("k") + int field2518; @ObfuscatedName("h") - int[] field2497; - @ObfuscatedName("z") - int field2498; - @ObfuscatedName("q") - long field2502; + long field2525; static { - field2500 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 + field2519 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 } MidiFileReader(byte[] var1) { @@ -46,14 +46,14 @@ public class MidiFileReader { this.buffer = new Buffer((byte[])null); // L: 8 } // L: 23 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; // L: 30 this.buffer.offset = 10; // L: 33 int var2 = this.buffer.readUnsignedShort(); // L: 34 this.division = this.buffer.readUnsignedShort(); // L: 36 - this.field2498 = 500000; // L: 37 + this.field2518 = 500000; // L: 37 this.trackStarts = new int[var2]; // L: 38 Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; // L: 46 } - this.field2502 = 0L; // L: 48 + this.field2525 = 0L; // L: 48 this.trackPositions = new int[var2]; // L: 49 for (var3 = 0; var3 < var2; ++var3) { // L: 50 @@ -78,50 +78,50 @@ public class MidiFileReader { } this.trackLengths = new int[var2]; // L: 51 - this.field2497 = new int[var2]; // L: 52 + this.field2522 = new int[var2]; // L: 52 } // L: 53 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("clear") void clear() { this.buffer.array = null; // L: 56 this.trackStarts = null; // L: 57 this.trackPositions = null; // L: 58 this.trackLengths = null; // L: 59 - this.field2497 = null; // L: 60 + this.field2522 = null; // L: 60 } // L: 61 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("isReady") boolean isReady() { return this.buffer.array != null; // L: 64 } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("trackCount") int trackCount() { return this.trackPositions.length; // L: 68 } - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; // L: 72 } // L: 73 - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; // L: 76 } // L: 77 - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; // L: 80 } // L: 81 - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); // L: 84 @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; // L: 85 } // L: 86 - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); // L: 89 return var2; // L: 90 } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; if (var2 < 0) { // L: 95 var5 = var2 & 255; // L: 96 - this.field2497[var1] = var5; // L: 97 + this.field2522[var1] = var5; // L: 97 ++this.buffer.offset; // L: 98 } else { - var5 = this.field2497[var1]; // L: 101 + var5 = this.field2522[var1]; // L: 101 } if (var5 != 240 && var5 != 247) { // L: 103 - return this.method4047(var1, var5); // L: 116 + return this.method4074(var1, var5); // L: 116 } else { int var3 = this.buffer.readVarInt(); // L: 104 if (var5 == 247 && var3 > 0) { // L: 105 int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106 if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107 ++this.buffer.offset; // L: 108 - this.field2497[var1] = var4; // L: 109 - return this.method4047(var1, var4); // L: 110 + this.field2522[var1] = var4; // L: 109 + return this.method4074(var1, var4); // L: 110 } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("s") - int method4047(int var1, int var2) { + @ObfuscatedName("l") + int method4074(int var1, int var2) { int var4; if (var2 == 255) { // L: 120 int var7 = this.buffer.readUnsignedByte(); // L: 121 @@ -183,8 +183,8 @@ public class MidiFileReader { int var5 = this.buffer.readMedium(); // L: 128 var4 -= 3; // L: 129 int var6 = this.trackLengths[var1]; // L: 130 - this.field2502 += (long)var6 * (long)(this.field2498 - var5); // L: 131 - this.field2498 = var5; // L: 132 + this.field2525 += (long)var6 * (long)(this.field2518 - var5); // L: 131 + this.field2518 = var5; // L: 132 var10000 = this.buffer; // L: 133 var10000.offset += var4; return 2; // L: 134 @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; // L: 137 } } else { - byte var3 = field2500[var2 - 128]; // L: 139 + byte var3 = field2519[var2 - 128]; // L: 139 var4 = var2; // L: 140 if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("b") - long method4048(int var1) { - return this.field2502 + (long)var1 * (long)this.field2498; // L: 147 + @ObfuscatedName("m") + long method4070(int var1) { + return this.field2525 + (long)var1 * (long)this.field2518; // L: 147 } - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; // L: 151 @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; // L: 161 } - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; // L: 165 @@ -244,15 +244,15 @@ public class MidiFileReader { return true; // L: 167 } - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("reset") void reset(long var1) { - this.field2502 = var1; // L: 171 + this.field2525 = var1; // L: 171 int var3 = this.trackPositions.length; // L: 172 for (int var4 = 0; var4 < var3; ++var4) { // L: 173 this.trackLengths[var4] = 0; // L: 174 - this.field2497[var4] = 0; // L: 175 + this.field2522[var4] = 0; // L: 175 this.buffer.offset = this.trackStarts[var4]; // L: 176 this.readTrackLength(var4); // L: 177 this.trackPositions[var4] = this.buffer.offset; // L: 178 diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 7b11fad6fb..903880fe3d 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,161 +4,157 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("hn") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("mf") - @ObfuscatedGetter( - intValue = 806429497 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("n") + @ObfuscatedName("j") + static int[][][] field2489; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1755740693 - ) - int field2442; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1633442869 - ) - int field2443; - @ObfuscatedName("c") - int[] field2444; - @ObfuscatedName("y") - int[] field2447; - @ObfuscatedName("h") - int[] field2446; - @ObfuscatedName("z") - int[] field2445; - @ObfuscatedName("e") - int[] field2448; - @ObfuscatedName("q") - int[] field2463; - @ObfuscatedName("l") - int[] field2441; - @ObfuscatedName("s") - int[] field2451; - @ObfuscatedName("b") - int[] field2452; - @ObfuscatedName("u") - int[] field2458; - @ObfuscatedName("t") - int[] field2455; - @ObfuscatedName("p") - int[] field2456; - @ObfuscatedName("m") - int[] field2460; - @ObfuscatedName("r") - int[] field2457; @ObfuscatedName("o") - int[] field2468; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "[[Lhq;" + @ObfuscatedGetter( + intValue = 1019449591 ) - MusicPatchNode[][] field2450; + int field2512; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -679798271 + ) + int field2494; + @ObfuscatedName("p") + int[] field2500; + @ObfuscatedName("b") + int[] field2492; + @ObfuscatedName("e") + int[] field2493; + @ObfuscatedName("k") + int[] field2491; + @ObfuscatedName("g") + int[] field2495; + @ObfuscatedName("h") + int[] field2505; + @ObfuscatedName("n") + int[] field2497; + @ObfuscatedName("l") + int[] field2498; + @ObfuscatedName("m") + int[] field2499; + @ObfuscatedName("x") + int[] field2516; + @ObfuscatedName("z") + int[] field2501; + @ObfuscatedName("i") + int[] field2502; + @ObfuscatedName("a") + int[] field2503; + @ObfuscatedName("w") + int[] field2488; + @ObfuscatedName("s") + int[] field2490; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "[[Lhj;" + ) + MusicPatchNode[][] field2506; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "[[Lhj;" + ) + MusicPatchNode[][] field2507; @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "[[Lhq;" - ) - MusicPatchNode[][] field2461; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "Lho;" + descriptor = "Lhs;" ) @Export("midiFile") MidiFileReader midiFile; + @ObfuscatedName("am") + boolean field2509; @ObfuscatedName("ag") - boolean field2459; - @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1902881545 + intValue = -177178127 ) @Export("track") int track; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 418565545 + intValue = -97944121 ) @Export("trackLength") int trackLength; - @ObfuscatedName("aq") - @ObfuscatedGetter( - longValue = 7287012741980602557L - ) - long field2466; @ObfuscatedName("at") @ObfuscatedGetter( - longValue = -8407851489903223283L + longValue = -7685461656623230769L ) - long field2467; - @ObfuscatedName("ak") + long field2496; + @ObfuscatedName("aj") + @ObfuscatedGetter( + longValue = 1216058038878883829L + ) + long field2513; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lhv;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2442 = 256; // L: 14 - this.field2443 = 1000000; // L: 15 - this.field2444 = new int[16]; // L: 16 - this.field2447 = new int[16]; // L: 17 - this.field2446 = new int[16]; // L: 18 - this.field2445 = new int[16]; // L: 19 - this.field2448 = new int[16]; // L: 20 - this.field2463 = new int[16]; // L: 21 - this.field2441 = new int[16]; // L: 22 - this.field2451 = new int[16]; // L: 23 - this.field2452 = new int[16]; // L: 24 - this.field2458 = new int[16]; // L: 28 - this.field2455 = new int[16]; // L: 29 - this.field2456 = new int[16]; // L: 30 - this.field2460 = new int[16]; // L: 31 - this.field2457 = new int[16]; // L: 32 - this.field2468 = new int[16]; // L: 33 - this.field2450 = new MusicPatchNode[16][128]; // L: 34 - this.field2461 = new MusicPatchNode[16][128]; // L: 35 + this.field2512 = 256; // L: 14 + this.field2494 = 1000000; // L: 15 + this.field2500 = new int[16]; // L: 16 + this.field2492 = new int[16]; // L: 17 + this.field2493 = new int[16]; + this.field2491 = new int[16]; // L: 19 + this.field2495 = new int[16]; + this.field2505 = new int[16]; + this.field2497 = new int[16]; + this.field2498 = new int[16]; // L: 23 + this.field2499 = new int[16]; + this.field2516 = new int[16]; + this.field2501 = new int[16]; // L: 29 + this.field2502 = new int[16]; // L: 30 + this.field2503 = new int[16]; // L: 31 + this.field2488 = new int[16]; // L: 32 + this.field2490 = new int[16]; // L: 33 + this.field2506 = new MusicPatchNode[16][128]; // L: 34 + this.field2507 = 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.method3931(); // L: 46 + this.method3950(); // L: 46 } // L: 47 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "699438448" + garbageValue = "2119488267" ) @Export("setPcmStreamVolume") public synchronized void setPcmStreamVolume(int var1) { - this.field2442 = var1; // L: 50 + this.field2512 = var1; // L: 50 } // L: 51 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1131484888" + garbageValue = "1779220205" ) - int method3912() { - return this.field2442; // L: 54 + public int method4018() { + return this.field2512; // L: 54 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lhr;Lig;Ldy;IB)Z", - garbageValue = "80" + descriptor = "(Lho;Lir;Lbi;IB)Z", + garbageValue = "2" ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4125(); // L: 58 + var1.method4154(); // L: 58 boolean var5 = true; // L: 59 int[] var6 = null; // L: 60 if (var4 > 0) { // L: 61 @@ -186,7 +182,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var10, (long)var8); // L: 80 } - if (!var9.method4086(var3, var7.byteArray, var6)) { // L: 82 + if (!var9.method4111(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } @@ -198,10 +194,10 @@ public class MidiPcmStream extends PcmStream { return var5; // L: 85 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1484223383" + garbageValue = "-1548325300" ) @Export("clearAll") public synchronized void clearAll() { @@ -211,78 +207,78 @@ public class MidiPcmStream extends PcmStream { } // L: 90 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-24768" + descriptor = "(I)V", + garbageValue = "-1457707769" ) @Export("removeAll") - synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 - var1.remove(); + public synchronized void removeAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { + var1.remove(); // L: 93 } } // L: 94 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; // L: 469 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; // L: 473 } - @ObfuscatedName("e") - protected synchronized int vmethod4099() { + @ObfuscatedName("g") + protected synchronized int vmethod4124() { return 0; // L: 477 } - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { // L: 481 - int var4 = this.midiFile.division * this.field2443 / StructComposition.field3338; // L: 482 + int var4 = this.midiFile.division * this.field2494 / PcmPlayer.field394; // L: 482 do { - long var5 = this.field2466 + (long)var3 * (long)var4; // L: 484 - if (this.field2467 - var5 >= 0L) { // L: 485 - this.field2466 = var5; // L: 486 + long var5 = this.field2496 + (long)var3 * (long)var4; // L: 484 + if (this.field2513 - var5 >= 0L) { // L: 485 + this.field2496 = var5; // L: 486 break; } - int var7 = (int)(((long)var4 + (this.field2467 - this.field2466) - 1L) / (long)var4); // L: 489 - this.field2466 += (long)var4 * (long)var7; // L: 490 + int var7 = (int)(((long)var4 + (this.field2513 - this.field2496) - 1L) / (long)var4); // L: 489 + this.field2496 += (long)var4 * (long)var7; // L: 490 this.patchStream.fill(var1, var2, var7); // L: 491 var2 += var7; // L: 492 var3 -= var7; // L: 493 - this.method3944(); // L: 494 + this.method3934(); // L: 494 } while(this.midiFile.isReady()); // L: 495 } this.patchStream.fill(var1, var2, var3); // L: 498 } // L: 499 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lhr;ZI)V", - garbageValue = "99605347" + descriptor = "(Lho;ZI)V", + garbageValue = "-2104011211" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); // L: 97 this.midiFile.parse(var1.midi); // L: 98 - this.field2459 = var2; // L: 99 - this.field2466 = 0L; // L: 100 + this.field2509 = var2; // L: 99 + this.field2496 = 0L; // L: 100 int var3 = this.midiFile.trackCount(); // L: 101 for (int var4 = 0; var4 < var3; ++var4) { // L: 102 @@ -293,248 +289,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); // L: 107 this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 - this.field2467 = this.midiFile.method4048(this.trackLength); // L: 109 + this.field2513 = this.midiFile.method4070(this.trackLength); // L: 109 } // L: 110 - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { // L: 502 - int var2 = this.midiFile.division * this.field2443 / StructComposition.field3338; // L: 503 + int var2 = this.midiFile.division * this.field2494 / PcmPlayer.field394; // L: 503 do { - long var3 = this.field2466 + (long)var2 * (long)var1; // L: 505 - if (this.field2467 - var3 >= 0L) { // L: 506 - this.field2466 = var3; // L: 507 + long var3 = (long)var1 * (long)var2 + this.field2496; // L: 505 + if (this.field2513 - var3 >= 0L) { // L: 506 + this.field2496 = var3; // L: 507 break; } - int var5 = (int)((this.field2467 - this.field2466 + (long)var2 - 1L) / (long)var2); // L: 510 - this.field2466 += (long)var2 * (long)var5; // L: 511 + int var5 = (int)(((long)var2 + (this.field2513 - this.field2496) - 1L) / (long)var2); // L: 510 + this.field2496 += (long)var5 * (long)var2; // L: 511 this.patchStream.skip(var5); // L: 512 var1 -= var5; // L: 513 - this.method3944(); // L: 514 + this.method3934(); // L: 514 } while(this.midiFile.isReady()); // L: 515 } this.patchStream.skip(var1); // L: 518 } // L: 519 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-121" + descriptor = "(I)V", + garbageValue = "1436028334" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); // L: 113 - this.method3931(); // L: 114 + this.method3950(); // L: 114 } // L: 115 - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1309898808" + garbageValue = "-1133378291" ) @Export("isReady") - synchronized boolean isReady() { + public synchronized boolean isReady() { return this.midiFile.isReady(); // L: 118 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1101705080" + garbageValue = "1540065246" ) - public synchronized void method3919(int var1, int var2) { - this.method3920(var1, var2); // L: 122 + public synchronized void method3938(int var1, int var2) { + this.method3939(var1, var2); // L: 122 } // L: 123 - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1341078259" + garbageValue = "1211768698" ) - void method3920(int var1, int var2) { - this.field2445[var1] = var2; // L: 126 - this.field2463[var1] = var2 & -128; // L: 127 - this.method3921(var1, var2); // L: 128 + void method3939(int var1, int var2) { + this.field2491[var1] = var2; // L: 126 + this.field2505[var1] = var2 & -128; // L: 127 + this.method3963(var1, var2); // L: 128 } // L: 129 - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-982058038" + garbageValue = "1642628999" ) - void method3921(int var1, int var2) { - if (var2 != this.field2448[var1]) { // L: 132 - this.field2448[var1] = var2; // L: 133 + void method3963(int var1, int var2) { + if (var2 != this.field2495[var1]) { // L: 132 + this.field2495[var1] = var2; // L: 133 for (int var3 = 0; var3 < 128; ++var3) { // L: 134 - this.field2461[var1][var3] = null; + this.field2507[var1][var3] = null; } } } // L: 136 - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "441303152" + garbageValue = "1083924196" ) - void method3922(int var1, int var2, int var3) { - this.method3924(var1, var2, 64); // L: 139 - if ((this.field2458[var1] & 2) != 0) { // L: 140 + void method3941(int var1, int var2, int var3) { + this.method4017(var1, var2, 64); // L: 139 + if ((this.field2516[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.field2471 == var1 && var4.field2486 < 0) { // L: 142 - this.field2450[var1][var4.field2475] = null; // L: 143 - this.field2450[var1][var2] = var4; // L: 144 - int var8 = (var4.field2472 * var4.field2480 >> 12) + var4.field2478; // L: 145 - var4.field2478 += var2 - var4.field2475 << 8; // L: 146 - var4.field2472 = var8 - var4.field2478; // L: 147 - var4.field2480 = 4096; // L: 148 - var4.field2475 = var2; // L: 149 + if (var4.field2554 == var1 && var4.field2561 < 0) { // L: 142 + this.field2506[var1][var4.field2547] = null; // L: 143 + this.field2506[var1][var2] = var4; // L: 144 + int var8 = (var4.field2552 * var4.field2556 >> 12) + var4.field2555; // L: 145 + var4.field2555 += var2 - var4.field2547 << 8; // L: 146 + var4.field2556 = var8 - var4.field2555; // L: 147 + var4.field2552 = 4096; // L: 148 + var4.field2547 = var2; // L: 149 return; // L: 150 } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2448[var1]); // L: 154 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2495[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.field2471 = var1; // L: 159 + var6.field2554 = var1; // L: 159 var6.patch = var9; // L: 160 var6.rawSound = var5; // L: 161 - var6.field2473 = var9.field2511[var2]; // L: 162 - var6.field2474 = var9.field2512[var2]; // L: 163 - var6.field2475 = var2; // L: 164 - var6.field2476 = var3 * var3 * var9.field2507[var2] * var9.field2509 + 1024 >> 11; // L: 165 - var6.field2477 = var9.field2510[var2] & 255; // L: 166 - var6.field2478 = (var2 << 8) - (var9.field2513[var2] & 32767); // L: 167 - var6.field2481 = 0; // L: 168 - var6.field2491 = 0; // L: 169 - var6.field2483 = 0; // L: 170 - var6.field2486 = -1; // L: 171 - var6.field2482 = 0; // L: 172 - if (this.field2460[var1] == 0) { // L: 173 - var6.stream = RawPcmStream.method2845(var5, this.method4009(var6), this.method3997(var6), this.method3938(var6)); // L: 174 + var6.field2550 = var9.field2536[var2]; // L: 162 + var6.field2551 = var9.field2537[var2]; // L: 163 + var6.field2547 = var2; // L: 164 + var6.field2553 = var3 * var3 * var9.field2534[var2] * var9.field2532 + 1024 >> 11; // L: 165 + var6.field2557 = var9.field2539[var2] & 255; // L: 166 + var6.field2555 = (var2 << 8) - (var9.field2533[var2] & 32767); // L: 167 + var6.field2568 = 0; // L: 168 + var6.field2559 = 0; // L: 169 + var6.field2560 = 0; // L: 170 + var6.field2561 = -1; // L: 171 + var6.field2562 = 0; // L: 172 + if (this.field2503[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method898(var5, this.method3955(var6), this.method3956(var6), this.method4032(var6)); // L: 174 } else { - var6.stream = RawPcmStream.method2845(var5, this.method4009(var6), 0, this.method3938(var6)); // L: 177 - this.method3923(var6, var9.field2513[var2] < 0); // L: 178 + var6.stream = RawPcmStream.method898(var5, this.method3955(var6), 0, this.method4032(var6)); // L: 177 + this.method3933(var6, var9.field2533[var2] < 0); // L: 178 } - if (var9.field2513[var2] < 0) { // L: 180 + if (var9.field2533[var2] < 0) { // L: 180 var6.stream.setNumLoops(-1); } - if (var6.field2474 >= 0) { // L: 181 - MusicPatchNode var7 = this.field2461[var1][var6.field2474]; // L: 182 - if (var7 != null && var7.field2486 < 0) { // L: 183 - this.field2450[var1][var7.field2475] = null; // L: 184 - var7.field2486 = 0; // L: 185 + if (var6.field2551 >= 0) { // L: 181 + MusicPatchNode var7 = this.field2507[var1][var6.field2551]; // L: 182 + if (var7 != null && var7.field2561 < 0) { // L: 183 + this.field2506[var1][var7.field2547] = null; // L: 184 + var7.field2561 = 0; // L: 185 } - this.field2461[var1][var6.field2474] = var6; // L: 187 + this.field2507[var1][var6.field2551] = var6; // L: 187 } this.patchStream.queue.addFirst(var6); // L: 189 - this.field2450[var1][var2] = var6; // L: 190 + this.field2506[var1][var2] = var6; // L: 190 } } } // L: 191 - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lhq;ZI)V", - garbageValue = "-2147173721" + descriptor = "(Lhj;ZI)V", + garbageValue = "-744125730" ) - void method3923(MusicPatchNode var1, boolean var2) { + void method3933(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; // L: 194 int var4; - if (var2 && var1.rawSound.field1404) { // L: 196 + if (var2 && var1.rawSound.field370) { // L: 196 int var5 = var3 + var3 - var1.rawSound.start; // L: 197 - var4 = (int)((long)this.field2460[var1.field2471] * (long)var5 >> 6); // L: 198 + var4 = (int)((long)this.field2503[var1.field2554] * (long)var5 >> 6); // L: 198 var3 <<= 8; // L: 199 if (var4 >= var3) { // L: 200 var4 = var3 + var3 - 1 - var4; // L: 201 - var1.stream.method2722(); // L: 202 + var1.stream.method907(); // L: 202 } } else { - var4 = (int)((long)this.field2460[var1.field2471] * (long)var3 >> 6); // L: 206 + var4 = (int)((long)var3 * (long)this.field2503[var1.field2554] >> 6); // L: 206 } - var1.stream.method2781(var4); // L: 208 + var1.stream.method906(var4); // L: 208 } // L: 209 - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "589612464" + descriptor = "(IIIB)V", + garbageValue = "41" ) - void method3924(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2450[var1][var2]; // L: 212 + void method4017(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2506[var1][var2]; // L: 212 if (var4 != null) { // L: 213 - this.field2450[var1][var2] = null; // L: 214 - if ((this.field2458[var1] & 2) != 0) { // L: 215 + this.field2506[var1][var2] = null; // L: 214 + if ((this.field2516[var1] & 2) != 0) { // L: 215 for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 - if (var5.field2471 == var4.field2471 && var5.field2486 < 0 && var5 != var4) { // L: 217 - var4.field2486 = 0; // L: 218 + if (var5.field2554 == var4.field2554 && var5.field2561 < 0 && var4 != var5) { // L: 217 + var4.field2561 = 0; // L: 218 break; // L: 219 } } } else { - var4.field2486 = 0; // L: 224 + var4.field2561 = 0; // L: 224 } } } // L: 226 - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIIB)V", - garbageValue = "-112" + garbageValue = "-74" ) - void method3925(int var1, int var2, int var3) { + void method3944(int var1, int var2, int var3) { } // L: 228 - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "419517306" + garbageValue = "-886416554" ) - void method3926(int var1, int var2) { + void method3945(int var1, int var2) { } // L: 229 - @ObfuscatedName("o") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "10" + descriptor = "(III)V", + garbageValue = "-1447688346" ) - void method3995(int var1, int var2) { - this.field2441[var1] = var2; // L: 232 + void method4034(int var1, int var2) { + this.field2497[var1] = var2; // L: 232 } // L: 233 - @ObfuscatedName("ay") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "127" + descriptor = "(II)V", + garbageValue = "-1464923908" ) - void method3928(int var1) { + void method3947(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 - if (var1 < 0 || var2.field2471 == var1) { // L: 237 + if (var1 < 0 || var2.field2554 == var1) { // L: 237 if (var2.stream != null) { // L: 238 - var2.stream.method2803(StructComposition.field3338 / 100); // L: 239 - if (var2.stream.method2730()) { // L: 240 + var2.stream.method920(PcmPlayer.field394 / 100); // L: 239 + if (var2.stream.method941()) { // L: 240 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method4032(); // L: 241 + var2.method4163(); // L: 241 } - if (var2.field2486 < 0) { // L: 243 - this.field2450[var2.field2471][var2.field2475] = null; + if (var2.field2561 < 0) { // L: 243 + this.field2506[var2.field2554][var2.field2547] = null; } var2.remove(); // L: 244 @@ -543,107 +539,107 @@ public class MidiPcmStream extends PcmStream { } // L: 247 - @ObfuscatedName("am") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-8109" + descriptor = "(IB)V", + garbageValue = "119" ) - void method3929(int var1) { + void method3948(int var1) { if (var1 >= 0) { // L: 250 - this.field2444[var1] = 12800; // L: 254 - this.field2447[var1] = 8192; // L: 255 - this.field2446[var1] = 16383; // L: 256 - this.field2441[var1] = 8192; // L: 257 - this.field2451[var1] = 0; // L: 258 - this.field2452[var1] = 8192; // L: 259 - this.method3932(var1); // L: 260 - this.method3971(var1); // L: 261 - this.field2458[var1] = 0; // L: 262 - this.field2455[var1] = 32767; // L: 263 - this.field2456[var1] = 256; // L: 264 - this.field2460[var1] = 0; // L: 265 - this.method3935(var1, 8192); // L: 266 + this.field2500[var1] = 12800; // L: 254 + this.field2492[var1] = 8192; // L: 255 + this.field2493[var1] = 16383; // L: 256 + this.field2497[var1] = 8192; // L: 257 + this.field2498[var1] = 0; // L: 258 + this.field2499[var1] = 8192; // L: 259 + this.method3969(var1); // L: 260 + this.method3999(var1); // L: 261 + this.field2516[var1] = 0; // L: 262 + this.field2501[var1] = 32767; // L: 263 + this.field2502[var1] = 256; // L: 264 + this.field2503[var1] = 0; // L: 265 + this.method3967(var1, 8192); // L: 266 } else { for (var1 = 0; var1 < 16; ++var1) { // L: 251 - this.method3929(var1); + this.method3948(var1); } } } // L: 252 267 - @ObfuscatedName("ag") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "1519020600" ) - void method4017(int var1) { + void method3949(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 - if ((var1 < 0 || var2.field2471 == var1) && var2.field2486 < 0) { // L: 271 272 - this.field2450[var2.field2471][var2.field2475] = null; // L: 273 - var2.field2486 = 0; // L: 274 + if ((var1 < 0 || var2.field2554 == var1) && var2.field2561 < 0) { // L: 271 272 + this.field2506[var2.field2554][var2.field2547] = null; // L: 273 + var2.field2561 = 0; // L: 274 } } } // L: 278 - @ObfuscatedName("ae") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-359198859" + garbageValue = "1718659694" ) - void method3931() { - this.method3928(-1); // L: 281 - this.method3929(-1); // L: 282 + void method3950() { + this.method3947(-1); // L: 281 + this.method3948(-1); // L: 282 int var1; for (var1 = 0; var1 < 16; ++var1) { // L: 283 - this.field2448[var1] = this.field2445[var1]; + this.field2495[var1] = this.field2491[var1]; } for (var1 = 0; var1 < 16; ++var1) { // L: 284 - this.field2463[var1] = this.field2445[var1] & -128; + this.field2505[var1] = this.field2491[var1] & -128; } } // L: 285 - @ObfuscatedName("ac") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2021609414" + garbageValue = "882944366" ) - void method3932(int var1) { - if ((this.field2458[var1] & 2) != 0) { // L: 288 + void method3969(int var1) { + if ((this.field2516[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.field2471 == var1 && this.field2450[var1][var2.field2475] == null && var2.field2486 < 0) { // L: 290 291 - var2.field2486 = 0; + if (var2.field2554 == var1 && this.field2506[var1][var2.field2547] == null && var2.field2561 < 0) { // L: 290 291 + var2.field2561 = 0; } } } } // L: 295 - @ObfuscatedName("aq") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-781688600" + descriptor = "(IB)V", + garbageValue = "6" ) - void method3971(int var1) { - if ((this.field2458[var1] & 4) != 0) { // L: 298 + void method3999(int var1) { + if ((this.field2516[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.field2471 == var1) { // L: 300 - var2.field2479 = 0; + if (var2.field2554 == var1) { // L: 300 + var2.field2567 = 0; } } } } // L: 303 - @ObfuscatedName("at") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "30" + garbageValue = "8" ) - void method3934(int var1) { + void method4050(int var1) { int var2 = var1 & 240; // L: 306 int var3; int var4; @@ -652,260 +648,260 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; // L: 308 var4 = var1 >> 8 & 127; // L: 309 var5 = var1 >> 16 & 127; // L: 310 - this.method3924(var3, var4, var5); // L: 311 + this.method4017(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.method3922(var3, var4, var5); + this.method3941(var3, var4, var5); } else { - this.method3924(var3, var4, 64); // L: 319 + this.method4017(var3, var4, 64); // L: 319 } } else if (var2 == 160) { // L: 322 var3 = var1 & 15; // L: 323 var4 = var1 >> 8 & 127; // L: 324 var5 = var1 >> 16 & 127; // L: 325 - this.method3925(var3, var4, var5); // L: 326 + this.method3944(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.field2463[var3] = (var5 << 14) + (this.field2463[var3] & -2080769); + this.field2505[var3] = (var5 << 14) + (this.field2505[var3] & -2080769); } if (var4 == 32) { // L: 334 - this.field2463[var3] = (var5 << 7) + (this.field2463[var3] & -16257); + this.field2505[var3] = (var5 << 7) + (this.field2505[var3] & -16257); } if (var4 == 1) { // L: 335 - this.field2451[var3] = (var5 << 7) + (this.field2451[var3] & -16257); + this.field2498[var3] = (var5 << 7) + (this.field2498[var3] & -16257); } if (var4 == 33) { // L: 336 - this.field2451[var3] = var5 + (this.field2451[var3] & -128); + this.field2498[var3] = var5 + (this.field2498[var3] & -128); } if (var4 == 5) { // L: 337 - this.field2452[var3] = (var5 << 7) + (this.field2452[var3] & -16257); + this.field2499[var3] = (var5 << 7) + (this.field2499[var3] & -16257); } if (var4 == 37) { // L: 338 - this.field2452[var3] = var5 + (this.field2452[var3] & -128); + this.field2499[var3] = var5 + (this.field2499[var3] & -128); } if (var4 == 7) { // L: 339 - this.field2444[var3] = (var5 << 7) + (this.field2444[var3] & -16257); + this.field2500[var3] = (var5 << 7) + (this.field2500[var3] & -16257); } if (var4 == 39) { // L: 340 - this.field2444[var3] = var5 + (this.field2444[var3] & -128); + this.field2500[var3] = var5 + (this.field2500[var3] & -128); } if (var4 == 10) { // L: 341 - this.field2447[var3] = (var5 << 7) + (this.field2447[var3] & -16257); + this.field2492[var3] = (var5 << 7) + (this.field2492[var3] & -16257); } if (var4 == 42) { // L: 342 - this.field2447[var3] = var5 + (this.field2447[var3] & -128); + this.field2492[var3] = var5 + (this.field2492[var3] & -128); } if (var4 == 11) { // L: 343 - this.field2446[var3] = (var5 << 7) + (this.field2446[var3] & -16257); + this.field2493[var3] = (var5 << 7) + (this.field2493[var3] & -16257); } if (var4 == 43) { // L: 344 - this.field2446[var3] = var5 + (this.field2446[var3] & -128); + this.field2493[var3] = var5 + (this.field2493[var3] & -128); } int[] var10000; if (var4 == 64) { // L: 345 if (var5 >= 64) { // L: 346 - var10000 = this.field2458; + var10000 = this.field2516; var10000[var3] |= 1; } else { - var10000 = this.field2458; // L: 347 + var10000 = this.field2516; // L: 347 var10000[var3] &= -2; } } if (var4 == 65) { // L: 349 if (var5 >= 64) { // L: 350 - var10000 = this.field2458; + var10000 = this.field2516; var10000[var3] |= 2; } else { - this.method3932(var3); // L: 352 - var10000 = this.field2458; // L: 353 + this.method3969(var3); // L: 352 + var10000 = this.field2516; // L: 353 var10000[var3] &= -3; } } if (var4 == 99) { // L: 356 - this.field2455[var3] = (var5 << 7) + (this.field2455[var3] & 127); + this.field2501[var3] = (var5 << 7) + (this.field2501[var3] & 127); } if (var4 == 98) { // L: 357 - this.field2455[var3] = (this.field2455[var3] & 16256) + var5; + this.field2501[var3] = (this.field2501[var3] & 16256) + var5; } if (var4 == 101) { // L: 358 - this.field2455[var3] = (var5 << 7) + (this.field2455[var3] & 127) + 16384; + this.field2501[var3] = (var5 << 7) + (this.field2501[var3] & 127) + 16384; } if (var4 == 100) { // L: 359 - this.field2455[var3] = (this.field2455[var3] & 16256) + var5 + 16384; + this.field2501[var3] = (this.field2501[var3] & 16256) + var5 + 16384; } if (var4 == 120) { // L: 360 - this.method3928(var3); + this.method3947(var3); } if (var4 == 121) { // L: 361 - this.method3929(var3); + this.method3948(var3); } if (var4 == 123) { // L: 362 - this.method4017(var3); + this.method3949(var3); } int var6; if (var4 == 6) { // L: 363 - var6 = this.field2455[var3]; // L: 364 + var6 = this.field2501[var3]; // L: 364 if (var6 == 16384) { // L: 365 - this.field2456[var3] = (var5 << 7) + (this.field2456[var3] & -16257); + this.field2502[var3] = (var5 << 7) + (this.field2502[var3] & -16257); } } if (var4 == 38) { // L: 367 - var6 = this.field2455[var3]; // L: 368 + var6 = this.field2501[var3]; // L: 368 if (var6 == 16384) { // L: 369 - this.field2456[var3] = var5 + (this.field2456[var3] & -128); + this.field2502[var3] = var5 + (this.field2502[var3] & -128); } } if (var4 == 16) { // L: 371 - this.field2460[var3] = (var5 << 7) + (this.field2460[var3] & -16257); + this.field2503[var3] = (var5 << 7) + (this.field2503[var3] & -16257); } if (var4 == 48) { // L: 372 - this.field2460[var3] = var5 + (this.field2460[var3] & -128); + this.field2503[var3] = var5 + (this.field2503[var3] & -128); } if (var4 == 81) { // L: 373 if (var5 >= 64) { // L: 374 - var10000 = this.field2458; + var10000 = this.field2516; var10000[var3] |= 4; } else { - this.method3971(var3); // L: 376 - var10000 = this.field2458; // L: 377 + this.method3999(var3); // L: 376 + var10000 = this.field2516; // L: 377 var10000[var3] &= -5; } } - if (var4 == 17) { // L: 380 - this.method3935(var3, (var5 << 7) + (this.field2457[var3] & -16257)); + if (var4 == 17) { + this.method3967(var3, (var5 << 7) + (this.field2488[var3] & -16257)); // L: 380 } if (var4 == 49) { // L: 381 - this.method3935(var3, var5 + (this.field2457[var3] & -128)); + this.method3967(var3, var5 + (this.field2488[var3] & -128)); } } else if (var2 == 192) { // L: 384 var3 = var1 & 15; // L: 385 var4 = var1 >> 8 & 127; // L: 386 - this.method3921(var3, var4 + this.field2463[var3]); // L: 387 + this.method3963(var3, var4 + this.field2505[var3]); // L: 387 } else if (var2 == 208) { // L: 390 var3 = var1 & 15; // L: 391 var4 = var1 >> 8 & 127; // L: 392 - this.method3926(var3, var4); // L: 393 + this.method3945(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.method3995(var3, var4); // L: 399 + this.method4034(var3, var4); // L: 399 } else { var2 = var1 & 255; // L: 402 if (var2 == 255) { // L: 403 - this.method3931(); // L: 404 + this.method3950(); // L: 404 } } } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("ak") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1284126948" + descriptor = "(IIB)V", + garbageValue = "26" ) - void method3935(int var1, int var2) { - this.field2457[var1] = var2; // L: 410 - this.field2468[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 + void method3967(int var1, int var2) { + this.field2488[var1] = var2; // L: 410 + this.field2490[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 } // L: 412 - @ObfuscatedName("ax") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lhq;B)I", - garbageValue = "-12" + descriptor = "(Lhj;I)I", + garbageValue = "519117207" ) - int method4009(MusicPatchNode var1) { - int var2 = (var1.field2472 * var1.field2480 >> 12) + var1.field2478; // L: 415 - var2 += (this.field2441[var1.field2471] - 8192) * this.field2456[var1.field2471] >> 12; // L: 416 - MusicPatchNode2 var3 = var1.field2473; // L: 417 + int method3955(MusicPatchNode var1) { + int var2 = (var1.field2552 * var1.field2556 >> 12) + var1.field2555; // L: 415 + var2 += (this.field2497[var1.field2554] - 8192) * this.field2502[var1.field2554] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field2550; // L: 417 int var4; - if (var3.field2429 > 0 && (var3.field2428 > 0 || this.field2451[var1.field2471] > 0)) { // L: 418 - var4 = var3.field2428 << 2; // L: 419 - int var5 = var3.field2422 << 1; // L: 420 - if (var1.field2488 < var5) { // L: 421 - var4 = var4 * var1.field2488 / var5; + if (var3.field2474 > 0 && (var3.field2473 > 0 || this.field2498[var1.field2554] > 0)) { // L: 418 + var4 = var3.field2473 << 2; // L: 419 + int var5 = var3.field2468 << 1; // L: 420 + if (var1.field2563 < var5) { // L: 421 + var4 = var4 * var1.field2563 / var5; } - var4 += this.field2451[var1.field2471] >> 7; // L: 422 - double var6 = Math.sin((double)(var1.field2487 & 511) * 0.01227184630308513D); // L: 423 + var4 += this.field2498[var1.field2554] >> 7; // L: 422 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2564 & 511)); // L: 423 var2 += (int)((double)var4 * var6); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)StructComposition.field3338 + 0.5D); // L: 426 + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field394 + 0.5D); // L: 426 return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Lhq;B)I", - garbageValue = "75" + descriptor = "(Lhj;I)I", + garbageValue = "1024887560" ) - int method3997(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2473; // L: 431 - int var3 = this.field2446[var1.field2471] * this.field2444[var1.field2471] + 4096 >> 13; // L: 432 + int method3956(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2550; // L: 431 + int var3 = this.field2500[var1.field2554] * this.field2493[var1.field2554] + 4096 >> 13; // L: 432 var3 = var3 * var3 + 16384 >> 15; // L: 433 - var3 = var3 * var1.field2476 + 16384 >> 15; // L: 434 - var3 = var3 * this.field2442 + 128 >> 8; // L: 435 - if (var2.field2424 > 0) { // L: 436 - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2424 * (double)var1.field2481 * 1.953125E-5D) + 0.5D); // L: 437 + var3 = var3 * var1.field2553 + 16384 >> 15; // L: 434 + var3 = var3 * this.field2512 + 128 >> 8; // L: 435 + if (var2.field2469 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2469 * 1.953125E-5D * (double)var1.field2568) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - if (var2.field2427 != null) { // L: 439 - var4 = var1.field2491; // L: 440 - var5 = var2.field2427[var1.field2483 + 1]; // L: 441 - if (var1.field2483 < var2.field2427.length - 2) { // L: 442 - var6 = (var2.field2427[var1.field2483] & 255) << 8; // L: 443 - var7 = (var2.field2427[var1.field2483 + 2] & 255) << 8; // L: 444 - var5 += (var2.field2427[var1.field2483 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445 + if (var2.field2470 != null) { // L: 439 + var4 = var1.field2559; // L: 440 + var5 = var2.field2470[var1.field2560 + 1]; // L: 441 + if (var1.field2560 < var2.field2470.length - 2) { // L: 442 + var6 = (var2.field2470[var1.field2560] & 255) << 8; // L: 443 + var7 = (var2.field2470[var1.field2560 + 2] & 255) << 8; // L: 444 + var5 += (var4 - var6) * (var2.field2470[var1.field2560 + 3] - var5) / (var7 - var6); // L: 445 } - var3 = var5 * var3 + 32 >> 6; // L: 447 + var3 = var3 * var5 + 32 >> 6; // L: 447 } - if (var1.field2486 > 0 && var2.field2423 != null) { // L: 449 - var4 = var1.field2486; // L: 450 - var5 = var2.field2423[var1.field2482 + 1]; // L: 451 - if (var1.field2482 < var2.field2423.length - 2) { // L: 452 - var6 = (var2.field2423[var1.field2482] & 255) << 8; // L: 453 - var7 = (var2.field2423[var1.field2482 + 2] & 255) << 8; // L: 454 - var5 += (var4 - var6) * (var2.field2423[var1.field2482 + 3] - var5) / (var7 - var6); // L: 455 + if (var1.field2561 > 0 && var2.field2467 != null) { // L: 449 + var4 = var1.field2561; // L: 450 + var5 = var2.field2467[var1.field2562 + 1]; // L: 451 + if (var1.field2562 < var2.field2467.length - 2) { // L: 452 + var6 = (var2.field2467[var1.field2562] & 255) << 8; // L: 453 + var7 = (var2.field2467[var1.field2562 + 2] & 255) << 8; // L: 454 + var5 += (var4 - var6) * (var2.field2467[var1.field2562 + 3] - var5) / (var7 - var6); // L: 455 } var3 = var3 * var5 + 32 >> 6; // L: 457 @@ -914,27 +910,27 @@ public class MidiPcmStream extends PcmStream { return var3; // L: 459 } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lhq;I)I", - garbageValue = "-118932210" + descriptor = "(Lhj;I)I", + garbageValue = "1588980488" ) - int method3938(MusicPatchNode var1) { - int var2 = this.field2447[var1.field2471]; // L: 463 - return var2 < 8192 ? var2 * var1.field2477 + 32 >> 6 : 16384 - ((128 - var1.field2477) * (16384 - var2) + 32 >> 6); // L: 464 465 + int method4032(MusicPatchNode var1) { + int var2 = this.field2492[var1.field2554]; // L: 463 + return var2 < 8192 ? var2 * var1.field2557 + 32 >> 6 : 16384 - ((128 - var1.field2557) * (16384 - var2) + 32 >> 6); // L: 464 465 } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-36" + descriptor = "(I)V", + garbageValue = "-1441796047" ) - void method3944() { + void method3934() { int var1 = this.track; // L: 522 int var2 = this.trackLength; // L: 523 long var3; - for (var3 = this.field2467; var2 == this.trackLength; var3 = this.midiFile.method4048(var2)) { // L: 524 525 547 + for (var3 = this.field2513; var2 == this.trackLength; var3 = this.midiFile.method4070(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 @@ -942,8 +938,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); // L: 530 this.midiFile.markTrackPosition(var1); // L: 531 if (this.midiFile.isDone()) { // L: 532 - if (!this.field2459 || var2 == 0) { // L: 533 - this.method3931(); // L: 537 + if (!this.field2509 || var2 == 0) { // L: 533 + this.method3950(); // L: 537 this.midiFile.clear(); // L: 538 return; // L: 539 } @@ -954,7 +950,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { // L: 541 - this.method3934(var5); + this.method4050(var5); } this.midiFile.readTrackLength(var1); // L: 542 @@ -967,20 +963,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; // L: 549 this.trackLength = var2; // L: 550 - this.field2467 = var3; // L: 551 + this.field2513 = var3; // L: 551 } // L: 552 - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Lhq;I)Z", - garbageValue = "-1408710575" + descriptor = "(Lhj;I)Z", + garbageValue = "2136157877" ) - boolean method3927(MusicPatchNode var1) { + boolean method3964(MusicPatchNode var1) { if (var1.stream == null) { // L: 555 - if (var1.field2486 >= 0) { // L: 556 + if (var1.field2561 >= 0) { // L: 556 var1.remove(); // L: 557 - if (var1.field2474 > 0 && var1 == this.field2461[var1.field2471][var1.field2474]) { // L: 558 - this.field2461[var1.field2471][var1.field2474] = null; // L: 559 + if (var1.field2551 > 0 && var1 == this.field2507[var1.field2554][var1.field2551]) { // L: 558 + this.field2507[var1.field2554][var1.field2551] = null; // L: 559 } } @@ -990,135 +986,122 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("af") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(Lhq;[IIIB)Z", - garbageValue = "8" + descriptor = "(Lhj;[IIIB)Z", + garbageValue = "75" ) - boolean method3953(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2484 = StructComposition.field3338 / 100; // L: 568 - if (var1.field2486 < 0 || var1.stream != null && !var1.stream.method2786()) { // L: 569 - int var5 = var1.field2480; // L: 577 + boolean method3965(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2566 = PcmPlayer.field394 / 100; // L: 568 + if (var1.field2561 < 0 || var1.stream != null && !var1.stream.method973()) { // L: 569 + int var5 = var1.field2552; // L: 577 if (var5 > 0) { // L: 578 - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2452[var1.field2471] * 4.921259842519685E-4D) + 0.5D); // L: 579 + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2499[var1.field2554]) + 0.5D); // L: 579 if (var5 < 0) { // L: 580 var5 = 0; } - var1.field2480 = var5; // L: 581 + var1.field2552 = var5; // L: 581 } - var1.stream.method2802(this.method4009(var1)); // L: 583 - MusicPatchNode2 var6 = var1.field2473; // L: 584 + var1.stream.method912(this.method3955(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field2550; // L: 584 boolean var7 = false; // L: 585 - ++var1.field2488; // L: 586 - var1.field2487 += var6.field2429; // L: 587 - double var8 = (double)((var1.field2475 - 60 << 8) + (var1.field2472 * var1.field2480 >> 12)) * 5.086263020833333E-6D; // L: 588 - if (var6.field2424 > 0) { // L: 589 - if (var6.field2431 > 0) { // L: 590 - var1.field2481 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2431 * var8) + 0.5D); + ++var1.field2563; // L: 586 + var1.field2564 += var6.field2474; // L: 587 + double var8 = (double)((var1.field2547 - 60 << 8) + (var1.field2556 * var1.field2552 >> 12)) * 5.086263020833333E-6D; // L: 588 + if (var6.field2469 > 0) { // L: 589 + if (var6.field2472 > 0) { // L: 590 + var1.field2568 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2472) + 0.5D); } else { - var1.field2481 += 128; // L: 591 + var1.field2568 += 128; // L: 591 } } - if (var6.field2427 != null) { // L: 593 - if (var6.field2425 > 0) { // L: 594 - var1.field2491 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2425 * var8) + 0.5D); + if (var6.field2470 != null) { // L: 593 + if (var6.field2475 > 0) { // L: 594 + var1.field2559 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2475) + 0.5D); } else { - var1.field2491 += 128; // L: 595 + var1.field2559 += 128; // L: 595 } - while (var1.field2483 < var6.field2427.length - 2 && var1.field2491 > (var6.field2427[var1.field2483 + 2] & 255) << 8) { // L: 596 - var1.field2483 += 2; + while (var1.field2560 < var6.field2470.length - 2 && var1.field2559 > (var6.field2470[var1.field2560 + 2] & 255) << 8) { // L: 596 + var1.field2560 += 2; } - if (var6.field2427.length - 2 == var1.field2483 && var6.field2427[var1.field2483 + 1] == 0) { // L: 597 + if (var6.field2470.length - 2 == var1.field2560 && var6.field2470[var1.field2560 + 1] == 0) { // L: 597 var7 = true; } } - if (var1.field2486 >= 0 && var6.field2423 != null && (this.field2458[var1.field2471] & 1) == 0 && (var1.field2474 < 0 || var1 != this.field2461[var1.field2471][var1.field2474])) { // L: 599 600 - if (var6.field2426 > 0) { // L: 601 - var1.field2486 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2426 * var8) + 0.5D); + if (var1.field2561 >= 0 && var6.field2467 != null && (this.field2516[var1.field2554] & 1) == 0 && (var1.field2551 < 0 || var1 != this.field2507[var1.field2554][var1.field2551])) { // L: 599 600 + if (var6.field2476 > 0) { // L: 601 + var1.field2561 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2476) + 0.5D); } else { - var1.field2486 += 128; // L: 602 + var1.field2561 += 128; // L: 602 } - while (var1.field2482 < var6.field2423.length - 2 && var1.field2486 > (var6.field2423[var1.field2482 + 2] & 255) << 8) { // L: 603 - var1.field2482 += 2; + while (var1.field2562 < var6.field2467.length - 2 && var1.field2561 > (var6.field2467[var1.field2562 + 2] & 255) << 8) { // L: 603 + var1.field2562 += 2; } - if (var6.field2423.length - 2 == var1.field2482) { // L: 604 + if (var6.field2467.length - 2 == var1.field2562) { // L: 604 var7 = true; } } if (var7) { // L: 607 - var1.stream.method2803(var1.field2484); // L: 608 + var1.stream.method920(var1.field2566); // L: 608 if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); // L: 610 } - if (var1.stream.method2730()) { // L: 611 + if (var1.stream.method941()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method4032(); // L: 612 - if (var1.field2486 >= 0) { // L: 613 + var1.method4163(); // L: 612 + if (var1.field2561 >= 0) { // L: 613 var1.remove(); // L: 614 - if (var1.field2474 > 0 && var1 == this.field2461[var1.field2471][var1.field2474]) { // L: 615 - this.field2461[var1.field2471][var1.field2474] = null; // L: 616 + if (var1.field2551 > 0 && var1 == this.field2507[var1.field2554][var1.field2551]) { // L: 615 + this.field2507[var1.field2554][var1.field2551] = null; // L: 616 } } return true; // L: 619 } else { - var1.stream.method2843(var1.field2484, this.method3997(var1), this.method3938(var1)); // L: 621 + var1.stream.method910(var1.field2566, this.method3956(var1), this.method4032(var1)); // L: 621 return false; // L: 622 } } else { - var1.method4032(); // L: 570 + var1.method4163(); // L: 570 var1.remove(); // L: 571 - if (var1.field2474 > 0 && var1 == this.field2461[var1.field2471][var1.field2474]) { // L: 572 - this.field2461[var1.field2471][var1.field2474] = null; // L: 573 + if (var1.field2551 > 0 && var1 == this.field2507[var1.field2554][var1.field2551]) { // L: 572 + this.field2507[var1.field2554][var1.field2551] = null; // L: 573 } return true; // L: 575 } } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "76" + descriptor = "(IB)Lln;", + garbageValue = "45" ) - public static boolean method3972(int var0, int var1) { - return (var0 >> var1 + 1 & 1) != 0; // L: 9 - } + public static PrivateChatMode method3952(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3892, PrivateChatMode.field3893, PrivateChatMode.field3891}; // L: 18 + PrivateChatMode[] var2 = var1; // L: 20 - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Ljg;I)Z", - garbageValue = "543287365" - ) - static boolean method4031(ObjectComposition var0) { - if (var0.transforms != null) { // L: 752 - int[] var1 = var0.transforms; // L: 754 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 755 - int var3 = var1[var2]; // L: 756 - ObjectComposition var4 = WorldMapAreaData.getObjectDefinition(var3); // L: 758 - if (var4.mapIconId != -1) { // L: 759 - return true; // L: 760 - } + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 + PrivateChatMode var4 = var2[var3]; // L: 22 + if (var0 == var4.field3890) { // L: 24 + return var4; } - } else if (var0.mapIconId != -1) { // L: 766 - return true; // L: 767 } - return false; // L: 769 + return null; // L: 28 } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 9c7a74e1b9..3b8c389c2d 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,733 +4,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("ei") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("ew") - @ObfuscatedGetter( - intValue = -1909140371 - ) - static int field2032; - @ObfuscatedName("gr") + @ObfuscatedName("dw") @ObfuscatedSignature( - descriptor = "Leq;" + descriptor = "Lig;" ) - @Export("scene") - static Scene scene; - @ObfuscatedName("n") - long[] field2029; - @ObfuscatedName("v") + @Export("archive13") + static Archive archive13; + @ObfuscatedName("f") + long[] field1509; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1115691505 + intValue = -57079655 ) - int field2027; - @ObfuscatedName("d") + int field1502; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1924917613 + intValue = 1775737415 ) - int field2026; - @ObfuscatedName("c") + int field1504; + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 4130614396061915879L + longValue = -7099522440067611417L ) - long field2028; - @ObfuscatedName("y") + long field1505; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1837898463 + intValue = -193436617 ) - int field2030; - @ObfuscatedName("h") + int field1503; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 730128979 + intValue = 1791483173 ) - int field2031; + int field1506; - public MilliClock() { - this.field2029 = new long[10]; // L: 7 - this.field2027 = 256; // L: 15 - this.field2026 = 1; // L: 16 - this.field2030 = 0; // L: 17 - this.field2028 = Tiles.currentTimeMillis(); // L: 18 + MilliClock() { + this.field1509 = new long[10]; // L: 7 + this.field1502 = 256; // L: 15 + this.field1504 = 1; // L: 16 + this.field1503 = 0; // L: 17 + this.field1505 = ObjectSound.currentTimeMillis(); // L: 18 for (int var1 = 0; var1 < 10; ++var1) { // L: 19 - this.field2029[var1] = this.field2028; // L: 20 + this.field1509[var1] = this.field1505; // L: 20 } } // L: 22 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "46" + descriptor = "(S)V", + garbageValue = "-629" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { // L: 25 - this.field2029[var1] = 0L; // L: 26 + this.field1509[var1] = 0L; // L: 26 } } // L: 28 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1861957348" + garbageValue = "1172254968" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field2027; // L: 31 - int var4 = this.field2026; // L: 32 - this.field2027 = 300; // L: 33 - this.field2026 = 1; // L: 34 - this.field2028 = Tiles.currentTimeMillis(); // L: 35 - if (this.field2029[this.field2031] == 0L) { // L: 36 - this.field2027 = var3; // L: 37 - this.field2026 = var4; // L: 38 - } else if (this.field2028 > this.field2029[this.field2031]) { // L: 40 - this.field2027 = (int)((long)(var1 * 2560) / (this.field2028 - this.field2029[this.field2031])); + int var3 = this.field1502; // L: 31 + int var4 = this.field1504; // L: 32 + this.field1502 = 300; // L: 33 + this.field1504 = 1; // L: 34 + this.field1505 = ObjectSound.currentTimeMillis(); // L: 35 + if (0L == this.field1509[this.field1506]) { // L: 36 + this.field1502 = var3; // L: 37 + this.field1504 = var4; // L: 38 + } else if (this.field1505 > this.field1509[this.field1506]) { // L: 40 + this.field1502 = (int)((long)(var1 * 2560) / (this.field1505 - this.field1509[this.field1506])); } - if (this.field2027 < 25) { // L: 41 - this.field2027 = 25; + if (this.field1502 < 25) { // L: 41 + this.field1502 = 25; } - if (this.field2027 > 256) { // L: 42 - this.field2027 = 256; // L: 43 - this.field2026 = (int)((long)var1 - (this.field2028 - this.field2029[this.field2031]) / 10L); + if (this.field1502 > 256) { // L: 42 + this.field1502 = 256; // L: 43 + this.field1504 = (int)((long)var1 - (this.field1505 - this.field1509[this.field1506]) / 10L); // L: 44 } - if (this.field2026 > var1) { - this.field2026 = var1; + if (this.field1504 > var1) { // L: 46 + this.field1504 = var1; } - this.field2029[this.field2031] = this.field2028; // L: 47 - this.field2031 = (this.field2031 + 1) % 10; // L: 48 + this.field1509[this.field1506] = this.field1505; // L: 47 + this.field1506 = (this.field1506 + 1) % 10; // L: 48 int var5; - if (this.field2026 > 1) { // L: 49 + if (this.field1504 > 1) { // L: 49 for (var5 = 0; var5 < 10; ++var5) { // L: 50 - if (this.field2029[var5] != 0L) { // L: 51 - this.field2029[var5] += (long)this.field2026; + if (this.field1509[var5] != 0L) { // L: 51 + this.field1509[var5] += (long)this.field1504; } } } - if (this.field2026 < var2) { // L: 54 - this.field2026 = var2; + if (this.field1504 < var2) { // L: 54 + this.field1504 = var2; } - ApproximateRouteStrategy.sleepExact((long)this.field2026); // L: 55 + GrandExchangeEvent.sleepExact((long)this.field1504); // L: 55 - for (var5 = 0; this.field2030 < 256; this.field2030 += this.field2027) { // L: 56 57 59 + for (var5 = 0; this.field1503 < 256; this.field1503 += this.field1502) { // L: 56 57 59 ++var5; // L: 58 } - this.field2030 &= 255; // L: 61 + this.field1503 &= 255; // L: 61 return var5; // L: 62 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;Ljava/lang/String;I)[Lly;", - garbageValue = "1085285286" - ) - public static IndexedSprite[] method3664(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 115 - int var4 = var0.getFileId(var3, var2); // L: 116 - return BoundaryObject.method3420(var0, var3, var4); // L: 117 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "9" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 - return var1 == null ? 0 : var1.size(); // L: 45 46 - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Lkl;Lkl;Lkl;I)V", - garbageValue = "737300507" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; // L: 962 - Login.loginBoxX = Login.xPadding + 202; // L: 963 - GraphicsObject.loginBoxCenter = Login.loginBoxX + 180; // L: 964 - byte var3; - int var4; - int var7; - int var9; - int var25; - int var30; - int var38; - if (Login.worldSelectOpen) { // L: 965 - if (WorldMapID.worldSelectBackSprites == null) { // L: 967 - WorldMapID.worldSelectBackSprites = WorldMapID.method648(ModeWhere.archive8, "sl_back", ""); - } - - if (WorldMapManager.worldSelectFlagSprites == null) { // L: 968 - WorldMapManager.worldSelectFlagSprites = method3664(ModeWhere.archive8, "sl_flags", ""); - } - - if (DevicePcmPlayerProvider.worldSelectArrows == null) { // L: 969 - DevicePcmPlayerProvider.worldSelectArrows = method3664(ModeWhere.archive8, "sl_arrows", ""); - } - - if (Occluder.worldSelectStars == null) { // L: 970 - Occluder.worldSelectStars = method3664(ModeWhere.archive8, "sl_stars", ""); - } - - if (class7.worldSelectLeftSprite == null) { // L: 971 - class7.worldSelectLeftSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "leftarrow", ""); - } - - if (class2.worldSelectRightSprite == null) { // L: 972 - class2.worldSelectRightSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 973 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 974 - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 975 - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 976 - if (Occluder.worldSelectStars != null) { // L: 977 - Occluder.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 978 - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 979 - Occluder.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 980 - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 981 - } - - if (DevicePcmPlayerProvider.worldSelectArrows != null) { // L: 983 - var30 = Login.xPadding + 280; // L: 984 - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 985 - DevicePcmPlayerProvider.worldSelectArrows[2].drawAt(var30, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[0].drawAt(var30, 4); // L: 986 - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 987 - DevicePcmPlayerProvider.worldSelectArrows[3].drawAt(var30 + 15, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[1].drawAt(var30 + 15, 4); // L: 988 - } - - var0.draw("World", var30 + 32, 17, 16777215, -1); // L: 989 - var4 = Login.xPadding + 390; // L: 990 - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 991 - DevicePcmPlayerProvider.worldSelectArrows[2].drawAt(var4, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[0].drawAt(var4, 4); // L: 992 - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 993 - DevicePcmPlayerProvider.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 994 - } - - var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 995 - var38 = Login.xPadding + 500; // L: 996 - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 997 - DevicePcmPlayerProvider.worldSelectArrows[2].drawAt(var38, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[0].drawAt(var38, 4); // L: 998 - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 999 - DevicePcmPlayerProvider.worldSelectArrows[3].drawAt(var38 + 15, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[1].drawAt(var38 + 15, 4); // L: 1000 - } - - var0.draw("Location", var38 + 32, 17, 16777215, -1); // L: 1001 - var25 = Login.xPadding + 610; // L: 1002 - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1003 - DevicePcmPlayerProvider.worldSelectArrows[2].drawAt(var25, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[0].drawAt(var25, 4); // L: 1004 - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1005 - DevicePcmPlayerProvider.worldSelectArrows[3].drawAt(var25 + 15, 4); - } else { - DevicePcmPlayerProvider.worldSelectArrows[1].drawAt(var25 + 15, 4); // L: 1006 - } - - var0.draw("Type", var25 + 32, 17, 16777215, -1); // L: 1007 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1009 - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1010 - Login.hoveredWorldIndex = -1; // L: 1011 - if (WorldMapID.worldSelectBackSprites != null) { // L: 1012 - var3 = 88; // L: 1013 - byte var35 = 19; // L: 1014 - var38 = 765 / (var3 + 1) - 1; // L: 1015 - var25 = 480 / (var35 + 1); // L: 1016 - - int var33; - do { - var7 = var25; // L: 1018 - var33 = var38; // L: 1019 - if (var25 * (var38 - 1) >= World.World_count) { // L: 1020 - --var38; - } - - if (var38 * (var25 - 1) >= World.World_count) { // L: 1021 - --var25; - } - - if (var38 * (var25 - 1) >= World.World_count) { // L: 1022 - --var25; - } - } while(var7 != var25 || var33 != var38); // L: 1023 - - var7 = (765 - var38 * var3) / (var38 + 1); // L: 1025 - if (var7 > 5) { // L: 1026 - var7 = 5; - } - - var33 = (480 - var25 * var35) / (var25 + 1); // L: 1027 - if (var33 > 5) { // L: 1028 - var33 = 5; - } - - var9 = (765 - var38 * var3 - var7 * (var38 - 1)) / 2; // L: 1029 - int var36 = (480 - var25 * var35 - var33 * (var25 - 1)) / 2; // L: 1030 - int var11 = (var25 + World.World_count - 1) / var25; // L: 1031 - Login.worldSelectPagesCount = var11 - var38; // L: 1032 - if (class7.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1033 - class7.worldSelectLeftSprite.drawAt(8, class25.canvasHeight / 2 - class7.worldSelectLeftSprite.subHeight / 2); // L: 1034 - } - - if (class2.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1036 - class2.worldSelectRightSprite.drawAt(GrandExchangeOfferTotalQuantityComparator.canvasWidth - class2.worldSelectRightSprite.subWidth - 8, class25.canvasHeight / 2 - class2.worldSelectRightSprite.subHeight / 2); // L: 1037 - } - - int var12 = var36 + 23; // L: 1039 - int var13 = var9 + Login.xPadding; // L: 1040 - int var14 = 0; // L: 1041 - boolean var15 = false; // L: 1042 - int var16 = Login.worldSelectPage; // L: 1043 - - int var17; - for (var17 = var16 * var25; var17 < World.World_count && var16 - Login.worldSelectPage < var38; ++var17) { // L: 1044 1045 - World var18 = World.World_worlds[var17]; // L: 1048 - boolean var19 = true; // L: 1049 - String var20 = Integer.toString(var18.population); // L: 1050 - if (var18.population == -1) { // L: 1051 - var20 = "OFF"; // L: 1052 - var19 = false; // L: 1053 - } else if (var18.population > 1980) { // L: 1055 - var20 = "FULL"; // L: 1056 - var19 = false; // L: 1057 - } - - int var22 = 0; // L: 1060 - byte var21; - if (var18.isBeta()) { // L: 1061 - if (var18.isMembersOnly()) { // L: 1062 - var21 = 7; - } else { - var21 = 6; // L: 1063 - } - } else if (var18.isDeadman()) { // L: 1065 - var22 = 16711680; // L: 1066 - if (var18.isMembersOnly()) { // L: 1067 - var21 = 5; - } else { - var21 = 4; // L: 1068 - } - } else if (var18.method1883()) { // L: 1070 - if (var18.isMembersOnly()) { // L: 1071 - var21 = 9; - } else { - var21 = 8; // L: 1072 - } - } else if (var18.isPvp()) { // L: 1074 - if (var18.isMembersOnly()) { // L: 1075 - var21 = 3; - } else { - var21 = 2; // L: 1076 - } - } else if (var18.isMembersOnly()) { // L: 1079 - var21 = 1; - } else { - var21 = 0; // L: 1080 - } - - if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var13 + var3 && MouseHandler.MouseHandler_y < var35 + var12 && var19) { // L: 1082 - Login.hoveredWorldIndex = var17; // L: 1083 - WorldMapID.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var12, 128, 16777215); // L: 1084 - var15 = true; // L: 1085 - } else { - WorldMapID.worldSelectBackSprites[var21].drawAt(var13, var12); // L: 1087 - } - - if (WorldMapManager.worldSelectFlagSprites != null) { // L: 1088 - WorldMapManager.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var13 + 29, var12); - } - - var0.drawCentered(Integer.toString(var18.id), var13 + 15, var35 / 2 + var12 + 5, var22, -1); // L: 1089 - var1.drawCentered(var20, var13 + 60, var35 / 2 + var12 + 5, 268435455, -1); // L: 1090 - var12 = var12 + var35 + var33; // L: 1091 - ++var14; // L: 1092 - if (var14 >= var25) { - var12 = var36 + 23; // L: 1093 - var13 = var13 + var3 + var7; // L: 1094 - var14 = 0; // L: 1095 - ++var16; // L: 1096 - } - } - - if (var15) { // L: 1099 - var17 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1100 - int var28 = var1.ascent + 8; // L: 1101 - int var37 = MouseHandler.MouseHandler_y + 25; // L: 1102 - if (var37 + var28 > 480) { // L: 1103 - var37 = MouseHandler.MouseHandler_y - 25 - var28; // L: 1104 - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var28, 16777120); // L: 1106 - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var28, 0); // L: 1107 - var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var37 + var1.ascent + 4, 0, -1); // L: 1108 - } - } - - FileSystem.rasterProvider.drawFull(0, 0); // L: 1111 - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1115 - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1116 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 1117 - if (Client.gameState == 0 || Client.gameState == 5) { // L: 1118 - var3 = 20; // L: 1119 - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1120 - var4 = 253 - var3; // L: 1121 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1122 - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1123 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1124 - Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1125 - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1126 - } - - String var5; - String var6; - short var29; - short var31; - if (Client.gameState == 20) { // L: 1128 - GrandExchangeOfferNameComparator.titleboxSprite.drawAt(Login.loginBoxX + 180 - GrandExchangeOfferNameComparator.titleboxSprite.subWidth / 2, 271 - GrandExchangeOfferNameComparator.titleboxSprite.subHeight / 2); // L: 1129 - var29 = 201; // L: 1130 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var29, 16776960, 0); // L: 1131 - var30 = var29 + 15; // L: 1132 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1133 - var30 += 15; // L: 1134 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1135 - var30 += 15; // L: 1136 - var30 += 7; // L: 1137 - if (Login.loginIndex != 4) { // L: 1138 - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var30, 16777215, 0); // L: 1139 - var31 = 200; // L: 1140 - - for (var5 = WorldMapID.method645(); var0.stringWidth(var5) > var31; var5 = var5.substring(0, var5.length() - 1)) { // L: 1141 1142 1143 - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var30, 16777215, 0); // L: 1145 - var30 += 15; // L: 1146 - - for (var6 = HitSplatDefinition.method4768(Login.Login_password); var0.stringWidth(var6) > var31; var6 = var6.substring(1)) { // L: 1147 1148 1149 - } - - var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var30, 16777215, 0); // L: 1151 - var30 += 15; // L: 1152 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 1155 - GrandExchangeOfferNameComparator.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1156 - short var23; - if (Login.loginIndex == 0) { // L: 1157 - var29 = 251; // L: 1158 - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var29, 16776960, 0); // L: 1159 - var30 = var29 + 30; // L: 1160 - var4 = Login.loginBoxX + 180 - 80; // L: 1161 - var23 = 291; // L: 1162 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1163 - var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1164 - var4 = Login.loginBoxX + 180 + 80; // L: 1165 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1166 - var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1167 - } else if (Login.loginIndex == 1) { // L: 1169 - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1170 - var29 = 236; // L: 1171 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var29, 16777215, 0); // L: 1172 - var30 = var29 + 15; // L: 1173 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1174 - var30 += 15; // L: 1175 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1176 - var30 += 15; // L: 1177 - var4 = Login.loginBoxX + 180 - 80; // L: 1178 - var23 = 321; // L: 1179 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1180 - var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1181 - var4 = Login.loginBoxX + 180 + 80; // L: 1182 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1183 - var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1184 - } else if (Login.loginIndex == 2) { // L: 1186 - var29 = 201; // L: 1187 - var0.drawCentered(Login.Login_response1, GraphicsObject.loginBoxCenter, var29, 16776960, 0); // L: 1188 - var30 = var29 + 15; // L: 1189 - var0.drawCentered(Login.Login_response2, GraphicsObject.loginBoxCenter, var30, 16776960, 0); // L: 1190 - var30 += 15; // L: 1191 - var0.drawCentered(Login.Login_response3, GraphicsObject.loginBoxCenter, var30, 16776960, 0); // L: 1192 - var30 += 15; // L: 1193 - var30 += 7; // L: 1194 - var0.draw("Login: ", GraphicsObject.loginBoxCenter - 110, var30, 16777215, 0); // L: 1195 - var31 = 200; // L: 1196 - - for (var5 = WorldMapID.method645(); var0.stringWidth(var5) > var31; var5 = var5.substring(1)) { // L: 1197 1198 1199 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? FileSystem.colorStartTag(16776960) + "|" : ""), GraphicsObject.loginBoxCenter - 70, var30, 16777215, 0); // L: 1201 - var30 += 15; // L: 1202 - - for (var6 = HitSplatDefinition.method4768(Login.Login_password); var0.stringWidth(var6) > var31; var6 = var6.substring(1)) { // L: 1203 1204 1205 - } - - var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? FileSystem.colorStartTag(16776960) + "|" : ""), GraphicsObject.loginBoxCenter - 108, var30, 16777215, 0); // L: 1207 - var30 += 15; // L: 1208 - var29 = 277; // L: 1209 - var7 = GraphicsObject.loginBoxCenter + -117; // L: 1210 - IndexedSprite var26 = UrlRequest.method3476(Client.Login_isUsernameRemembered, Login.field1222); // L: 1211 - var26.drawAt(var7, var29); // L: 1212 - var7 = var7 + var26.subWidth + 5; // L: 1213 - var1.draw("Remember username", var7, var29 + 13, 16776960, 0); // L: 1214 - var7 = GraphicsObject.loginBoxCenter + 24; // L: 1215 - var26 = UrlRequest.method3476(WorldMapSectionType.clientPreferences.hideUsername, Login.field1216); // L: 1216 - var26.drawAt(var7, var29); // L: 1217 - var7 = var7 + var26.subWidth + 5; // L: 1218 - var1.draw("Hide username", var7, var29 + 13, 16776960, 0); // L: 1219 - var30 = var29 + 15; // L: 1220 - var9 = GraphicsObject.loginBoxCenter - 80; // L: 1221 - short var10 = 321; // L: 1222 - InterfaceParent.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); // L: 1223 - var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); // L: 1224 - var9 = GraphicsObject.loginBoxCenter + 80; // L: 1225 - InterfaceParent.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); // L: 1226 - var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); // L: 1227 - var29 = 357; // L: 1228 - switch(Login.field1207) { // L: 1229 - case 2: - DevicePcmPlayerProvider.field433 = "Having trouble logging in?"; // L: 1231 - break; - default: - DevicePcmPlayerProvider.field433 = "Can't login? Click here."; // L: 1234 - } - - AttackOption.field1190 = new Bounds(GraphicsObject.loginBoxCenter, var29, var1.stringWidth(DevicePcmPlayerProvider.field433), 11); // L: 1237 - KeyHandler.field409 = new Bounds(GraphicsObject.loginBoxCenter, var29, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1238 - var1.drawCentered(DevicePcmPlayerProvider.field433, GraphicsObject.loginBoxCenter, var29, 16777215, 0); // L: 1239 - } else if (Login.loginIndex == 3) { // L: 1241 - var29 = 201; // L: 1242 - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var29, 16776960, 0); // L: 1243 - var30 = var29 + 20; // L: 1244 - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1245 - var30 += 15; // L: 1246 - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1247 - var30 += 15; // L: 1248 - var4 = Login.loginBoxX + 180; // L: 1249 - var23 = 276; // L: 1250 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1251 - var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1252 - var4 = Login.loginBoxX + 180; // L: 1253 - var23 = 326; // L: 1254 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1255 - var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1256 - } else { - short var8; - if (Login.loginIndex == 4) { // L: 1258 - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1259 - var29 = 236; // L: 1260 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var29, 16777215, 0); // L: 1261 - var30 = var29 + 15; // L: 1262 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1263 - var30 += 15; // L: 1264 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1265 - var30 += 15; // L: 1266 - var0.draw("PIN: " + HitSplatDefinition.method4768(class1.otp) + (Client.cycle % 40 < 20 ? FileSystem.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var30, 16777215, 0); // L: 1267 - var30 -= 8; // L: 1268 - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var30, 16776960, 0); // L: 1269 - var30 += 15; // L: 1270 - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var30, 16776960, 0); // L: 1271 - var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1272 - var38 = var30 - var0.ascent; // L: 1273 - IndexedSprite var32; - if (Login.field1217) { // L: 1275 - var32 = Login.options_buttons_2Sprite; // L: 1276 - } else { - var32 = class69.options_buttons_0Sprite; // L: 1279 - } - - var32.drawAt(var4, var38); // L: 1281 - var30 += 15; // L: 1282 - var7 = Login.loginBoxX + 180 - 80; // L: 1283 - var8 = 321; // L: 1284 - InterfaceParent.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1285 - var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); // L: 1286 - var7 = Login.loginBoxX + 180 + 80; // L: 1287 - InterfaceParent.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1288 - var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); // L: 1289 - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1290 - } else if (Login.loginIndex == 5) { // L: 1292 - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1293 - var29 = 221; // L: 1294 - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var29, 16776960, 0); // L: 1295 - var30 = var29 + 15; // L: 1296 - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1297 - var30 += 15; // L: 1298 - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1299 - var30 += 15; // L: 1300 - var30 += 14; // L: 1301 - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var30, 16777215, 0); // L: 1302 - var31 = 174; // L: 1303 - - for (var5 = WorldMapID.method645(); var0.stringWidth(var5) > var31; var5 = var5.substring(1)) { // L: 1304 1305 1306 - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? FileSystem.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var30, 16777215, 0); // L: 1308 - var30 += 15; // L: 1309 - var25 = Login.loginBoxX + 180 - 80; // L: 1310 - short var34 = 321; // L: 1311 - InterfaceParent.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1312 - var0.drawCentered("Recover", var25, var34 + 5, 16777215, 0); // L: 1313 - var25 = Login.loginBoxX + 180 + 80; // L: 1314 - InterfaceParent.titlebuttonSprite.drawAt(var25 - 73, var34 - 20); // L: 1315 - var0.drawCentered("Back", var25, var34 + 5, 16777215, 0); // L: 1316 - var34 = 356; // L: 1317 - var1.drawCentered("Still having trouble logging in?", GraphicsObject.loginBoxCenter, var34, 268435455, 0); // L: 1318 - } else if (Login.loginIndex == 6) { // L: 1320 - var29 = 201; // L: 1321 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var29, 16776960, 0); // L: 1322 - var30 = var29 + 15; // L: 1323 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1324 - var30 += 15; // L: 1325 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1326 - var30 += 15; // L: 1327 - var4 = Login.loginBoxX + 180; // L: 1328 - var23 = 321; // L: 1329 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1330 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1331 - } else if (Login.loginIndex == 7) { // L: 1333 - var29 = 216; // L: 1334 - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var29, 16776960, 0); // L: 1335 - var30 = var29 + 15; // L: 1336 - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1337 - var30 += 15; // L: 1338 - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1339 - var30 += 15; // L: 1340 - var4 = Login.loginBoxX + 180 - 80; // L: 1341 - var23 = 321; // L: 1342 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1343 - var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1344 - var4 = Login.loginBoxX + 180 + 80; // L: 1345 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1346 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1347 - } else if (Login.loginIndex == 8) { // L: 1349 - var29 = 216; // L: 1350 - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var29, 16776960, 0); // L: 1351 - var30 = var29 + 15; // L: 1352 - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1353 - var30 += 15; // L: 1354 - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var30, 16776960, 0); // L: 1355 - var30 += 15; // L: 1356 - var4 = Login.loginBoxX + 180 - 80; // L: 1357 - var23 = 321; // L: 1358 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1359 - var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1360 - var4 = Login.loginBoxX + 180 + 80; // L: 1361 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1362 - var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1363 - } else if (Login.loginIndex == 12) { // L: 1365 - var29 = 201; // L: 1366 - String var24 = ""; // L: 1367 - var5 = ""; // L: 1368 - var6 = ""; // L: 1369 - switch(Login.field1206) { // L: 1370 - case 0: - var24 = "Your account has been disabled."; // L: 1385 - var5 = Strings.field2841; // L: 1386 - var6 = ""; // L: 1387 - break; - case 1: - var24 = "Account locked as we suspect it has been stolen."; // L: 1378 - var5 = Strings.field2918; // L: 1379 - var6 = ""; // L: 1380 - break; // L: 1381 - default: - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 1373 - } - - var0.drawCentered(var24, Login.loginBoxX + 180, var29, 16776960, 0); // L: 1391 - var30 = var29 + 15; // L: 1392 - var2.drawCentered(var5, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1393 - var30 += 15; // L: 1394 - var2.drawCentered(var6, Login.loginBoxX + 180, var30, 16776960, 0); // L: 1395 - var30 += 15; // L: 1396 - var7 = Login.loginBoxX + 180; // L: 1397 - var8 = 276; // L: 1398 - InterfaceParent.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1399 - var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); // L: 1400 - var7 = Login.loginBoxX + 180; // L: 1401 - var8 = 326; // L: 1402 - InterfaceParent.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1403 - var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); // L: 1404 - } else if (Login.loginIndex == 24) { // L: 1406 - var29 = 221; // L: 1407 - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var29, 16777215, 0); // L: 1408 - var30 = var29 + 15; // L: 1409 - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1410 - var30 += 15; // L: 1411 - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var30, 16777215, 0); // L: 1412 - var30 += 15; // L: 1413 - var4 = Login.loginBoxX + 180; // L: 1414 - var23 = 301; // L: 1415 - InterfaceParent.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1416 - var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1417 - } - } - } - - if (Client.gameState >= 10) { // L: 1420 - int[] var27 = new int[4]; // L: 1421 - Rasterizer2D.Rasterizer2D_getClipArray(var27); // L: 1422 - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class25.canvasHeight); // L: 1423 - class9.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1424 - class9.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1425 - Rasterizer2D.Rasterizer2D_setClipArray(var27); // L: 1426 - } - - Login.title_muteSprite[WorldMapSectionType.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1428 - if (Client.gameState > 5 && Language.Language_EN == NPCComposition.clientLanguage) { // L: 1429 - if (World.field1039 != null) { // L: 1430 - var30 = Login.xPadding + 5; // L: 1431 - var31 = 463; // L: 1432 - byte var40 = 100; // L: 1433 - byte var39 = 35; // L: 1434 - World.field1039.drawAt(var30, var31); // L: 1435 - var0.drawCentered("World" + " " + Client.worldId, var40 / 2 + var30, var39 / 2 + var31 - 2, 16777215, 0); // L: 1436 - if (UserComparator9.World_request != null) { // L: 1437 - var1.drawCentered("Loading...", var40 / 2 + var30, var39 / 2 + var31 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var40 / 2 + var30, var39 / 2 + var31 + 12, 16777215, 0); // L: 1438 - } - } else { - World.field1039 = ChatChannel.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "sl_button", ""); // L: 1441 - } - } - - } - } // L: 1113 1444 } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 88830cd545..7f59d8cb73 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -5,199 +5,293 @@ 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("gw") +@ObfuscatedName("jb") @Implements("ModeWhere") public enum ModeWhere implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Ljb;" ) - field2420("", 0, new class200[]{class200.field2397}), - @ObfuscatedName("v") + field3373("", 0, new class264[]{class264.field3339}), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Ljb;" ) - field2402("", 1, new class200[]{class200.field2398, class200.field2397}), - @ObfuscatedName("d") + field3361("", 1, new class264[]{class264.field3340, class264.field3339}), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Ljb;" ) - field2404("", 2, new class200[]{class200.field2398, class200.field2401, class200.field2397}), - @ObfuscatedName("c") + field3362("", 2, new class264[]{class264.field3340, class264.field3341, class264.field3339}), + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Ljb;" ) - field2405("", 3, new class200[]{class200.field2398}), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2403("", 4), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2407("", 5, new class200[]{class200.field2398, class200.field2397}), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2408("", 6, new class200[]{class200.field2397}), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2415("", 8, new class200[]{class200.field2398, class200.field2397}), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2410("", 9, new class200[]{class200.field2398, class200.field2401}), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2411("", 10, new class200[]{class200.field2398}), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgw;" - ) - field2412("", 11, new class200[]{class200.field2398}), + field3363("", 3, new class264[]{class264.field3340}), @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Ljb;" ) - field2413("", 12, new class200[]{class200.field2398, class200.field2397}), - @ObfuscatedName("a") + field3360("", 4), + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Ljb;" ) - field2414("", 13, new class200[]{class200.field2398}); + field3365("", 5, new class264[]{class264.field3340, class264.field3339}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3366("", 6, new class264[]{class264.field3339}), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3367("", 8, new class264[]{class264.field3340, class264.field3339}), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3364("", 9, new class264[]{class264.field3340, class264.field3341}), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3369("", 10, new class264[]{class264.field3340}), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3376("", 11, new class264[]{class264.field3340}), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3374("", 12, new class264[]{class264.field3340, class264.field3339}), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Ljb;" + ) + field3372("", 13, new class264[]{class264.field3340}); - @ObfuscatedName("cz") + @ObfuscatedName("rv") @ObfuscatedGetter( - intValue = -1707495011 + intValue = 351433671 ) - public static int field2417; - @ObfuscatedName("dw") + static int field3368; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Llj;" ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("w") + static Bounds field3378; + @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = 505828619 + intValue = 243649969 + ) + @Export("cameraX") + static int cameraX; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 2114323867 ) @Export("id") final int id; - @ObfuscatedName("k") - final Set field2416; - - static { - method3870(); // L: 28 - } // L: 29 + @ObfuscatedName("j") + final Set field3371; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Lgx;)V" + descriptor = "(Ljava/lang/String;I[Ljj;)V" ) - ModeWhere(String var3, int var4, class200[] var5) { - this.field2416 = new HashSet(); - this.id = var4; // L: 43 - class200[] var6 = var5; // L: 45 + ModeWhere(String var3, int var4, class264[] var5) { + this.field3371 = new HashSet(); + this.id = var4; // L: 39 + class264[] var6 = var5; // L: 41 - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 - class200 var8 = var6[var7]; // L: 47 - this.field2416.add(var8); // L: 48 + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 42 + class264 var8 = var6[var7]; // L: 43 + this.field3371.add(var8); // L: 44 } - } // L: 51 + } // L: 47 ModeWhere(String var3, int var4) { - this.field2416 = new HashSet(); // L: 32 - this.id = var4; // L: 39 - } // L: 40 + this.field3371 = new HashSet(); // L: 32 + this.id = var4; // L: 35 + } // L: 36 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 54 + return this.id; // L: 50 } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(S)[Lgw;", - garbageValue = "128" + descriptor = "(ILcc;ZI)I", + garbageValue = "1792039900" ) - static ModeWhere[] method3870() { - return new ModeWhere[]{field2402, field2405, field2407, field2415, field2420, field2410, field2414, field2412, field2413, field2404, field2408, field2403, field2411}; // L: 35 - } + static int method4705(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 833 + Widget var4; + if (var0 >= 2000) { // L: 835 + var0 -= 1000; // L: 836 + var4 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 837 + var3 = false; // L: 838 + } else { + var4 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 840 + } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "420566665" - ) - public static boolean method3867(int var0) { - return (var0 >> 29 & 1) != 0; // L: 21 - } + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 841 + var11 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] - 1; // L: 842 + if (var11 >= 0 && var11 <= 9) { // L: 843 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 847 + return 1; // L: 848 + } else { + --Interpreter.Interpreter_stringStackSize; // L: 844 + return 1; // L: 845 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 850 + class16.Interpreter_intStackSize -= 2; // L: 851 + var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 852 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 853 + var4.parent = class231.getWidgetChild(var11, var6); // L: 854 + return 1; // L: 855 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 857 + var4.isScrollBar = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 858 + return 1; // L: 859 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 861 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 862 + return 1; // L: 863 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 865 + var4.dragThreshold = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 866 + return 1; // L: 867 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 869 + var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 870 + return 1; // L: 871 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 873 + var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 874 + return 1; // L: 875 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 877 + var4.actions = null; // L: 878 + return 1; // L: 879 + } else if (var0 == 1308) { // L: 881 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 882 + return 1; // L: 883 + } else if (var0 == 1309) { // L: 885 + --class16.Interpreter_intStackSize; // L: 886 + return 1; // L: 887 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 889 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 919 + class16.Interpreter_intStackSize -= 2; // L: 920 + var5 = 10; // L: 921 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]}; // L: 922 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]}; // L: 923 + ApproximateRouteStrategy.Widget_setKey(var4, var5, var8, var9); // L: 924 + return 1; // L: 925 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 927 + class16.Interpreter_intStackSize -= 3; // L: 928 + var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] - 1; // L: 929 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 930 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 931 + if (var11 >= 0 && var11 <= 9) { // L: 932 + class2.Widget_setKeyRate(var4, var11, var6, var7); // L: 935 + return 1; // L: 936 + } else { + throw new RuntimeException(); // L: 933 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 938 + var5 = 10; // L: 939 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 940 + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 941 + class2.Widget_setKeyRate(var4, var5, var6, var7); // L: 942 + return 1; // L: 943 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 945 + --class16.Interpreter_intStackSize; // L: 946 + var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] - 1; // L: 947 + if (var11 >= 0 && var11 <= 9) { // L: 948 + class244.Widget_setKeyIgnoreHeld(var4, var11); // L: 951 + return 1; // L: 952 + } else { + throw new RuntimeException(); // L: 949 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 954 + var5 = 10; // L: 955 + class244.Widget_setKeyIgnoreHeld(var4, var5); // L: 956 + return 1; // L: 957 + } else { + return 2; // L: 959 + } + } else { + byte[] var10 = null; // L: 890 + var8 = null; // L: 891 + if (var3) { // L: 892 + class16.Interpreter_intStackSize -= 10; // L: 893 - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - static final int method3877() { - return ViewportMouse.ViewportMouse_y; // L: 106 - } + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class16.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 895 896 + } - @ObfuscatedName("je") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "20" - ) - static boolean method3875() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10369 - } + if (var7 > 0) { // L: 898 + var10 = new byte[var7 / 2]; // L: 899 + var8 = new byte[var7 / 2]; // L: 900 - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "50" - ) - static final void method3878() { - PacketBufferNode var0 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); // L: 11218 - Client.packetWriter.addNode(var0); // L: 11219 + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 901 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class16.Interpreter_intStackSize]; // L: 902 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class16.Interpreter_intStackSize + 1]; // L: 903 + } + } + } else { + class16.Interpreter_intStackSize -= 2; // L: 908 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]}; // L: 909 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]}; // L: 910 + } - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11220 - if (var1.type == 0 || var1.type == 3) { // L: 11221 - GrandExchangeOffer.closeInterface(var1, true); + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] - 1; // L: 912 + if (var7 >= 0 && var7 <= 9) { // L: 913 + ApproximateRouteStrategy.Widget_setKey(var4, var7, var10, var8); // L: 916 + return 1; // L: 917 + } else { + throw new RuntimeException(); // L: 914 + } + } } } + } - if (Client.meslayerContinueWidget != null) { // L: 11223 - IsaacCipher.invalidateWidget(Client.meslayerContinueWidget); // L: 11224 - Client.meslayerContinueWidget = null; // L: 11225 - } - - } // L: 11227 - - @ObfuscatedName("kf") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1954380312" + descriptor = "(IIIIIIII)Z", + garbageValue = "-1545527286" ) - static void method3871(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11474 - if ((long)var0 == (var1.key >> 48 & 65535L)) { // L: 11475 - var1.remove(); // L: 11476 + static final boolean method4704(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 131 + if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 132 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; // L: 133 + if (var7 > var0 && var7 > var1 && var7 > var2) { // L: 134 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; // L: 135 + if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 136 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; // L: 137 + return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 138 + } } } - - } // L: 11479 + } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index d90713f484..78dde0fe73 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,180 +3,180 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("gv") @Implements("Model") public class Model extends Renderable { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lgv;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lgv;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("aw") - static boolean[] field1722; - @ObfuscatedName("az") - static boolean[] field1685; - @ObfuscatedName("ah") + @ObfuscatedName("ao") + static boolean[] field2100; + @ObfuscatedName("ai") + static boolean[] field2084; + @ObfuscatedName("av") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("ap") + @ObfuscatedName("az") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("aj") - static int[] field1726; - @ObfuscatedName("an") - static int[] field1727; - @ObfuscatedName("ai") - static int[] field1728; + @ObfuscatedName("au") + static int[] field2104; @ObfuscatedName("ab") - static int[] field1742; - @ObfuscatedName("ad") - static int[] field1731; - @ObfuscatedName("af") - static int[][] field1732; - @ObfuscatedName("av") - static int[] field1707; - @ObfuscatedName("ao") - static int[][] field1734; - @ObfuscatedName("bj") - static int[] field1735; - @ObfuscatedName("bn") - static int[] field1736; - @ObfuscatedName("bi") - static int[] field1730; - @ObfuscatedName("bp") - static int[] field1738; + static int[] field2105; + @ObfuscatedName("aa") + static int[] field2106; + @ObfuscatedName("al") + static int[] field2061; + @ObfuscatedName("ak") + static int[] field2109; + @ObfuscatedName("an") + static int[][] field2110; + @ObfuscatedName("ah") + static int[] field2097; + @ObfuscatedName("ae") + static int[][] field2112; + @ObfuscatedName("bh") + static int[] field2113; @ObfuscatedName("br") - static int[] field1739; - @ObfuscatedName("bq") - static int[] field1740; - @ObfuscatedName("bx") + static int[] field2129; + @ObfuscatedName("bn") + static int[] field2122; + @ObfuscatedName("bi") + static int[] field2116; + @ObfuscatedName("bb") + static int[] field2117; + @ObfuscatedName("bk") + static int[] field2072; + @ObfuscatedName("bt") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bc") + @ObfuscatedName("ba") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bw") + @ObfuscatedName("be") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bv") - static boolean field1744; - @ObfuscatedName("bh") + @ObfuscatedName("bo") + static boolean field2114; + @ObfuscatedName("bw") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bz") + @ObfuscatedName("by") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bg") - static int[] field1697; - @ObfuscatedName("bm") - static int[] field1750; - @ObfuscatedName("y") + @ObfuscatedName("bq") + static int[] field2127; + @ObfuscatedName("bf") + static int[] field2128; + @ObfuscatedName("b") @Export("verticesCount") int verticesCount; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("verticesX") int[] verticesX; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("verticesY") int[] verticesY; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("indicesCount") int indicesCount; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("indices1") int[] indices1; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("indices2") int[] indices2; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("indices3") int[] indices3; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("f") - byte[] field1700; - @ObfuscatedName("g") + @ObfuscatedName("t") + byte[] field2078; + @ObfuscatedName("v") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("u") - byte field1702; - @ObfuscatedName("t") - int field1692; - @ObfuscatedName("p") - int[] field1718; - @ObfuscatedName("m") - int[] field1705; - @ObfuscatedName("r") - int[] field1749; - @ObfuscatedName("o") + @ObfuscatedName("x") + byte field2080; + @ObfuscatedName("z") + int field2081; + @ObfuscatedName("i") + int[] field2082; + @ObfuscatedName("a") + int[] field2083; + @ObfuscatedName("w") + int[] field2095; + @ObfuscatedName("s") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("j") + @ObfuscatedName("y") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("am") + @ObfuscatedName("ay") @Export("boundsType") int boundsType; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("bottomY") int bottomY; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("diameter") int diameter; - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("radius") int radius; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("xMid") int xMid; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("yMid") int yMid; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("zMid") int zMid; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("al") + @ObfuscatedName("as") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @Export("zMidOffset") int zMidOffset; @@ -185,36 +185,36 @@ public class Model extends Renderable { Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 Model_sharedSpotAnimationModel = new Model(); // L: 8 Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 - field1722 = new boolean[4700]; // L: 45 - field1685 = new boolean[4700]; // L: 46 + field2100 = new boolean[4700]; // L: 45 + field2084 = new boolean[4700]; // L: 46 modelViewportXs = new int[4700]; // L: 47 modelViewportYs = new int[4700]; // L: 48 - field1726 = new int[4700]; // L: 49 - field1727 = new int[4700]; // L: 50 - field1728 = new int[4700]; // L: 51 - field1742 = new int[4700]; // L: 52 - field1731 = new int[1600]; // L: 54 - field1732 = new int[1600][512]; // L: 55 - field1707 = new int[12]; // L: 56 - field1734 = new int[12][2000]; // L: 57 - field1735 = new int[2000]; // L: 58 - field1736 = new int[2000]; // L: 59 - field1730 = new int[12]; // L: 60 - field1738 = new int[10]; // L: 61 - field1739 = new int[10]; // L: 62 - field1740 = new int[10]; // L: 63 - field1744 = true; // L: 67 + field2104 = new int[4700]; // L: 49 + field2105 = new int[4700]; // L: 50 + field2106 = new int[4700]; // L: 51 + field2061 = new int[4700]; // L: 52 + field2109 = new int[1600]; // L: 54 + field2110 = new int[1600][512]; // L: 55 + field2097 = new int[12]; // L: 56 + field2112 = new int[12][2000]; // L: 57 + field2113 = new int[2000]; // L: 58 + field2129 = new int[2000]; // L: 59 + field2122 = new int[12]; // L: 60 + field2116 = new int[10]; // L: 61 + field2117 = new int[10]; // L: 62 + field2072 = new int[10]; // L: 63 + field2114 = true; // L: 67 Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 - field1697 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 - field1750 = Rasterizer3D.field1774; // L: 73 + field2127 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 + field2128 = Rasterizer3D.field1922; // L: 73 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1702 = 0; - this.field1692 = 0; + this.field2080 = 0; + this.field2081 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Renderable { } // L: 77 @ObfuscatedSignature( - descriptor = "([Lef;I)V" + descriptor = "([Lgv;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; // L: 10 this.indicesCount = 0; // L: 14 - this.field1702 = 0; // L: 25 - this.field1692 = 0; // L: 26 + this.field2080 = 0; // L: 25 + this.field2081 = 0; // L: 26 this.isSingleTile = false; // L: 32 this.xMidOffset = -1; // L: 41 this.yMidOffset = -1; // L: 42 @@ -239,8 +239,8 @@ public class Model extends Renderable { boolean var6 = false; // L: 83 this.verticesCount = 0; // L: 84 this.indicesCount = 0; // L: 85 - this.field1692 = 0; // L: 86 - this.field1702 = -1; // L: 87 + this.field2081 = 0; // L: 86 + this.field2080 = -1; // L: 87 int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Renderable { if (var8 != null) { // L: 90 this.verticesCount += var8.verticesCount; // L: 91 this.indicesCount += var8.indicesCount; // L: 92 - this.field1692 += var8.field1692; // L: 93 + this.field2081 += var8.field2081; // L: 93 if (var8.faceRenderPriorities != null) { // L: 94 var3 = true; } else { - if (this.field1702 == -1) { // L: 96 - this.field1702 = var8.field1702; + if (this.field2080 == -1) { // L: 96 + this.field2080 = var8.field2080; } - if (this.field1702 != var8.field1702) { // L: 97 + if (this.field2080 != var8.field2080) { // L: 97 var3 = true; } } var4 |= var8.faceAlphas != null; // L: 99 var5 |= var8.faceTextures != null; // L: 100 - var6 |= var8.field1700 != null; // L: 101 + var6 |= var8.field2078 != null; // L: 101 } } @@ -290,18 +290,18 @@ public class Model extends Renderable { } if (var6) { // L: 116 - this.field1700 = new byte[this.indicesCount]; + this.field2078 = new byte[this.indicesCount]; } - if (this.field1692 > 0) { // L: 117 - this.field1718 = new int[this.field1692]; // L: 118 - this.field1705 = new int[this.field1692]; // L: 119 - this.field1749 = new int[this.field1692]; // L: 120 + if (this.field2081 > 0) { // L: 117 + this.field2082 = new int[this.field2081]; // L: 118 + this.field2083 = new int[this.field2081]; // L: 119 + this.field2095 = new int[this.field2081]; // L: 120 } this.verticesCount = 0; // L: 122 this.indicesCount = 0; // L: 123 - this.field1692 = 0; // L: 124 + this.field2081 = 0; // L: 124 for (var7 = 0; var7 < var2; ++var7) { // L: 125 var8 = var1[var7]; // L: 126 @@ -318,7 +318,7 @@ public class Model extends Renderable { if (var8.faceRenderPriorities != null) { // L: 136 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field1702; // L: 137 + this.faceRenderPriorities[this.indicesCount] = var8.field2080; // L: 137 } } @@ -335,21 +335,21 @@ public class Model extends Renderable { } if (var6) { // L: 146 - if (var8.field1700 != null && var8.field1700[var9] != -1) { // L: 147 - this.field1700[this.indicesCount] = (byte)(this.field1692 + var8.field1700[var9]); + if (var8.field2078 != null && var8.field2078[var9] != -1) { // L: 147 + this.field2078[this.indicesCount] = (byte)(this.field2081 + var8.field2078[var9]); } else { - this.field1700[this.indicesCount] = -1; // L: 148 + this.field2078[this.indicesCount] = -1; // L: 148 } } ++this.indicesCount; // L: 150 } - for (var9 = 0; var9 < var8.field1692; ++var9) { // L: 152 - this.field1718[this.field1692] = this.verticesCount + var8.field1718[var9]; // L: 153 - this.field1705[this.field1692] = this.verticesCount + var8.field1705[var9]; // L: 154 - this.field1749[this.field1692] = this.verticesCount + var8.field1749[var9]; // L: 155 - ++this.field1692; // L: 156 + for (var9 = 0; var9 < var8.field2081; ++var9) { // L: 152 + this.field2082[this.field2081] = this.verticesCount + var8.field2082[var9]; // L: 153 + this.field2083[this.field2081] = this.verticesCount + var8.field2083[var9]; // L: 154 + this.field2095[this.field2081] = this.verticesCount + var8.field2095[var9]; // L: 155 + ++this.field2081; // L: 156 } for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 @@ -363,9 +363,9 @@ public class Model extends Renderable { } // L: 166 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lef;" + descriptor = "([[IIIIZI)Lgv;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { @@ -387,7 +387,7 @@ public class Model extends Renderable { var11 = new Model(); // L: 182 var11.verticesCount = this.verticesCount; // L: 183 var11.indicesCount = this.indicesCount; // L: 184 - var11.field1692 = this.field1692; // L: 185 + var11.field2081 = this.field2081; // L: 185 var11.verticesX = this.verticesX; // L: 186 var11.verticesZ = this.verticesZ; // L: 187 var11.indices1 = this.indices1; // L: 188 @@ -398,12 +398,12 @@ public class Model extends Renderable { var11.faceColors3 = this.faceColors3; // L: 193 var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 var11.faceAlphas = this.faceAlphas; // L: 195 - var11.field1700 = this.field1700; // L: 196 + var11.field2078 = this.field2078; // L: 196 var11.faceTextures = this.faceTextures; // L: 197 - var11.field1702 = this.field1702; // L: 198 - var11.field1718 = this.field1718; // L: 199 - var11.field1705 = this.field1705; // L: 200 - var11.field1749 = this.field1749; // L: 201 + var11.field2080 = this.field2080; // L: 198 + var11.field2082 = this.field2082; // L: 199 + var11.field2083 = this.field2083; // L: 200 + var11.field2095 = this.field2095; // L: 201 var11.vertexLabels = this.vertexLabels; // L: 202 var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 var11.isSingleTile = this.isSingleTile; // L: 204 @@ -461,9 +461,9 @@ public class Model extends Renderable { } } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Z)Lef;" + descriptor = "(Z)Lgv;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Z)Lef;" + descriptor = "(Z)Lgv;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Renderable { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ZLef;[B)Lef;" + descriptor = "(ZLgv;[B)Lgv;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; // L: 256 var2.indicesCount = this.indicesCount; // L: 257 - var2.field1692 = this.field1692; // L: 258 + var2.field2081 = this.field2081; // 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 @@ -531,12 +531,12 @@ public class Model extends Renderable { var2.faceColors2 = this.faceColors2; // L: 283 var2.faceColors3 = this.faceColors3; // L: 284 var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 - var2.field1700 = this.field1700; // L: 286 + var2.field2078 = this.field2078; // L: 286 var2.faceTextures = this.faceTextures; // L: 287 - var2.field1702 = this.field1702; // L: 288 - var2.field1718 = this.field1718; // L: 289 - var2.field1705 = this.field1705; // L: 290 - var2.field1749 = this.field1749; // L: 291 + var2.field2080 = this.field2080; // L: 288 + var2.field2082 = this.field2082; // L: 289 + var2.field2083 = this.field2083; // L: 290 + var2.field2095 = this.field2095; // L: 291 var2.vertexLabels = this.vertexLabels; // L: 292 var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 var2.isSingleTile = this.isSingleTile; // L: 294 @@ -544,7 +544,7 @@ public class Model extends Renderable { return var2; // L: 296 } - @ObfuscatedName("y") + @ObfuscatedName("g") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { // L: 300 @@ -558,9 +558,9 @@ public class Model extends Renderable { int var9 = Model_sine[var1]; // L: 308 for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 - int var11 = Rasterizer3D.method3233(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 + int var11 = Rasterizer3D.method3377(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 int var12 = this.verticesY[var10]; // L: 311 - int var13 = Rasterizer3D.method3185(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 + int var13 = Rasterizer3D.method3378(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 if (var11 < var2) { // L: 313 var2 = var11; } @@ -641,8 +641,8 @@ public class Model extends Renderable { } } // L: 354 - @ObfuscatedName("z") - void method3088() { + @ObfuscatedName("n") + void method3680() { if (this.boundsType != 2) { // L: 357 this.boundsType = 2; // L: 358 this.xzRadius = 0; // L: 359 @@ -663,22 +663,22 @@ public class Model extends Renderable { } } // L: 370 - @ObfuscatedName("e") - public int method3079() { + @ObfuscatedName("l") + public int method3673() { this.calculateBoundsCylinder(); // L: 373 return this.xzRadius; // L: 374 } - @ObfuscatedName("l") + @ObfuscatedName("m") @Export("resetBounds") void resetBounds() { this.boundsType = 0; // L: 378 this.xMidOffset = -1; // L: 379 } // L: 380 - @ObfuscatedName("s") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lel;I)V" + descriptor = "(Lfb;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Renderable { } } // L: 395 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lel;ILel;I[I)V" + descriptor = "(Lfb;ILfb;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { @@ -752,7 +752,7 @@ public class Model extends Renderable { } } // L: 401 427 - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { int var6 = var2.length; // L: 430 @@ -920,7 +920,7 @@ public class Model extends Renderable { } } // L: 459 474 516 537 555 557 - @ObfuscatedName("w") + @ObfuscatedName("r") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 @@ -932,7 +932,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 565 } // L: 566 - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 @@ -943,7 +943,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 573 } // L: 574 - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 @@ -955,7 +955,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 582 } // L: 583 - @ObfuscatedName("x") + @ObfuscatedName("v") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; // L: 586 @@ -970,7 +970,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 593 } // L: 594 - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 @@ -985,7 +985,7 @@ public class Model extends Renderable { this.resetBounds(); // L: 602 } // L: 603 - @ObfuscatedName("u") + @ObfuscatedName("z") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 @@ -997,11 +997,11 @@ public class Model extends Renderable { this.resetBounds(); // L: 611 } // L: 612 - @ObfuscatedName("t") - public final void method3106(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1731[0] = -1; // L: 615 + @ObfuscatedName("i") + public final void method3692(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field2109[0] = -1; // L: 615 if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 - this.method3088(); + this.method3680(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 @@ -1044,13 +1044,13 @@ public class Model extends Renderable { var22 += var7; // L: 649 var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 - field1726[var19] = var22 - var18; // L: 653 + field2104[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.field1692 > 0) { // L: 656 - field1727[var19] = var20; // L: 657 - field1728[var19] = var23; // L: 658 - field1742[var19] = var22; // L: 659 + if (this.field2081 > 0) { // L: 656 + field2105[var19] = var20; // L: 657 + field2106[var19] = var23; // L: 658 + field2061[var19] = var22; // L: 659 } } @@ -1061,11 +1061,11 @@ public class Model extends Renderable { } // L: 666 - @ObfuscatedName("p") - public final void method3053(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1731[0] = -1; // L: 669 + @ObfuscatedName("a") + public final void method3693(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field2109[0] = -1; // L: 669 if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 - this.method3088(); + this.method3680(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 @@ -1108,13 +1108,13 @@ public class Model extends Renderable { var23 += var7; // L: 703 var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 - field1726[var20] = var23 - var19; // L: 707 + field2104[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.field1692 > 0) { // L: 710 - field1727[var20] = var21; // L: 711 - field1728[var20] = var24; // L: 712 - field1742[var20] = var23; // L: 713 + if (this.field2081 > 0) { // L: 710 + field2105[var20] = var21; // L: 711 + field2106[var20] = var24; // L: 712 + field2061[var20] = var23; // L: 713 } } @@ -1125,16 +1125,16 @@ public class Model extends Renderable { } // L: 720 - @ObfuscatedName("o") + @ObfuscatedName("w") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { // L: 844 + if (this.diameter < 1600) { // L: 892 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { // L: 845 - field1731[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 893 + field2109[var6] = 0; } - var6 = var3 ? 20 : 5; // L: 846 + var6 = var3 ? 20 : 5; // L: 894 int var7; int var8; @@ -1146,426 +1146,426 @@ public class Model extends Renderable { int var16; int var18; int var28; - for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 847 - if (this.faceColors3[var7] != -2) { // L: 848 - var8 = this.indices1[var7]; // L: 849 - var9 = this.indices2[var7]; // L: 850 - var10 = this.indices3[var7]; // L: 851 - var11 = modelViewportXs[var8]; // L: 852 - var12 = modelViewportXs[var9]; // L: 853 - var28 = modelViewportXs[var10]; // L: 854 + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 895 + if (this.faceColors3[var7] != -2) { // L: 896 + var8 = this.indices1[var7]; // L: 897 + var9 = this.indices2[var7]; // L: 898 + var10 = this.indices3[var7]; // L: 899 + var11 = modelViewportXs[var8]; // L: 900 + var12 = modelViewportXs[var9]; // L: 901 + var28 = modelViewportXs[var10]; // L: 902 int var29; - if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 855 - if (var2 && UserComparator7.method3592(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 881 - GrandExchangeOfferWorldComparator.method129(var4); // L: 882 - var2 = false; // L: 883 + if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 903 + if (var2 && ModeWhere.method4704(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 929 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 932 + var2 = false; // L: 934 } - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 885 - field1685[var7] = false; // L: 886 - if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 887 - field1722[var7] = false; // L: 888 + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 936 + field2084[var7] = false; // L: 937 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 938 + field2100[var7] = false; // L: 939 } else { - field1722[var7] = true; + field2100[var7] = true; } - var29 = (field1726[var8] + field1726[var9] + field1726[var10]) / 3 + this.radius; // L: 889 - field1732[var29][field1731[var29]++] = var7; // L: 890 + var29 = (field2104[var8] + field2104[var9] + field2104[var10]) / 3 + this.radius; // L: 940 + field2110[var29][field2109[var29]++] = var7; // L: 941 } } else { - var29 = field1727[var8]; // L: 856 - var15 = field1727[var9]; // L: 857 - var16 = field1727[var10]; // L: 858 - int var30 = field1728[var8]; // L: 859 - var18 = field1728[var9]; // L: 860 - int var19 = field1728[var10]; // L: 861 - int var20 = field1742[var8]; // L: 862 - int var21 = field1742[var9]; // L: 863 - int var22 = field1742[var10]; // L: 864 - var29 -= var15; // L: 865 - var16 -= var15; // L: 866 - var30 -= var18; // L: 867 - var19 -= var18; // L: 868 - var20 -= var21; // L: 869 - var22 -= var21; // L: 870 - int var23 = var30 * var22 - var20 * var19; // L: 871 - int var24 = var20 * var16 - var29 * var22; // L: 872 - int var25 = var29 * var19 - var30 * var16; // L: 873 - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 874 - field1685[var7] = true; // L: 875 - int var26 = (field1726[var8] + field1726[var9] + field1726[var10]) / 3 + this.radius; // L: 876 - field1732[var26][field1731[var26]++] = var7; // L: 877 + var29 = field2105[var8]; // L: 904 + var15 = field2105[var9]; // L: 905 + var16 = field2105[var10]; // L: 906 + int var30 = field2106[var8]; // L: 907 + var18 = field2106[var9]; // L: 908 + int var19 = field2106[var10]; // L: 909 + int var20 = field2061[var8]; // L: 910 + int var21 = field2061[var9]; // L: 911 + int var22 = field2061[var10]; // L: 912 + var29 -= var15; // L: 913 + var16 -= var15; // L: 914 + var30 -= var18; // L: 915 + var19 -= var18; // L: 916 + var20 -= var21; // L: 917 + var22 -= var21; // L: 918 + int var23 = var30 * var22 - var20 * var19; // L: 919 + int var24 = var20 * var16 - var29 * var22; // L: 920 + int var25 = var29 * var19 - var30 * var16; // L: 921 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 922 + field2084[var7] = true; // L: 923 + int var26 = (field2104[var8] + field2104[var9] + field2104[var10]) / 3 + this.radius; // L: 924 + field2110[var26][field2109[var26]++] = var7; // L: 925 } } } } int[] var27; - if (this.faceRenderPriorities == null) { // L: 894 - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 895 - var8 = field1731[var7]; // L: 896 - if (var8 > 0) { // L: 897 - var27 = field1732[var7]; // L: 898 + if (this.faceRenderPriorities == null) { // L: 945 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 946 + var8 = field2109[var7]; // L: 947 + if (var8 > 0) { // L: 948 + var27 = field2110[var7]; // L: 949 - for (var10 = 0; var10 < var8; ++var10) { // L: 899 + for (var10 = 0; var10 < var8; ++var10) { // L: 950 this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { // L: 904 - field1707[var7] = 0; // L: 905 - field1730[var7] = 0; // L: 906 + for (var7 = 0; var7 < 12; ++var7) { // L: 955 + field2097[var7] = 0; // L: 956 + field2122[var7] = 0; // L: 957 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 908 - var8 = field1731[var7]; // L: 909 - if (var8 > 0) { // L: 910 - var27 = field1732[var7]; // L: 911 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 959 + var8 = field2109[var7]; // L: 960 + if (var8 > 0) { // L: 961 + var27 = field2110[var7]; // L: 962 - for (var10 = 0; var10 < var8; ++var10) { // L: 912 - var11 = var27[var10]; // L: 913 - byte var31 = this.faceRenderPriorities[var11]; // L: 914 - var28 = field1707[var31]++; // L: 915 - field1734[var31][var28] = var11; // L: 916 - if (var31 < 10) { // L: 917 - int[] var10000 = field1730; - var10000[var31] += var7; - } else if (var31 == 10) { // L: 918 - field1735[var28] = var7; + for (var10 = 0; var10 < var8; ++var10) { // L: 963 + var11 = var27[var10]; // L: 964 + byte var33 = this.faceRenderPriorities[var11]; // L: 965 + var28 = field2097[var33]++; // L: 966 + field2112[var33][var28] = var11; // L: 967 + if (var33 < 10) { // L: 968 + int[] var10000 = field2122; + var10000[var33] += var7; + } else if (var33 == 10) { // L: 969 + field2113[var28] = var7; } else { - field1736[var28] = var7; // L: 919 + field2129[var28] = var7; // L: 970 } } } } - var7 = 0; // L: 923 - if (field1707[1] > 0 || field1707[2] > 0) { // L: 924 - var7 = (field1730[1] + field1730[2]) / (field1707[1] + field1707[2]); + var7 = 0; // L: 974 + if (field2097[1] > 0 || field2097[2] > 0) { // L: 975 + var7 = (field2122[1] + field2122[2]) / (field2097[1] + field2097[2]); } - var8 = 0; // L: 925 - if (field1707[3] > 0 || field1707[4] > 0) { // L: 926 - var8 = (field1730[3] + field1730[4]) / (field1707[3] + field1707[4]); + var8 = 0; // L: 976 + if (field2097[3] > 0 || field2097[4] > 0) { // L: 977 + var8 = (field2122[3] + field2122[4]) / (field2097[3] + field2097[4]); } - var9 = 0; // L: 927 - if (field1707[6] > 0 || field1707[8] > 0) { // L: 928 - var9 = (field1730[8] + field1730[6]) / (field1707[8] + field1707[6]); + var9 = 0; // L: 978 + if (field2097[6] > 0 || field2097[8] > 0) { // L: 979 + var9 = (field2122[8] + field2122[6]) / (field2097[8] + field2097[6]); } - var11 = 0; // L: 930 - var12 = field1707[10]; // L: 931 - int[] var13 = field1734[10]; // L: 932 - int[] var14 = field1735; // L: 933 - if (var11 == var12) { // L: 934 - var11 = 0; // L: 935 - var12 = field1707[11]; // L: 936 - var13 = field1734[11]; // L: 937 - var14 = field1736; // L: 938 + var11 = 0; // L: 981 + var12 = field2097[10]; // L: 982 + int[] var13 = field2112[10]; // L: 983 + int[] var14 = field2113; // L: 984 + if (var11 == var12) { // L: 985 + var11 = 0; // L: 986 + var12 = field2097[11]; // L: 987 + var13 = field2112[11]; // L: 988 + var14 = field2129; // L: 989 } - if (var11 < var12) { // L: 940 + if (var11 < var12) { // L: 991 var10 = var14[var11]; } else { - var10 = -1000; // L: 941 + var10 = -1000; // L: 992 } - for (var15 = 0; var15 < 10; ++var15) { // L: 942 - while (var15 == 0 && var10 > var7) { // L: 943 - this.drawFace(var13[var11++]); // L: 944 - if (var11 == var12 && var13 != field1734[11]) { // L: 945 - var11 = 0; // L: 946 - var12 = field1707[11]; // L: 947 - var13 = field1734[11]; // L: 948 - var14 = field1736; // L: 949 + for (var15 = 0; var15 < 10; ++var15) { // L: 993 + while (var15 == 0 && var10 > var7) { // L: 994 + this.drawFace(var13[var11++]); // L: 995 + if (var11 == var12 && var13 != field2112[11]) { // L: 996 + var11 = 0; // L: 997 + var12 = field2097[11]; // L: 998 + var13 = field2112[11]; // L: 999 + var14 = field2129; // L: 1000 } - if (var11 < var12) { // L: 951 + if (var11 < var12) { // L: 1002 var10 = var14[var11]; } else { - var10 = -1000; // L: 952 + var10 = -1000; // L: 1003 } } - while (var15 == 3 && var10 > var8) { // L: 954 - this.drawFace(var13[var11++]); // L: 955 - if (var11 == var12 && var13 != field1734[11]) { // L: 956 - var11 = 0; // L: 957 - var12 = field1707[11]; // L: 958 - var13 = field1734[11]; // L: 959 - var14 = field1736; // L: 960 + while (var15 == 3 && var10 > var8) { // L: 1005 + this.drawFace(var13[var11++]); // L: 1006 + if (var11 == var12 && var13 != field2112[11]) { // L: 1007 + var11 = 0; // L: 1008 + var12 = field2097[11]; // L: 1009 + var13 = field2112[11]; // L: 1010 + var14 = field2129; // L: 1011 } - if (var11 < var12) { // L: 962 + if (var11 < var12) { // L: 1013 var10 = var14[var11]; } else { - var10 = -1000; // L: 963 + var10 = -1000; // L: 1014 } } - while (var15 == 5 && var10 > var9) { // L: 965 - this.drawFace(var13[var11++]); // L: 966 - if (var11 == var12 && var13 != field1734[11]) { // L: 967 - var11 = 0; // L: 968 - var12 = field1707[11]; // L: 969 - var13 = field1734[11]; // L: 970 - var14 = field1736; // L: 971 + while (var15 == 5 && var10 > var9) { // L: 1016 + this.drawFace(var13[var11++]); // L: 1017 + if (var11 == var12 && var13 != field2112[11]) { // L: 1018 + var11 = 0; // L: 1019 + var12 = field2097[11]; // L: 1020 + var13 = field2112[11]; // L: 1021 + var14 = field2129; // L: 1022 } - if (var11 < var12) { // L: 973 + if (var11 < var12) { // L: 1024 var10 = var14[var11]; } else { - var10 = -1000; // L: 974 + var10 = -1000; // L: 1025 } } - var16 = field1707[var15]; // L: 976 - int[] var17 = field1734[var15]; // L: 977 + var16 = field2097[var15]; // L: 1027 + int[] var17 = field2112[var15]; // L: 1028 - for (var18 = 0; var18 < var16; ++var18) { // L: 978 - this.drawFace(var17[var18]); // L: 979 + for (var18 = 0; var18 < var16; ++var18) { // L: 1029 + this.drawFace(var17[var18]); // L: 1030 } } - while (var10 != -1000) { // L: 982 - this.drawFace(var13[var11++]); // L: 983 - if (var11 == var12 && var13 != field1734[11]) { // L: 984 - var11 = 0; // L: 985 - var13 = field1734[11]; // L: 986 - var12 = field1707[11]; // L: 987 - var14 = field1736; // L: 988 + while (var10 != -1000) { // L: 1033 + this.drawFace(var13[var11++]); // L: 1034 + if (var11 == var12 && var13 != field2112[11]) { // L: 1035 + var11 = 0; // L: 1036 + var13 = field2112[11]; // L: 1037 + var12 = field2097[11]; // L: 1038 + var14 = field2129; // L: 1039 } - if (var11 < var12) { // L: 990 + if (var11 < var12) { // L: 1041 var10 = var14[var11]; } else { - var10 = -1000; // L: 991 + var10 = -1000; // L: 1042 } } } } - } // L: 902 993 + } // L: 953 1044 - @ObfuscatedName("ay") + @ObfuscatedName("s") @Export("drawFace") final void drawFace(int var1) { - if (field1685[var1]) { // L: 996 - this.method3057(var1); // L: 997 + if (field2084[var1]) { // L: 1047 + this.method3746(var1); // L: 1048 } else { - int var2 = this.indices1[var1]; // L: 1000 - int var3 = this.indices2[var1]; // L: 1001 - int var4 = this.indices3[var1]; // L: 1002 - Rasterizer3D.field1775 = field1722[var1]; // L: 1003 - if (this.faceAlphas == null) { // L: 1004 + int var2 = this.indices1[var1]; // L: 1051 + int var3 = this.indices2[var1]; // L: 1052 + int var4 = this.indices3[var1]; // L: 1053 + Rasterizer3D.field1899 = field2100[var1]; // L: 1054 + if (this.faceAlphas == null) { // L: 1055 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1005 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1056 } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1006 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1057 int var5; int var6; int var7; - if (this.field1700 != null && this.field1700[var1] != -1) { // L: 1014 - int var8 = this.field1700[var1] & 255; // L: 1015 - var5 = this.field1718[var8]; // L: 1016 - var6 = this.field1705[var8]; // L: 1017 - var7 = this.field1749[var8]; // L: 1018 + if (this.field2078 != null && this.field2078[var1] != -1) { // L: 1065 + int var8 = this.field2078[var1] & 255; // L: 1066 + var5 = this.field2082[var8]; // L: 1067 + var6 = this.field2083[var8]; // L: 1068 + var7 = this.field2095[var8]; // L: 1069 } else { - var5 = var2; // L: 1021 - var6 = var3; // L: 1022 - var7 = var4; // L: 1023 + var5 = var2; // L: 1072 + var6 = var3; // L: 1073 + var7 = var4; // L: 1074 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3212(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1727[var5], field1727[var6], field1727[var7], field1728[var5], field1728[var6], field1728[var7], field1742[var5], field1742[var6], field1742[var7], this.faceTextures[var1]); // L: 1025 + Rasterizer3D.method3372(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var5], field2105[var6], field2105[var7], field2106[var5], field2106[var6], field2106[var7], field2061[var5], field2061[var6], field2061[var7], this.faceTextures[var1]); // L: 1076 } else { - Rasterizer3D.method3212(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1727[var5], field1727[var6], field1727[var7], field1728[var5], field1728[var6], field1728[var7], field1742[var5], field1742[var6], field1742[var7], this.faceTextures[var1]); // L: 1026 + Rasterizer3D.method3372(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2105[var5], field2105[var6], field2105[var7], field2106[var5], field2106[var6], field2106[var7], field2061[var5], field2061[var6], field2061[var7], this.faceTextures[var1]); // L: 1077 } - } else if (this.faceColors3[var1] == -1) { // L: 1007 - Rasterizer3D.method3179(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1697[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1058 + Rasterizer3D.method3370(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2127[this.faceColors1[var1]]); } else { - Rasterizer3D.method3175(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1008 + Rasterizer3D.method3383(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1059 } } - } // L: 998 1028 + } // L: 1049 1079 - @ObfuscatedName("am") - final void method3057(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1031 - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1032 - int var4 = 0; // L: 1033 - int var5 = this.indices1[var1]; // L: 1034 - int var6 = this.indices2[var1]; // L: 1035 - int var7 = this.indices3[var1]; // L: 1036 - int var8 = field1742[var5]; // L: 1037 - int var9 = field1742[var6]; // L: 1038 - int var10 = field1742[var7]; // L: 1039 - if (this.faceAlphas == null) { // L: 1040 + @ObfuscatedName("y") + final void method3746(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1082 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1083 + int var4 = 0; // L: 1084 + int var5 = this.indices1[var1]; // L: 1085 + int var6 = this.indices2[var1]; // L: 1086 + int var7 = this.indices3[var1]; // L: 1087 + int var8 = field2061[var5]; // L: 1088 + int var9 = field2061[var6]; // L: 1089 + int var10 = field2061[var7]; // L: 1090 + if (this.faceAlphas == null) { // L: 1091 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1041 + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1092 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { // L: 1042 - field1738[var4] = modelViewportXs[var5]; // L: 1043 - field1739[var4] = modelViewportYs[var5]; // L: 1044 - field1740[var4++] = this.faceColors1[var1]; // L: 1045 + if (var8 >= 50) { // L: 1093 + field2116[var4] = modelViewportXs[var5]; // L: 1094 + field2117[var4] = modelViewportYs[var5]; // L: 1095 + field2072[var4++] = this.faceColors1[var1]; // L: 1096 } else { - var11 = field1727[var5]; // L: 1048 - var12 = field1728[var5]; // L: 1049 - var13 = this.faceColors1[var1]; // L: 1050 - if (var10 >= 50) { // L: 1051 - var14 = field1750[var10 - var8] * (50 - var8); // L: 1052 - field1738[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1727[var7] - var11) * var14 >> 16)) / 50; // L: 1053 - field1739[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1728[var7] - var12) * var14 >> 16)) / 50; // L: 1054 - field1740[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1055 + var11 = field2105[var5]; // L: 1099 + var12 = field2106[var5]; // L: 1100 + var13 = this.faceColors1[var1]; // L: 1101 + if (var10 >= 50) { // L: 1102 + var14 = field2128[var10 - var8] * (50 - var8); // L: 1103 + field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var7] - var11) * var14 >> 16)) / 50; // L: 1104 + field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var7] - var12) * var14 >> 16)) / 50; // L: 1105 + field2072[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1106 } - if (var9 >= 50) { // L: 1057 - var14 = field1750[var9 - var8] * (50 - var8); // L: 1058 - field1738[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1727[var6] - var11) * var14 >> 16)) / 50; // L: 1059 - field1739[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1728[var6] - var12) * var14 >> 16)) / 50; // L: 1060 - field1740[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1061 + if (var9 >= 50) { // L: 1108 + var14 = field2128[var9 - var8] * (50 - var8); // L: 1109 + field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var6] - var11) * var14 >> 16)) / 50; // L: 1110 + field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var6] - var12) * var14 >> 16)) / 50; // L: 1111 + field2072[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1112 } } - if (var9 >= 50) { // L: 1064 - field1738[var4] = modelViewportXs[var6]; // L: 1065 - field1739[var4] = modelViewportYs[var6]; // L: 1066 - field1740[var4++] = this.faceColors2[var1]; // L: 1067 + if (var9 >= 50) { // L: 1115 + field2116[var4] = modelViewportXs[var6]; // L: 1116 + field2117[var4] = modelViewportYs[var6]; // L: 1117 + field2072[var4++] = this.faceColors2[var1]; // L: 1118 } else { - var11 = field1727[var6]; // L: 1070 - var12 = field1728[var6]; // L: 1071 - var13 = this.faceColors2[var1]; // L: 1072 - if (var8 >= 50) { // L: 1073 - var14 = field1750[var8 - var9] * (50 - var9); // L: 1074 - field1738[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1727[var5] - var11) * var14 >> 16)) / 50; // L: 1075 - field1739[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1728[var5] - var12) * var14 >> 16)) / 50; // L: 1076 - field1740[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1077 + var11 = field2105[var6]; // L: 1121 + var12 = field2106[var6]; // L: 1122 + var13 = this.faceColors2[var1]; // L: 1123 + if (var8 >= 50) { // L: 1124 + var14 = field2128[var8 - var9] * (50 - var9); // L: 1125 + field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var5] - var11) * var14 >> 16)) / 50; // L: 1126 + field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var5] - var12) * var14 >> 16)) / 50; // L: 1127 + field2072[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1128 } - if (var10 >= 50) { // L: 1079 - var14 = field1750[var10 - var9] * (50 - var9); // L: 1080 - field1738[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1727[var7] - var11) * var14 >> 16)) / 50; // L: 1081 - field1739[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1728[var7] - var12) * var14 >> 16)) / 50; // L: 1082 - field1740[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1083 + if (var10 >= 50) { // L: 1130 + var14 = field2128[var10 - var9] * (50 - var9); // L: 1131 + field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var7] - var11) * var14 >> 16)) / 50; // L: 1132 + field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var7] - var12) * var14 >> 16)) / 50; // L: 1133 + field2072[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1134 } } - if (var10 >= 50) { // L: 1086 - field1738[var4] = modelViewportXs[var7]; // L: 1087 - field1739[var4] = modelViewportYs[var7]; // L: 1088 - field1740[var4++] = this.faceColors3[var1]; // L: 1089 + if (var10 >= 50) { // L: 1137 + field2116[var4] = modelViewportXs[var7]; // L: 1138 + field2117[var4] = modelViewportYs[var7]; // L: 1139 + field2072[var4++] = this.faceColors3[var1]; // L: 1140 } else { - var11 = field1727[var7]; // L: 1092 - var12 = field1728[var7]; // L: 1093 - var13 = this.faceColors3[var1]; // L: 1094 - if (var9 >= 50) { // L: 1095 - var14 = field1750[var9 - var10] * (50 - var10); // L: 1096 - field1738[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1727[var6] - var11) * var14 >> 16)) / 50; // L: 1097 - field1739[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1728[var6] - var12) * var14 >> 16)) / 50; // L: 1098 - field1740[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1099 + var11 = field2105[var7]; // L: 1143 + var12 = field2106[var7]; // L: 1144 + var13 = this.faceColors3[var1]; // L: 1145 + if (var9 >= 50) { // L: 1146 + var14 = field2128[var9 - var10] * (50 - var10); // L: 1147 + field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var6] - var11) * var14 >> 16)) / 50; // L: 1148 + field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var6] - var12) * var14 >> 16)) / 50; // L: 1149 + field2072[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1150 } - if (var8 >= 50) { // L: 1101 - var14 = field1750[var8 - var10] * (50 - var10); // L: 1102 - field1738[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1727[var5] - var11) * var14 >> 16)) / 50; // L: 1103 - field1739[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1728[var5] - var12) * var14 >> 16)) / 50; // L: 1104 - field1740[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1105 + if (var8 >= 50) { // L: 1152 + var14 = field2128[var8 - var10] * (50 - var10); // L: 1153 + field2116[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2105[var5] - var11) * var14 >> 16)) / 50; // L: 1154 + field2117[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2106[var5] - var12) * var14 >> 16)) / 50; // L: 1155 + field2072[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1156 } } - var11 = field1738[0]; // L: 1108 - var12 = field1738[1]; // L: 1109 - var13 = field1738[2]; // L: 1110 - var14 = field1739[0]; // L: 1111 - int var15 = field1739[1]; // L: 1112 - int var16 = field1739[2]; // L: 1113 - Rasterizer3D.field1775 = false; // L: 1114 + var11 = field2116[0]; // L: 1159 + var12 = field2116[1]; // L: 1160 + var13 = field2116[2]; // L: 1161 + var14 = field2117[0]; // L: 1162 + int var15 = field2117[1]; // L: 1163 + int var16 = field2117[2]; // L: 1164 + Rasterizer3D.field1899 = false; // L: 1165 int var17; int var18; int var19; int var20; - if (var4 == 3) { // L: 1115 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1116 - Rasterizer3D.field1775 = true; + if (var4 == 3) { // L: 1166 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1167 + Rasterizer3D.field1899 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1117 - if (this.field1700 != null && this.field1700[var1] != -1) { // L: 1125 - var20 = this.field1700[var1] & 255; // L: 1126 - var17 = this.field1718[var20]; // L: 1127 - var18 = this.field1705[var20]; // L: 1128 - var19 = this.field1749[var20]; // L: 1129 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1168 + if (this.field2078 != null && this.field2078[var1] != -1) { // L: 1176 + var20 = this.field2078[var1] & 255; // L: 1177 + var17 = this.field2082[var20]; // L: 1178 + var18 = this.field2083[var20]; // L: 1179 + var19 = this.field2095[var20]; // L: 1180 } else { - var17 = var5; // L: 1132 - var18 = var6; // L: 1133 - var19 = var7; // L: 1134 + var17 = var5; // L: 1183 + var18 = var6; // L: 1184 + var19 = var7; // L: 1185 } - if (this.faceColors3[var1] == -1) { // L: 1136 - Rasterizer3D.method3212(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1727[var17], field1727[var18], field1727[var19], field1728[var17], field1728[var18], field1728[var19], field1742[var17], field1742[var18], field1742[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { // L: 1187 + Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3212(var14, var15, var16, var11, var12, var13, field1740[0], field1740[1], field1740[2], field1727[var17], field1727[var18], field1727[var19], field1728[var17], field1728[var18], field1728[var19], field1742[var17], field1742[var18], field1742[var19], this.faceTextures[var1]); // L: 1137 + Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], this.faceTextures[var1]); // L: 1188 } - } else if (this.faceColors3[var1] == -1) { // L: 1118 - Rasterizer3D.method3179(var14, var15, var16, var11, var12, var13, field1697[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1169 + Rasterizer3D.method3370(var14, var15, var16, var11, var12, var13, field2127[this.faceColors1[var1]]); } else { - Rasterizer3D.method3175(var14, var15, var16, var11, var12, var13, field1740[0], field1740[1], field1740[2]); // L: 1119 + Rasterizer3D.method3383(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2]); // L: 1170 } } - if (var4 == 4) { // L: 1140 - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1738[3] < 0 || field1738[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1141 - Rasterizer3D.field1775 = true; + if (var4 == 4) { // L: 1191 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2116[3] < 0 || field2116[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1192 + Rasterizer3D.field1899 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1142 - if (this.field1700 != null && this.field1700[var1] != -1) { // L: 1157 - var20 = this.field1700[var1] & 255; // L: 1158 - var17 = this.field1718[var20]; // L: 1159 - var18 = this.field1705[var20]; // L: 1160 - var19 = this.field1749[var20]; // L: 1161 + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1193 + if (this.field2078 != null && this.field2078[var1] != -1) { // L: 1208 + var20 = this.field2078[var1] & 255; // L: 1209 + var17 = this.field2082[var20]; // L: 1210 + var18 = this.field2083[var20]; // L: 1211 + var19 = this.field2095[var20]; // L: 1212 } else { - var17 = var5; // L: 1164 - var18 = var6; // L: 1165 - var19 = var7; // L: 1166 + var17 = var5; // L: 1215 + var18 = var6; // L: 1216 + var19 = var7; // L: 1217 } - short var21 = this.faceTextures[var1]; // L: 1168 - if (this.faceColors3[var1] == -1) { // L: 1169 - Rasterizer3D.method3212(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1727[var17], field1727[var18], field1727[var19], field1728[var17], field1728[var18], field1728[var19], field1742[var17], field1742[var18], field1742[var19], var21); // L: 1170 - Rasterizer3D.method3212(var14, var16, field1739[3], var11, var13, field1738[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1727[var17], field1727[var18], field1727[var19], field1728[var17], field1728[var18], field1728[var19], field1742[var17], field1742[var18], field1742[var19], var21); // L: 1171 + short var21 = this.faceTextures[var1]; // L: 1219 + if (this.faceColors3[var1] == -1) { // L: 1220 + Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1221 + Rasterizer3D.method3372(var14, var16, field2117[3], var11, var13, field2116[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1222 } else { - Rasterizer3D.method3212(var14, var15, var16, var11, var12, var13, field1740[0], field1740[1], field1740[2], field1727[var17], field1727[var18], field1727[var19], field1728[var17], field1728[var18], field1728[var19], field1742[var17], field1742[var18], field1742[var19], var21); // L: 1174 - Rasterizer3D.method3212(var14, var16, field1739[3], var11, var13, field1738[3], field1740[0], field1740[2], field1740[3], field1727[var17], field1727[var18], field1727[var19], field1728[var17], field1728[var18], field1728[var19], field1742[var17], field1742[var18], field1742[var19], var21); // L: 1175 + Rasterizer3D.method3372(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1225 + Rasterizer3D.method3372(var14, var16, field2117[3], var11, var13, field2116[3], field2072[0], field2072[2], field2072[3], field2105[var17], field2105[var18], field2105[var19], field2106[var17], field2106[var18], field2106[var19], field2061[var17], field2061[var18], field2061[var19], var21); // L: 1226 } - } else if (this.faceColors3[var1] == -1) { // L: 1143 - var17 = field1697[this.faceColors1[var1]]; // L: 1144 - Rasterizer3D.method3179(var14, var15, var16, var11, var12, var13, var17); // L: 1145 - Rasterizer3D.method3179(var14, var16, field1739[3], var11, var13, field1738[3], var17); // L: 1146 + } else if (this.faceColors3[var1] == -1) { // L: 1194 + var17 = field2127[this.faceColors1[var1]]; // L: 1195 + Rasterizer3D.method3370(var14, var15, var16, var11, var12, var13, var17); // L: 1196 + Rasterizer3D.method3370(var14, var16, field2117[3], var11, var13, field2116[3], var17); // L: 1197 } else { - Rasterizer3D.method3175(var14, var15, var16, var11, var12, var13, field1740[0], field1740[1], field1740[2]); // L: 1149 - Rasterizer3D.method3175(var14, var16, field1739[3], var11, var13, field1738[3], field1740[0], field1740[2], field1740[3]); // L: 1150 + Rasterizer3D.method3383(var14, var15, var16, var11, var12, var13, field2072[0], field2072[1], field2072[2]); // L: 1200 + Rasterizer3D.method3383(var14, var16, field2117[3], var11, var13, field2116[3], field2072[0], field2072[2], field2072[3]); // L: 1201 } } - } // L: 1179 + } // L: 1230 - @ObfuscatedName("cz") + @ObfuscatedName("bu") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1731[0] = -1; // L: 723 + field2109[0] = -1; // L: 723 if (this.boundsType != 1) { // L: 724 this.calculateBoundsCylinder(); } @@ -1595,104 +1595,139 @@ public class Model extends Renderable { var25 = true; } - boolean var26 = var25 || this.field1692 > 0; // L: 747 + boolean var26 = var25 || this.field2081 > 0; // L: 747 int var27 = ViewportMouse.ViewportMouse_x; // L: 750 - int var29 = ModeWhere.method3877(); // L: 753 - boolean var30 = ViewportMouse.ViewportMouse_isInViewport; // L: 756 - boolean var32 = TileItem.method2265(var9); // L: 759 + int var29 = JagexCache.method2541(); // L: 753 + boolean var30 = FaceNormal.method3632(); // L: 754 + boolean var31 = var9 != 0L && !class10.method137(var9); // L: 757 boolean var33 = false; // L: 760 - int var35; - int var36; int var37; - if (var32 && var30) { // L: 761 + int var38; + int var39; + int var40; + int var41; + int var42; + int var46; + int var52; + if (var31 && var30) { // L: 761 boolean var34 = false; // L: 762 - if (field1744) { // L: 763 - var34 = WorldMapSprite.method498(this, var6, var7, var8); // L: 764 + if (field2114) { // L: 763 + boolean var35; + if (!FaceNormal.method3632()) { // L: 767 + var35 = false; // L: 768 + } else { + WorldMapSprite.method3108(); // L: 771 + var37 = this.xMid + var6; // L: 772 + var38 = var7 + this.yMid; // L: 773 + var39 = var8 + this.zMid; // L: 774 + var40 = this.xMidOffset; // L: 775 + var41 = this.yMidOffset; // L: 776 + var42 = this.zMidOffset; // L: 777 + int var43 = UserComparator10.field1439 - var37; // L: 778 + int var44 = MusicPatchPcmStream.field2544 - var38; // L: 779 + int var45 = WorldMapLabelSize.field1568 - var39; // L: 780 + if (Math.abs(var43) > var40 + Login.field1018) { // L: 781 + var35 = false; // L: 782 + } else if (Math.abs(var44) > var41 + ViewportMouse.field2137) { // L: 785 + var35 = false; // L: 786 + } else if (Math.abs(var45) > var42 + class24.field189) { // L: 789 + var35 = false; // L: 790 + } else if (Math.abs(var45 * ViewportMouse.field2136 - var44 * Varps.field2580) > var42 * ViewportMouse.field2137 + var41 * class24.field189) { // L: 793 + var35 = false; // L: 794 + } else if (Math.abs(var43 * Varps.field2580 - var45 * ViewportMouse.field2135) > var42 * Login.field1018 + var40 * class24.field189) { // L: 797 + var35 = false; // L: 798 + } else if (Math.abs(var44 * ViewportMouse.field2135 - var43 * ViewportMouse.field2136) > var40 * ViewportMouse.field2137 + var41 * Login.field1018) { // L: 801 + var35 = false; // L: 802 + } else { + var35 = true; // L: 805 + } + } + + var34 = var35; // L: 807 } else { - var35 = var12 - var13; // L: 767 - if (var35 <= 50) { // L: 768 - var35 = 50; + var52 = var12 - var13; // L: 810 + if (var52 <= 50) { // L: 811 + var52 = 50; } - if (var15 > 0) { // L: 769 - var16 /= var14; // L: 770 - var17 /= var35; // L: 771 + if (var15 > 0) { // L: 812 + var16 /= var14; // L: 813 + var17 /= var52; // L: 814 } else { - var17 /= var14; // L: 774 - var16 /= var35; // L: 775 + var17 /= var14; // L: 817 + var16 /= var52; // L: 818 } - if (var18 > 0) { // L: 777 - var22 /= var14; // L: 778 - var20 /= var35; // L: 779 + if (var18 > 0) { // L: 820 + var22 /= var14; // L: 821 + var20 /= var52; // L: 822 } else { - var20 /= var14; // L: 782 - var22 /= var35; // L: 783 + var20 /= var14; // L: 825 + var22 /= var52; // L: 826 } - var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 785 - var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 786 - if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { // L: 787 - var34 = true; // L: 788 + var46 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 828 + var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 829 + if (var46 > var16 && var46 < var17 && var37 > var22 && var37 < var20) { // L: 830 + var34 = true; // L: 831 } } - if (var34) { // L: 791 - if (this.isSingleTile) { // L: 792 - GrandExchangeOfferWorldComparator.method129(var9); + if (var34) { // L: 834 + if (this.isSingleTile) { // L: 835 + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 838 } else { - var33 = true; // L: 793 + var33 = true; // L: 841 } } } - int var45 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 796 - var35 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 797 - var36 = 0; // L: 798 - var37 = 0; // L: 799 - if (var1 != 0) { // L: 800 - var36 = Model_sine[var1]; // L: 801 - var37 = Model_cosine[var1]; // L: 802 + int var51 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 844 + var52 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 845 + var46 = 0; // L: 846 + var37 = 0; // L: 847 + if (var1 != 0) { // L: 848 + var46 = Model_sine[var1]; // L: 849 + var37 = Model_cosine[var1]; // L: 850 } - for (int var38 = 0; var38 < this.verticesCount; ++var38) { // L: 804 - int var39 = this.verticesX[var38]; // L: 805 - int var40 = this.verticesY[var38]; // L: 806 - int var41 = this.verticesZ[var38]; // L: 807 - int var42; - if (var1 != 0) { // L: 808 - var42 = var41 * var36 + var39 * var37 >> 16; // L: 809 - var41 = var41 * var37 - var39 * var36 >> 16; // L: 810 - var39 = var42; // L: 811 + for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 852 + var39 = this.verticesX[var38]; // L: 853 + var40 = this.verticesY[var38]; // L: 854 + var41 = this.verticesZ[var38]; // L: 855 + if (var1 != 0) { // L: 856 + var42 = var41 * var46 + var39 * var37 >> 16; // L: 857 + var41 = var41 * var37 - var39 * var46 >> 16; // L: 858 + var39 = var42; // L: 859 } - var39 += var6; // L: 813 - var40 += var7; // L: 814 - var41 += var8; // L: 815 - var42 = var41 * var4 + var5 * var39 >> 16; // L: 816 - var41 = var5 * var41 - var39 * var4 >> 16; // L: 817 - var39 = var42; // L: 818 - var42 = var3 * var40 - var41 * var2 >> 16; // L: 819 - var41 = var40 * var2 + var3 * var41 >> 16; // L: 820 - field1726[var38] = var41 - var12; // L: 822 - if (var41 >= 50) { // L: 823 - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var45; // L: 824 - modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; // L: 825 + var39 += var6; // L: 861 + var40 += var7; // L: 862 + var41 += var8; // L: 863 + var42 = var41 * var4 + var5 * var39 >> 16; // L: 864 + var41 = var5 * var41 - var39 * var4 >> 16; // L: 865 + var39 = var42; // L: 866 + var42 = var3 * var40 - var41 * var2 >> 16; // L: 867 + var41 = var40 * var2 + var3 * var41 >> 16; // L: 868 + field2104[var38] = var41 - var12; // L: 870 + if (var41 >= 50) { // L: 871 + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var51; // L: 872 + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var52; // L: 873 } else { - modelViewportXs[var38] = -5000; // L: 828 - var24 = true; // L: 829 + modelViewportXs[var38] = -5000; // L: 876 + var24 = true; // L: 877 } - if (var26) { // L: 831 - field1727[var38] = var39; // L: 832 - field1728[var38] = var42; // L: 833 - field1742[var38] = var41; // L: 834 + if (var26) { // L: 879 + field2105[var38] = var39; // L: 880 + field2106[var38] = var42; // L: 881 + field2061[var38] = var41; // L: 882 } } try { - this.draw0(var24, var33, this.isSingleTile, var9); // L: 838 - } catch (Exception var44) { // L: 840 + this.draw0(var24, var33, this.isSingleTile, var9); // L: 886 + } catch (Exception var50) { // L: 888 } } @@ -1700,5 +1735,5 @@ public class Model extends Renderable { } } } - } // L: 841 + } // L: 889 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index da75bd9911..89bf96940d 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,134 +3,134 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("fs") @Implements("ModelData") public class ModelData extends Renderable { - @ObfuscatedName("ar") - static int[] field1584; - @ObfuscatedName("al") - static int[] field1601; - @ObfuscatedName("aa") - static int field1602; + @ObfuscatedName("ax") + static int[] field1822; @ObfuscatedName("as") + static int[] field1831; + @ObfuscatedName("ad") + static int field1832; + @ObfuscatedName("af") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("verticesCount") int verticesCount; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("verticesX") int[] verticesX; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("verticesY") int[] verticesY; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("faceCount") int faceCount; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("indices1") int[] indices1; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("indices2") int[] indices2; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("indices3") int[] indices3; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("faceColors") short[] faceColors; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("priority") byte priority; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "[Ler;" + descriptor = "[Lfh;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "[Leh;" + descriptor = "[Lge;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "[Leh;" + descriptor = "[Lge;" ) - VertexNormal[] field1576; - @ObfuscatedName("am") + VertexNormal[] field1821; + @ObfuscatedName("ay") @Export("ambient") public short ambient; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("contrast") public short contrast; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ac") - int field1595; @ObfuscatedName("aq") - int field1600; + int field1819; @ObfuscatedName("at") - int field1597; - @ObfuscatedName("ak") - int field1589; - @ObfuscatedName("ax") - int field1599; + int field1826; + @ObfuscatedName("aj") + int field1805; + @ObfuscatedName("aw") + int field1828; + @ObfuscatedName("ap") + int field1829; static { - field1584 = new int[10000]; // L: 44 - field1601 = new int[10000]; // L: 45 - field1602 = 0; // L: 46 + field1822 = new int[10000]; // L: 44 + field1831 = new int[10000]; // L: 45 + field1832 = 0; // L: 46 ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 } @@ -143,7 +143,7 @@ public class ModelData extends Renderable { } // L: 50 @ObfuscatedSignature( - descriptor = "([Lek;I)V" + descriptor = "([Lfs;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -242,8 +242,8 @@ public class ModelData extends Renderable { } if (var4) { // L: 529 - if (var10.faceRenderPriorities != null) { - this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; // L: 530 + if (var10.faceRenderPriorities != null) { // L: 530 + this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; } else { this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531 } @@ -274,18 +274,18 @@ public class ModelData extends Renderable { } this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 - this.indices1[this.faceCount] = this.method2980(var10, var10.indices1[var11]); // L: 548 - this.indices2[this.faceCount] = this.method2980(var10, var10.indices2[var11]); // L: 549 - this.indices3[this.faceCount] = this.method2980(var10, var10.indices3[var11]); // L: 550 + this.indices1[this.faceCount] = this.method3316(var10, var10.indices1[var11]); // L: 548 + this.indices2[this.faceCount] = this.method3316(var10, var10.indices2[var11]); // L: 549 + this.indices3[this.faceCount] = this.method3316(var10, var10.indices3[var11]); // L: 550 ++this.faceCount; // L: 551 } for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553 byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554 if (var12 == 0) { // L: 555 - this.texTriangleX[this.textureTriangleCount] = (short)this.method2980(var10, var10.texTriangleX[var11]); // L: 556 - this.texTriangleY[this.textureTriangleCount] = (short)this.method2980(var10, var10.texTriangleY[var11]); // L: 557 - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2980(var10, var10.texTriangleZ[var11]); // L: 558 + this.texTriangleX[this.textureTriangleCount] = (short)this.method3316(var10, var10.texTriangleX[var11]); // L: 556 + this.texTriangleY[this.textureTriangleCount] = (short)this.method3316(var10, var10.texTriangleY[var11]); // L: 557 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method3316(var10, var10.texTriangleZ[var11]); // L: 558 } ++this.textureTriangleCount; // L: 560 @@ -301,15 +301,15 @@ public class ModelData extends Renderable { this.priority = 0; this.isBoundsCalculated = false; if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59 - this.method2941(var1); + this.method3276(var1); } else { - this.method2942(var1); // L: 60 + this.method3304(var1); // L: 60 } } // L: 61 @ObfuscatedSignature( - descriptor = "(Lek;ZZZZ)V", + descriptor = "(Lfs;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -375,13 +375,13 @@ public class ModelData extends Renderable { this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640 this.vertexNormals = var1.vertexNormals; // L: 641 this.faceNormals = var1.faceNormals; // L: 642 - this.field1576 = var1.field1576; // L: 643 + this.field1821 = var1.field1821; // L: 643 this.ambient = var1.ambient; // L: 644 this.contrast = var1.contrast; // L: 645 } - @ObfuscatedName("v") - void method2941(byte[] var1) { + @ObfuscatedName("u") + void method3276(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 64 Buffer var3 = new Buffer(var1); // L: 65 Buffer var4 = new Buffer(var1); // L: 66 @@ -686,8 +686,8 @@ public class ModelData extends Renderable { } // L: 273 - @ObfuscatedName("d") - void method2942(byte[] var1) { + @ObfuscatedName("p") + void method3304(byte[] var1) { boolean var2 = false; // L: 276 boolean var3 = false; // L: 277 Buffer var4 = new Buffer(var1); // L: 278 @@ -963,11 +963,11 @@ public class ModelData extends Renderable { } // L: 468 - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lek;I)I" + descriptor = "(Lfs;I)I" ) - final int method2980(ModelData var1, int var2) { + final int method3316(ModelData var1, int var2) { int var3 = -1; // L: 567 int var4 = var1.verticesX[var2]; // L: 568 int var5 = var1.verticesY[var2]; // L: 569 @@ -984,8 +984,8 @@ public class ModelData extends Renderable { 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) { - this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 581 + if (var1.vertexSkins != null) { // L: 581 + this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; } var3 = this.verticesCount++; // L: 582 @@ -994,11 +994,11 @@ public class ModelData extends Renderable { return var3; // L: 584 } - @ObfuscatedName("y") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lek;" + descriptor = "()Lfs;" ) - public ModelData method2945() { + public ModelData method3326() { ModelData var1 = new ModelData(); // L: 650 if (this.faceRenderTypes != null) { // L: 651 var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 @@ -1040,14 +1040,14 @@ public class ModelData extends Renderable { @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lek;" + descriptor = "([[IIIIZI)Lfs;" ) - public ModelData method2946(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method3314(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); // L: 686 - int var7 = var2 + this.field1600; // L: 687 - int var8 = var2 + this.field1597; // L: 688 - int var9 = var4 + this.field1599; // L: 689 - int var10 = var4 + this.field1589; // L: 690 + int var7 = var2 + this.field1826; // L: 687 + int var8 = var2 + this.field1805; // L: 688 + int var9 = var4 + this.field1829; // L: 689 + int var10 = var4 + this.field1828; // 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 @@ -1132,8 +1132,8 @@ public class ModelData extends Renderable { } } - @ObfuscatedName("z") - void method2947() { + @ObfuscatedName("n") + void method3282() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Renderable { } // L: 804 - @ObfuscatedName("e") - public void method2948() { + @ObfuscatedName("l") + public void method3303() { 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 @@ -1204,8 +1204,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 812 } // L: 813 - @ObfuscatedName("l") - public void method2949() { + @ObfuscatedName("m") + public void method3284() { 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 @@ -1214,8 +1214,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 820 } // L: 821 - @ObfuscatedName("s") - public void method3006() { + @ObfuscatedName("d") + public void method3285() { 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 @@ -1225,8 +1225,8 @@ public class ModelData extends Renderable { this.invalidate(); // L: 829 } // L: 830 - @ObfuscatedName("b") - public void method2951(int var1) { + @ObfuscatedName("c") + public void method3286(int var1) { int var2 = ModelData_sine[var1]; // L: 833 int var3 = ModelData_cosine[var1]; // L: 834 @@ -1239,7 +1239,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 840 } // L: 841 - @ObfuscatedName("a") + @ObfuscatedName("j") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 @@ -1254,7 +1254,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 849 } // L: 850 - @ObfuscatedName("w") + @ObfuscatedName("r") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 @@ -1265,7 +1265,7 @@ public class ModelData extends Renderable { } // L: 856 - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { // L: 859 @@ -1278,8 +1278,8 @@ public class ModelData extends Renderable { } } // L: 863 - @ObfuscatedName("i") - public void method2989() { + @ObfuscatedName("t") + public void method3290() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 872 } // L: 873 - @ObfuscatedName("x") + @ObfuscatedName("v") @Export("resize") public void resize(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 @@ -1306,7 +1306,7 @@ public class ModelData extends Renderable { this.invalidate(); // L: 881 } // L: 882 - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { // L: 885 @@ -1382,52 +1382,52 @@ public class ModelData extends Renderable { } } // L: 940 - @ObfuscatedName("u") + @ObfuscatedName("z") @Export("invalidate") void invalidate() { this.vertexNormals = null; // L: 943 - this.field1576 = null; // L: 944 + this.field1821 = null; // L: 944 this.faceNormals = null; // L: 945 this.isBoundsCalculated = false; // L: 946 } // L: 947 - @ObfuscatedName("t") + @ObfuscatedName("i") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { // L: 950 super.height = 0; // L: 951 - this.field1595 = 0; // L: 952 - this.field1600 = 999999; // L: 953 - this.field1597 = -999999; // L: 954 - this.field1589 = -99999; // L: 955 - this.field1599 = 99999; // L: 956 + this.field1819 = 0; // L: 952 + this.field1826 = 999999; // L: 953 + this.field1805 = -999999; // L: 954 + this.field1828 = -99999; // L: 955 + this.field1829 = 99999; // L: 956 for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957 int var2 = this.verticesX[var1]; // L: 958 int var3 = this.verticesY[var1]; // L: 959 int var4 = this.verticesZ[var1]; // L: 960 - if (var2 < this.field1600) { // L: 961 - this.field1600 = var2; + if (var2 < this.field1826) { // L: 961 + this.field1826 = var2; } - if (var2 > this.field1597) { // L: 962 - this.field1597 = var2; + if (var2 > this.field1805) { // L: 962 + this.field1805 = var2; } - if (var4 < this.field1599) { // L: 963 - this.field1599 = var4; + if (var4 < this.field1829) { // L: 963 + this.field1829 = var4; } - if (var4 > this.field1589) { // L: 964 - this.field1589 = var4; + if (var4 > this.field1828) { // L: 964 + this.field1828 = var4; } if (-var3 > super.height) { // L: 965 super.height = -var3; } - if (var3 > this.field1595) { // L: 966 - this.field1595 = var3; + if (var3 > this.field1819) { // L: 966 + this.field1819 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Renderable { } } // L: 969 - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIII)Lef;" + descriptor = "(IIIII)Lgv;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -1458,38 +1458,38 @@ public class ModelData extends Renderable { } } - var8.field1692 = 0; // L: 1040 + var8.field2081 = 0; // L: 1040 for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 - ++var8.field1692; + ++var8.field2081; } } - var8.field1718 = new int[var8.field1692]; // L: 1044 - var8.field1705 = new int[var8.field1692]; // L: 1045 - var8.field1749 = new int[var8.field1692]; // L: 1046 + var8.field2082 = new int[var8.field2081]; // L: 1044 + var8.field2083 = new int[var8.field2081]; // L: 1045 + var8.field2095 = new int[var8.field2081]; // L: 1046 var10 = 0; // L: 1047 int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 - var8.field1718[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 - var8.field1705[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 - var8.field1749[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 + var8.field2082[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 + var8.field2083[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 + var8.field2095[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 var9[var11] = var10++; // L: 1053 } else { var9[var11] = -1; // L: 1055 } } - var8.field1700 = new byte[this.faceCount]; // L: 1057 + var8.field2078 = new byte[this.faceCount]; // L: 1057 for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 if (this.textureCoords[var11] != -1) { // L: 1059 - var8.field1700[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field2078[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1700[var11] = -1; // L: 1060 + var8.field2078[var11] = -1; // L: 1060 } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Renderable { 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] = method2962(this.faceColors[var16] & '\uffff', var14); // L: 1096 + var8.faceColors1[var16] = method3297(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 @@ -1542,69 +1542,69 @@ public class ModelData extends Renderable { } } else { int var15 = this.faceColors[var16] & '\uffff'; // L: 1079 - if (this.field1576 != null && this.field1576[this.indices1[var16]] != null) { // L: 1080 - var13 = this.field1576[this.indices1[var16]]; + if (this.field1821 != null && this.field1821[this.indices1[var16]] != null) { // L: 1080 + var13 = this.field1821[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 - var8.faceColors1[var16] = method2962(var15, var14); // L: 1083 - if (this.field1576 != null && this.field1576[this.indices2[var16]] != null) { // L: 1084 - var13 = this.field1576[this.indices2[var16]]; + var8.faceColors1[var16] = method3297(var15, var14); // L: 1083 + if (this.field1821 != null && this.field1821[this.indices2[var16]] != null) { // L: 1084 + var13 = this.field1821[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 - var8.faceColors2[var16] = method2962(var15, var14); // L: 1087 - if (this.field1576 != null && this.field1576[this.indices3[var16]] != null) { // L: 1088 - var13 = this.field1576[this.indices3[var16]]; + var8.faceColors2[var16] = method3297(var15, var14); // L: 1087 + if (this.field1821 != null && this.field1821[this.indices3[var16]] != null) { // L: 1088 + var13 = this.field1821[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 - var8.faceColors3[var16] = method2962(var15, var14); // L: 1091 + var8.faceColors3[var16] = method3297(var15, var14); // L: 1091 } } else if (var17 != 0) { // L: 1108 if (var17 == 1) { // L: 1124 var19 = this.faceNormals[var16]; // L: 1125 var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126 - var8.faceColors1[var16] = method2963(var14); // L: 1127 + var8.faceColors1[var16] = method3298(var14); // L: 1127 var8.faceColors3[var16] = -1; // L: 1128 } else { var8.faceColors3[var16] = -2; // L: 1131 } } else { - if (this.field1576 != null && this.field1576[this.indices1[var16]] != null) { // L: 1111 - var13 = this.field1576[this.indices1[var16]]; + if (this.field1821 != null && this.field1821[this.indices1[var16]] != null) { // L: 1111 + var13 = this.field1821[this.indices1[var16]]; } else { var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 - var8.faceColors1[var16] = method2963(var14); // L: 1114 - if (this.field1576 != null && this.field1576[this.indices2[var16]] != null) { // L: 1115 - var13 = this.field1576[this.indices2[var16]]; + var8.faceColors1[var16] = method3298(var14); // L: 1114 + if (this.field1821 != null && this.field1821[this.indices2[var16]] != null) { // L: 1115 + var13 = this.field1821[this.indices2[var16]]; } else { var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 - var8.faceColors2[var16] = method2963(var14); // L: 1118 - if (this.field1576 != null && this.field1576[this.indices3[var16]] != null) { // L: 1119 - var13 = this.field1576[this.indices3[var16]]; + var8.faceColors2[var16] = method3298(var14); // L: 1118 + if (this.field1821 != null && this.field1821[this.indices3[var16]] != null) { // L: 1119 + var13 = this.field1821[this.indices3[var16]]; } else { var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120 } var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 - var8.faceColors3[var16] = method2963(var14); // L: 1122 + var8.faceColors3[var16] = method3298(var14); // L: 1122 } } - this.method2947(); // L: 1135 + this.method3282(); // L: 1135 var8.verticesCount = this.verticesCount; // L: 1136 var8.verticesX = this.verticesX; // L: 1137 var8.verticesY = this.verticesY; // L: 1138 @@ -1615,16 +1615,16 @@ public class ModelData extends Renderable { var8.indices3 = this.indices3; // L: 1143 var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 var8.faceAlphas = this.faceAlphas; // L: 1145 - var8.field1702 = this.priority; // L: 1146 + var8.field2080 = 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("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;II)Lek;" + descriptor = "(Lir;II)Lfs;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1632,16 +1632,16 @@ public class ModelData extends Renderable { return var3 == null ? null : new ModelData(var3); // L: 54 } - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lek;Lek;IIIZ)V" + descriptor = "(Lfs;Lfs;IIIZ)V" ) - static void method2960(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method3343(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 - ++field1602; // L: 976 + ++field1832; // L: 976 int var6 = 0; // L: 977 int[] var7 = var1.verticesX; // L: 978 int var8 = var1.verticesCount; // L: 979 @@ -1651,30 +1651,30 @@ public class ModelData extends Renderable { VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 if (var10.magnitude != 0) { // L: 982 int var11 = var0.verticesY[var9] - var3; // L: 983 - if (var11 <= var1.field1595) { // L: 984 + if (var11 <= var1.field1819) { // L: 984 int var12 = var0.verticesX[var9] - var2; // L: 985 - if (var12 >= var1.field1600 && var12 <= var1.field1597) { // L: 986 + if (var12 >= var1.field1826 && var12 <= var1.field1805) { // L: 986 int var13 = var0.verticesZ[var9] - var4; // L: 987 - if (var13 >= var1.field1599 && var13 <= var1.field1589) { // L: 988 + if (var13 >= var1.field1829 && var13 <= var1.field1828) { // 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.field1576 == null) { // L: 992 - var0.field1576 = new VertexNormal[var0.verticesCount]; + if (var0.field1821 == null) { // L: 992 + var0.field1821 = new VertexNormal[var0.verticesCount]; } - if (var1.field1576 == null) { // L: 993 - var1.field1576 = new VertexNormal[var8]; + if (var1.field1821 == null) { // L: 993 + var1.field1821 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1576[var9]; // L: 994 + VertexNormal var16 = var0.field1821[var9]; // L: 994 if (var16 == null) { // L: 995 - var16 = var0.field1576[var9] = new VertexNormal(var10); + var16 = var0.field1821[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1576[var14]; // L: 996 + VertexNormal var17 = var1.field1821[var14]; // L: 996 if (var17 == null) { - var17 = var1.field1576[var14] = new VertexNormal(var15); // L: 997 + var17 = var1.field1821[var14] = new VertexNormal(var15); // L: 997 } var16.x += var15.x; // L: 998 @@ -1686,8 +1686,8 @@ public class ModelData extends Renderable { var17.z += var10.z; // L: 1004 var17.magnitude += var10.magnitude; // L: 1005 ++var6; // L: 1006 - field1584[var9] = field1602; // L: 1007 - field1601[var14] = field1602; // L: 1008 + field1822[var9] = field1832; // L: 1007 + field1831[var14] = field1832; // L: 1008 } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Renderable { if (var6 >= 3 && var5) { // L: 1012 for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 - if (field1584[var0.indices1[var9]] == field1602 && field1584[var0.indices2[var9]] == field1602 && field1584[var0.indices3[var9]] == field1602) { // L: 1014 + if (field1822[var0.indices1[var9]] == field1832 && field1822[var0.indices2[var9]] == field1832 && field1822[var0.indices3[var9]] == field1832) { // L: 1014 if (var0.faceRenderTypes == null) { // L: 1015 var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Renderable { } for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 - if (field1602 == field1601[var1.indices1[var9]] && field1602 == field1601[var1.indices2[var9]] && field1602 == field1601[var1.indices3[var9]]) { // L: 1020 + if (field1832 == field1831[var1.indices1[var9]] && field1832 == field1831[var1.indices2[var9]] && field1832 == field1831[var1.indices3[var9]]) { // L: 1020 if (var1.faceRenderTypes == null) { // L: 1021 var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Renderable { } } // L: 1025 - @ObfuscatedName("ay") - static final int method2962(int var0, int var1) { + @ObfuscatedName("s") + static final int method3297(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; // L: 1154 if (var1 < 2) { // L: 1155 var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Renderable { return (var0 & 65408) + var1; // L: 1157 } - @ObfuscatedName("am") - static final int method2963(int var0) { + @ObfuscatedName("y") + static final int method3298(int var0) { if (var0 < 2) { // L: 1161 var0 = 2; } else if (var0 > 126) { diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index d39c6e0a42..2e9db1ab35 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,65 +1,61 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("gk") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("ib") - @ObfuscatedGetter( - intValue = -1948740643 - ) - static int field1882; - ModelData0() { } // L: 4 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkd;II)V", - garbageValue = "-1780574680" + descriptor = "(Lir;III)Loh;", + garbageValue = "-2108875586" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; // L: 71 - Players.Players_pendingUpdateCount = 0; // L: 72 - WorldMapDecoration.method404(var0); // L: 73 - MusicPatch.method4095(var0); // L: 74 - if (var0.offset - var2 != var1) { // L: 75 - throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 76 + @Export("SpriteBuffer_getSprite") + public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 91 + boolean var3; + if (var4 == null) { // L: 92 + var3 = false; // L: 93 + } else { + class244.SpriteBuffer_decode(var4); // L: 96 + var3 = true; // L: 97 } - } // L: 78 - @ObfuscatedName("c") + if (!var3) { // L: 99 + return null; + } else { + SpritePixels var5 = new SpritePixels(); // L: 102 + var5.width = class395.SpriteBuffer_spriteWidth; // L: 103 + var5.height = class395.SpriteBuffer_spriteHeight; // L: 104 + var5.xOffset = class0.SpriteBuffer_xOffsets[0]; // L: 105 + var5.yOffset = Interpreter.SpriteBuffer_yOffsets[0]; // L: 106 + var5.subWidth = class395.SpriteBuffer_spriteWidths[0]; // L: 107 + var5.subHeight = class157.SpriteBuffer_spriteHeights[0]; // L: 108 + int var6 = var5.subWidth * var5.subHeight; // L: 109 + byte[] var7 = class223.SpriteBuffer_pixels[0]; // L: 110 + var5.pixels = new int[var6]; // L: 111 + + for (int var8 = 0; var8 < var6; ++var8) { // L: 112 + var5.pixels[var8] = Varps.SpriteBuffer_spritePalette[var7[var8] & 255]; + } + + WorldMapDecorationType.method4370(); // L: 113 + return var5; // L: 116 + } + } + + @ObfuscatedName("ig") @ObfuscatedSignature( - descriptor = "([BIIII[Lfe;I)V", - garbageValue = "255234267" + descriptor = "(IIIZI)V", + garbageValue = "-1135384010" ) - static final void method3411(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { - int var7; - int var8; - for (int var6 = 0; var6 < 4; ++var6) { // L: 93 - for (var7 = 0; var7 < 64; ++var7) { // L: 94 - for (var8 = 0; var8 < 64; ++var8) { // L: 95 - if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96 - int[] var10000 = var5[var6].flags[var7 + var1]; - var10000[var8 + var2] &= -16777217; - } - } - } + static final void method3784(int var0, int var1, int var2, boolean var3) { + if (class15.loadInterface(var0)) { // L: 9976 + Message.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9977 } - - Buffer var10 = new Buffer(var0); // L: 100 - - for (var7 = 0; var7 < 4; ++var7) { // L: 101 - for (var8 = 0; var8 < 64; ++var8) { // L: 102 - for (int var9 = 0; var9 < 64; ++var9) { // L: 103 - KeyHandler.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104 - } - } - } - - } // L: 108 + } // L: 9978 } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 75b48f9ff6..09d48a2a34 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,6 +3,9 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +import java.io.File; +import java.io.RandomAccessFile; +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -10,122 +13,123 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("ar") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lbl;" + descriptor = "Lar;" ) @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("y") + static MouseHandler MouseHandler_instance; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -7050613403176353347L - ) - @Export("MouseHandler_millis") - public static long MouseHandler_millis; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1826122279 + intValue = -2009408369 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("z") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1193500929 + intValue = 1655097803 ) @Export("MouseHandler_currentButtonVolatile") static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 69676803 - ) - @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1528729291 - ) - @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("l") - @ObfuscatedGetter( - longValue = -7426561845363356173L - ) - @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 411605215 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -414755305 + intValue = -1775381995 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 586562237 + intValue = -287499463 + ) + @Export("MouseHandler_xVolatile") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1278537481 + ) + @Export("MouseHandler_yVolatile") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = 7684175983304981365L + ) + @Export("MouseHandler_lastMovedVolatile") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 320986893 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1997230525 ) @Export("MouseHandler_y") public static int MouseHandler_y; - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 635740657 + longValue = -23953879977166285L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -659702837 ) @Export("MouseHandler_lastButtonVolatile") static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1027797435 + intValue = 1493673469 ) @Export("MouseHandler_lastPressedXVolatile") static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1792893405 + intValue = 2049905729 ) @Export("MouseHandler_lastPressedYVolatile") static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = -8649203811003384729L + longValue = 4257889617743394737L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -266650857 + intValue = -1535018267 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -80903917 + intValue = 1275346307 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -199008981 + intValue = -1778744007 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 3494656380039963363L + longValue = -2098715734298926973L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = 47148611 - ) - static int field512; + @ObfuscatedName("dy") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("go") + @Export("regionMapArchives") + static byte[][] regionMapArchives; static { MouseHandler_instance = new MouseHandler(); // L: 15 @@ -143,163 +147,215 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi 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_lastPressedX = 0; + MouseHandler_lastPressedY = 0; + MouseHandler_lastPressedTimeMillis = 0L; } MouseHandler() { - } // L: 34 + } - @ObfuscatedName("d") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-287252269" + garbageValue = "-171580309" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); // L: 57 - if (!var1.isAltDown() && var2 != 2) { // L: 58 - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 59 60 + int var2 = var1.getButton(); // L: 76 + if (!var1.isAltDown() && var2 != 2) { // L: 77 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 78 79 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 105 - MouseHandler_idleCycles = 0; // L: 106 - MouseHandler_xVolatile = var1.getX(); // L: 107 - MouseHandler_yVolatile = var1.getY(); // L: 108 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 109 + if (MouseHandler_instance != null) { // L: 124 + MouseHandler_idleCycles = 0; // L: 125 + MouseHandler_xVolatile = var1.getX(); // L: 126 + MouseHandler_yVolatile = var1.getY(); // L: 127 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 128 } - } // L: 111 + } // L: 130 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 64 - MouseHandler_idleCycles = 0; // L: 65 - MouseHandler_lastPressedXVolatile = var1.getX(); // L: 66 - MouseHandler_lastPressedYVolatile = var1.getY(); // L: 67 - MouseHandler_lastPressedTimeMillisVolatile = Tiles.currentTimeMillis(); // L: 68 - MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 69 - if (MouseHandler_lastButtonVolatile != 0) { // L: 70 + if (MouseHandler_instance != null) { // L: 83 + MouseHandler_idleCycles = 0; // L: 84 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 85 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 86 + MouseHandler_lastPressedTimeMillisVolatile = ObjectSound.currentTimeMillis(); // L: 87 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 88 + if (MouseHandler_lastButtonVolatile != 0) { // L: 89 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { // L: 72 + if (var1.isPopupTrigger()) { // L: 91 var1.consume(); } - } // L: 73 + } // L: 92 public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 76 - MouseHandler_idleCycles = 0; // L: 77 - MouseHandler_currentButtonVolatile = 0; // L: 78 + if (MouseHandler_instance != null) { // L: 95 + MouseHandler_idleCycles = 0; // L: 96 + MouseHandler_currentButtonVolatile = 0; // L: 97 } - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 99 var1.consume(); } - } // L: 81 - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { // L: 84 - var1.consume(); - } - - } // L: 85 + } // L: 100 public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); // L: 88 - } // L: 89 + this.mouseMoved(var1); // L: 107 + } // L: 108 - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { // L: 92 - MouseHandler_idleCycles = 0; // L: 93 - MouseHandler_xVolatile = -1; // L: 94 - MouseHandler_yVolatile = -1; // L: 95 - MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 96 - } + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 120 + } // L: 121 - } // L: 98 + public final void focusGained(FocusEvent var1) { + } // L: 132 public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { // L: 116 + if (MouseHandler_instance != null) { // L: 135 MouseHandler_currentButtonVolatile = 0; } + } // L: 136 + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 111 + MouseHandler_idleCycles = 0; // L: 112 + MouseHandler_xVolatile = -1; // L: 113 + MouseHandler_yVolatile = -1; // L: 114 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 115 + } + } // L: 117 - public final void focusGained(FocusEvent var1) { - } // L: 113 + public final void mouseClicked(MouseEvent var1) { + if (var1.isPopupTrigger()) { // L: 103 + var1.consume(); + } - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); // L: 101 - } // L: 102 + } // L: 104 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;Lig;Lig;Lig;I)V", - garbageValue = "1350296670" - ) - public static void method1151(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - FontName.Widget_archive = var0; // L: 186 - DirectByteArrayCopier.Widget_modelsArchive = var1; // L: 187 - InterfaceParent.Widget_spritesArchive = var2; // L: 188 - Widget.Widget_fontsArchive = var3; // L: 189 - DefaultsGroup.Widget_interfaceComponents = new Widget[FontName.Widget_archive.getGroupCount()][]; // L: 190 - Widget.Widget_loadedInterfaces = new boolean[FontName.Widget_archive.getGroupCount()]; // L: 191 - } // L: 192 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1766193005" - ) - public static int method1176(int var0, int var1) { - int var2 = var0 >>> 31; // L: 79 - return (var0 + var2) / var1 - var2; // L: 80 + @ObfuscatedName("f") + public static String method724(long var0) { + Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 30 + int var2 = Calendar.Calendar_calendar.get(7); // L: 31 + int var3 = Calendar.Calendar_calendar.get(5); // L: 32 + int var4 = Calendar.Calendar_calendar.get(2); // L: 33 + int var5 = Calendar.Calendar_calendar.get(1); // L: 34 + int var6 = Calendar.Calendar_calendar.get(11); // L: 35 + int var7 = Calendar.Calendar_calendar.get(12); // L: 36 + int var8 = Calendar.Calendar_calendar.get(13); // L: 37 + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 38 } - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "-67" + descriptor = "(Lme;ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "-709" ) - static int method1174(int var0, Script var1, boolean var2) { - Widget var5; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1281 - var5 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1282 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId; // L: 1283 - return 1; // L: 1284 - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1286 - var5 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1287 - if (var5.itemId != -1) { // L: 1288 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1289 - } - - return 1; // L: 1290 - } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1292 - int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1293 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1294 - if (var4 != null) { // L: 1295 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1296 - } - - return 1; // L: 1297 - } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1299 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1300 - return 1; // L: 1301 + static String method725(IterableNodeHashTable var0, int var1, String var2) { + if (var0 == null) { // L: 44 + return var2; } else { - return 2; // L: 1303 + ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 45 + return var3 == null ? var2 : (String)var3.obj; // L: 46 47 } } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/io/File;ZB)Z", + garbageValue = "-76" + ) + @Export("isWriteable") + static boolean isWriteable(File var0, boolean var1) { + try { + RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 232 + int var3 = var2.read(); // L: 233 + var2.seek(0L); // L: 234 + var2.write(var3); // L: 235 + var2.seek(0L); // L: 236 + var2.close(); // L: 237 + if (var1) { // L: 238 + var0.delete(); + } + + return true; // L: 239 + } catch (Exception var4) { // L: 241 + return false; // L: 242 + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1530869780" + ) + static int method726(int var0, Script var1, boolean var2) { + Widget var6; + if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1210 + int var4; + if (var0 == 1928) { // L: 1227 + var6 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1228 + var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1229 + if (var4 >= 1 && var4 <= 10) { // L: 1230 + class376.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1233 + return 1; // L: 1234 + } else { + throw new RuntimeException(); // L: 1231 + } + } else if (var0 == 2928) { // L: 1236 + class16.Interpreter_intStackSize -= 3; // L: 1237 + int var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1238 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1239 + int var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 1240 + if (var5 >= 1 && var5 <= 10) { // L: 1241 + class376.widgetDefaultMenuAction(var5, var3, var4, class139.getWidget(var3).itemId, ""); // L: 1244 + return 1; // L: 1245 + } else { + throw new RuntimeException(); // L: 1242 + } + } else { + return 2; // L: 1247 + } + } else if (Interpreter.field950 >= 10) { // L: 1211 + throw new RuntimeException(); // L: 1212 + } else { + if (var0 >= 2000) { // L: 1215 + var6 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1216 + } else { + var6 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1218 + } + + if (var6.onResize == null) { // L: 1219 + return 0; + } else { + ScriptEvent var7 = new ScriptEvent(); // L: 1220 + var7.widget = var6; // L: 1221 + var7.args = var6.onResize; // L: 1222 + var7.field1154 = Interpreter.field950 + 1; // L: 1223 + Client.scriptEvents.addFirst(var7); // L: 1224 + return 1; // L: 1225 + } + } + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "127" + ) + static final void method707() { + Client.field797 = Client.cycleCntr; // L: 11505 + } // L: 11506 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index b9551bde1a..2b9cccd603 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -2,35 +2,30 @@ import 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("cy") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("em") - @ObfuscatedGetter( - intValue = -1626344665 - ) - @Export("worldPort") - static int worldPort; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("isRunning") boolean isRunning; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("lock") Object lock; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1370756697 + intValue = 1900578569 ) @Export("index") int index; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("xs") int[] xs; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("ys") int[] ys; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("millis") long[] millis; @@ -44,7 +39,7 @@ public class MouseRecorder implements Runnable { } // L: 14 public void run() { - for (; this.isRunning; ApproximateRouteStrategy.sleepExact(50L)) { // L: 17 26 + for (; this.isRunning; GrandExchangeEvent.sleepExact(50L)) { // L: 17 26 synchronized(this.lock) { // L: 18 if (this.index < 500) { // L: 19 this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 @@ -56,4 +51,53 @@ public class MouseRecorder implements Runnable { } } // L: 28 -} \ No newline at end of file + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "([BIIII[Lel;I)V", + garbageValue = "90989095" + ) + static final void method2108(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) { + int var7; + int var8; + for (int var6 = 0; var6 < 4; ++var6) { // L: 63 + for (var7 = 0; var7 < 64; ++var7) { // L: 64 + for (var8 = 0; var8 < 64; ++var8) { // L: 65 + if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 66 + int[] var10000 = var5[var6].flags[var7 + var1]; + var10000[var2 + var8] &= -16777217; + } + } + } + } + + Buffer var10 = new Buffer(var0); // L: 70 + + for (var7 = 0; var7 < 4; ++var7) { // L: 71 + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { // L: 73 + WorldMapData_1.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 74 + } + } + } + + } // L: 78 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1618150631" + ) + public static int method2107() { + return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 72 + } + + @ObfuscatedName("js") + static final void method2109(double var0) { + Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11147 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11148 + Clock.method2610(); // L: 11149 + Login.clientPreferences.field1304 = var0; // L: 11150 + Message.savePreferences(); // L: 11151 + } // L: 11152 +} diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index a2b7d60107..54ac263f4f 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("fo") +@ObfuscatedName("dw") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-7695" + descriptor = "(I)I", + garbageValue = "-1138891860" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index f5ed799f3f..cbedc182d2 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("ad") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 2059879703 + intValue = -1839042189 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; // L: 8 } // L: 10 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1000758187" + garbageValue = "-1557694758" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); // L: 13 } // L: 14 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1520122283" + descriptor = "(Ljava/awt/Component;B)V", + garbageValue = "55" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); // L: 17 } // L: 18 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-7695" + descriptor = "(I)I", + garbageValue = "-1138891860" ) @Export("useRotation") public synchronized int useRotation() { diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 0757e7e73c..831fb03e2a 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -4,44 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hc") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("n") + @ObfuscatedName("eq") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -145246635 + intValue = -2108602457 ) - int field2509; - @ObfuscatedName("v") + int field2532; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Ldm;" + descriptor = "[Lah;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("d") - short[] field2513; - @ObfuscatedName("c") - byte[] field2507; - @ObfuscatedName("y") - byte[] field2510; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "[Lgy;" - ) - MusicPatchNode2[] field2511; - @ObfuscatedName("z") - byte[] field2512; + @ObfuscatedName("u") + short[] field2533; + @ObfuscatedName("p") + byte[] field2534; + @ObfuscatedName("b") + byte[] field2539; @ObfuscatedName("e") - int[] field2506; + @ObfuscatedSignature( + descriptor = "[Lha;" + ) + MusicPatchNode2[] field2536; + @ObfuscatedName("k") + byte[] field2537; + @ObfuscatedName("g") + int[] field2538; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; // L: 21 - this.field2513 = new short[128]; // L: 22 - this.field2507 = new byte[128]; // L: 23 - this.field2510 = new byte[128]; // L: 24 - this.field2511 = new MusicPatchNode2[128]; // L: 25 - this.field2512 = new byte[128]; // L: 26 - this.field2506 = new int[128]; // L: 27 + this.field2533 = new short[128]; // L: 22 + this.field2534 = new byte[128]; // L: 23 + this.field2539 = new byte[128]; // L: 24 + this.field2536 = new MusicPatchNode2[128]; // L: 25 + this.field2537 = new byte[128]; // L: 26 + this.field2538 = new int[128]; // L: 27 Buffer var2 = new Buffer(var1); // L: 28 int var3; @@ -88,51 +91,51 @@ public class MusicPatch extends Node { ++var2.offset; // L: 49 ++var9; // L: 50 - byte[] var37 = new byte[var9]; // L: 51 + byte[] var38 = new byte[var9]; // L: 51 int var12; int var14; if (var9 > 1) { // L: 53 - var37[1] = 1; // L: 54 + var38[1] = 1; // L: 54 int var13 = 1; // L: 55 var12 = 2; // L: 56 for (var14 = 2; var14 < var9; ++var14) { // L: 57 - int var42 = var2.readUnsignedByte(); // L: 58 - if (var42 == 0) { // L: 59 + int var43 = var2.readUnsignedByte(); // L: 58 + if (var43 == 0) { // L: 59 var13 = var12++; } else { - if (var42 <= var13) { // L: 61 - --var42; + if (var43 <= var13) { // L: 61 + --var43; } - var13 = var42; // L: 62 + var13 = var43; // L: 62 } - var37[var14] = (byte)var13; // L: 64 + var38[var14] = (byte)var13; // L: 64 } } else { var12 = var9; // L: 67 } - MusicPatchNode2[] var38 = new MusicPatchNode2[var12]; // L: 68 + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68 MusicPatchNode2 var15; - for (var14 = 0; var14 < var38.length; ++var14) { // L: 69 - var15 = var38[var14] = new MusicPatchNode2(); // L: 70 - int var41 = var2.readUnsignedByte(); // L: 71 - if (var41 > 0) { // L: 72 - var15.field2427 = new byte[var41 * 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.field2470 = new byte[var42 * 2]; } - var41 = var2.readUnsignedByte(); // L: 73 - if (var41 > 0) { // L: 74 - var15.field2423 = new byte[var41 * 2 + 2]; // L: 75 - var15.field2423[1] = 64; // L: 76 + var42 = var2.readUnsignedByte(); // L: 73 + if (var42 > 0) { // L: 74 + var15.field2467 = new byte[var42 * 2 + 2]; // L: 75 + var15.field2467[1] = 64; // L: 76 } } var14 = var2.readUnsignedByte(); // L: 79 - byte[] var43 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 + 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 @@ -154,16 +157,16 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { // L: 90 var19 += var2.readUnsignedByte(); // L: 91 - this.field2513[var20] = (short)var19; // L: 92 + this.field2533[var20] = (short)var19; // L: 92 } var19 = 0; // L: 94 - short[] var49; + short[] var50; for (var20 = 0; var20 < 128; ++var20) { // L: 95 var19 += var2.readUnsignedByte(); // L: 96 - var49 = this.field2513; // L: 97 - var49[var20] = (short)(var49[var20] + (var19 << 8)); + var50 = this.field2533; // L: 97 + var50[var20] = (short)(var50[var20] + (var19 << 8)); } var20 = 0; // L: 99 @@ -182,9 +185,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); // L: 106 } - var49 = this.field2513; // L: 108 - var49[var23] = (short)(var49[var23] + ((var22 - 1 & 2) << 14)); - this.field2506[var23] = var22; // L: 109 + var50 = this.field2533; // L: 108 + var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); + this.field2538[var23] = var22; // L: 109 --var20; // L: 110 } @@ -194,7 +197,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { // L: 115 - if (this.field2506[var24] != 0) { // L: 116 + if (this.field2538[var24] != 0) { // L: 116 if (var20 == 0) { // L: 117 if (var21 < var4.length) { // L: 118 var20 = var4[var21++]; @@ -205,7 +208,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; // L: 120 } - this.field2512[var24] = (byte)var23; // L: 122 + this.field2537[var24] = (byte)var23; // L: 122 --var20; // L: 123 } } @@ -215,7 +218,7 @@ public class MusicPatch extends Node { var24 = 0; // L: 127 for (int var25 = 0; var25 < 128; ++var25) { // L: 128 - if (this.field2506[var25] != 0) { // L: 129 + if (this.field2538[var25] != 0) { // L: 129 if (var20 == 0) { // L: 130 if (var21 < var7.length) { // L: 131 var20 = var7[var21++]; @@ -226,20 +229,20 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field2510[var25] = (byte)var24; // L: 135 + this.field2539[var25] = (byte)var24; // L: 135 --var20; // L: 136 } } var20 = 0; // L: 138 var21 = 0; // L: 139 - MusicPatchNode2 var39 = null; // L: 140 + MusicPatchNode2 var40 = null; // L: 140 int var26; for (var26 = 0; var26 < 128; ++var26) { // L: 141 - if (this.field2506[var26] != 0) { // L: 142 + if (this.field2538[var26] != 0) { // L: 142 if (var20 == 0) { // L: 143 - var39 = var38[var37[var21]]; // L: 144 + var40 = var39[var38[var21]]; // L: 144 if (var21 < var10.length) { // L: 145 var20 = var10[var21++]; } else { @@ -247,7 +250,7 @@ public class MusicPatch extends Node { } } - this.field2511[var26] = var39; // L: 148 + this.field2536[var26] = var40; // L: 148 --var20; // L: 149 } } @@ -265,37 +268,37 @@ public class MusicPatch extends Node { var20 = -1; // L: 157 } - if (this.field2506[var27] > 0) { // L: 158 + if (this.field2538[var27] > 0) { // L: 158 var26 = var2.readUnsignedByte() + 1; } } - this.field2507[var27] = (byte)var26; // L: 160 + this.field2534[var27] = (byte)var26; // L: 160 --var20; // L: 161 } - this.field2509 = var2.readUnsignedByte() + 1; // L: 163 + this.field2532 = var2.readUnsignedByte() + 1; // L: 163 int var29; - MusicPatchNode2 var40; + MusicPatchNode2 var41; for (var27 = 0; var27 < var12; ++var27) { // L: 164 - var40 = var38[var27]; // L: 165 - if (var40.field2427 != null) { // L: 166 - for (var29 = 1; var29 < var40.field2427.length; var29 += 2) { // L: 167 - var40.field2427[var29] = var2.readByte(); + var41 = var39[var27]; // L: 165 + if (var41.field2470 != null) { // L: 166 + for (var29 = 1; var29 < var41.field2470.length; var29 += 2) { // L: 167 + var41.field2470[var29] = var2.readByte(); } } - if (var40.field2423 != null) { // L: 169 - for (var29 = 3; var29 < var40.field2423.length - 2; var29 += 2) { // L: 170 - var40.field2423[var29] = var2.readByte(); + if (var41.field2467 != null) { // L: 169 + for (var29 = 3; var29 < var41.field2467.length - 2; var29 += 2) { // L: 170 + var41.field2467[var29] = var2.readByte(); } } } - if (var43 != null) { // L: 173 - for (var27 = 1; var27 < var43.length; var27 += 2) { // L: 174 - var43[var27] = var2.readByte(); + if (var44 != null) { // L: 173 + for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174 + var44[var27] = var2.readByte(); } } @@ -306,25 +309,25 @@ public class MusicPatch extends Node { } for (var27 = 0; var27 < var12; ++var27) { // L: 179 - var40 = var38[var27]; // L: 180 - if (var40.field2423 != null) { // L: 181 + var41 = var39[var27]; // L: 180 + if (var41.field2467 != null) { // L: 181 var19 = 0; // L: 182 - for (var29 = 2; var29 < var40.field2423.length; var29 += 2) { // L: 183 + for (var29 = 2; var29 < var41.field2467.length; var29 += 2) { // L: 183 var19 = var19 + 1 + var2.readUnsignedByte(); // L: 184 - var40.field2423[var29] = (byte)var19; // L: 185 + var41.field2467[var29] = (byte)var19; // L: 185 } } } for (var27 = 0; var27 < var12; ++var27) { // L: 189 - var40 = var38[var27]; // L: 190 - if (var40.field2427 != null) { // L: 191 + var41 = var39[var27]; // L: 190 + if (var41.field2470 != null) { // L: 191 var19 = 0; // L: 192 - for (var29 = 2; var29 < var40.field2427.length; var29 += 2) { // L: 193 - var19 = 1 + var19 + var2.readUnsignedByte(); // L: 194 - var40.field2427[var29] = (byte)var19; // L: 195 + for (var29 = 2; var29 < var41.field2470.length; var29 += 2) { // L: 193 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 + var41.field2470[var29] = (byte)var19; // L: 195 } } } @@ -334,43 +337,44 @@ public class MusicPatch extends Node { int var33; int var34; int var35; - int var46; - byte var48; - if (var43 != null) { // L: 199 + int var36; + int var47; + byte var49; + if (var44 != null) { // L: 199 var19 = var2.readUnsignedByte(); // L: 200 - var43[0] = (byte)var19; // L: 201 + var44[0] = (byte)var19; // L: 201 - for (var27 = 2; var27 < var43.length; var27 += 2) { // L: 202 + for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202 var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 - var43[var27] = (byte)var19; // L: 204 + var44[var27] = (byte)var19; // L: 204 } - var48 = var43[0]; // L: 206 - byte var28 = var43[1]; // L: 207 + var49 = var44[0]; // L: 206 + byte var28 = var44[1]; // L: 207 - for (var29 = 0; var29 < var48; ++var29) { // L: 208 - this.field2507[var29] = (byte)(var28 * this.field2507[var29] + 32 >> 6); + for (var29 = 0; var29 < var49; ++var29) { // L: 208 + this.field2534[var29] = (byte)(var28 * this.field2534[var29] + 32 >> 6); } - for (var29 = 2; var29 < var43.length; var29 += 2) { // L: 209 210 227 - var30 = var43[var29]; // L: 211 - byte var31 = var43[var29 + 1]; // L: 212 - var32 = var28 * (var30 - var48) + (var30 - var48) / 2; // L: 213 + 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 = var48; var33 < var30; ++var33) { // L: 214 - var35 = var30 - var48; // L: 216 - int var36 = var32 >>> 31; // L: 218 + for (var33 = var49; var33 < var30; ++var33) { // L: 214 + var35 = var30 - var49; // L: 216 + var36 = var32 >>> 31; // L: 218 var34 = (var36 + var32) / var35 - var36; // L: 219 - this.field2507[var33] = (byte)(var34 * this.field2507[var33] + 32 >> 6); // L: 222 + this.field2534[var33] = (byte)(var34 * this.field2534[var33] + 32 >> 6); // L: 222 var32 += var31 - var28; // L: 223 } - var48 = var30; // L: 225 + var49 = var30; // L: 225 var28 = var31; // L: 226 } - for (var46 = var48; var46 < 128; ++var46) { // L: 229 - this.field2507[var46] = (byte)(var28 * this.field2507[var46] + 32 >> 6); + for (var47 = var49; var47 < 128; ++var47) { // L: 229 + this.field2534[var47] = (byte)(var28 * this.field2534[var47] + 32 >> 6); } var15 = null; // L: 230 @@ -381,180 +385,153 @@ public class MusicPatch extends Node { var16[0] = (byte)var19; // L: 234 for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235 - var19 = var19 + 1 + var2.readUnsignedByte(); // L: 236 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 236 var16[var27] = (byte)var19; // L: 237 } - var48 = var16[0]; // L: 239 - int var45 = var16[1] << 1; // L: 240 + var49 = var16[0]; // L: 239 + int var46 = var16[1] << 1; // L: 240 - for (var29 = 0; var29 < var48; ++var29) { // L: 241 - var46 = var45 + (this.field2510[var29] & 255); // L: 242 - if (var46 < 0) { // L: 243 - var46 = 0; - } - - if (var46 > 128) { // L: 244 - var46 = 128; - } - - this.field2510[var29] = (byte)var46; // L: 245 - } - - int var47; - for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 262 - var30 = var16[var29]; // L: 249 - var47 = var16[var29 + 1] << 1; // L: 250 - var32 = var45 * (var30 - var48) + (var30 - var48) / 2; // L: 251 - - for (var33 = var48; var33 < var30; ++var33) { // L: 252 - var34 = MouseHandler.method1176(var32, var30 - var48); // L: 253 - var35 = var34 + (this.field2510[var33] & 255); // L: 254 - if (var35 < 0) { // L: 255 - var35 = 0; - } - - if (var35 > 128) { // L: 256 - var35 = 128; - } - - this.field2510[var33] = (byte)var35; // L: 257 - var32 += var47 - var45; // L: 258 - } - - var48 = var30; // L: 260 - var45 = var47; // L: 261 - } - - for (var46 = var48; var46 < 128; ++var46) { // L: 264 - var47 = var45 + (this.field2510[var46] & 255); // L: 265 - if (var47 < 0) { // L: 266 + for (var29 = 0; var29 < var49; ++var29) { // L: 241 + var47 = var46 + (this.field2539[var29] & 255); // L: 242 + if (var47 < 0) { // L: 243 var47 = 0; } - if (var47 > 128) { // L: 267 + if (var47 > 128) { // L: 244 var47 = 128; } - this.field2510[var46] = (byte)var47; // L: 268 + this.field2539[var29] = (byte)var47; // L: 245 } - Object var44 = null; // L: 270 + 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 = var49; var33 < var30; ++var33) { // L: 252 + var35 = var30 - var49; // L: 254 + var36 = var32 >>> 31; // L: 256 + var34 = (var32 + var36) / var35 - var36; // L: 257 + int var37 = var34 + (this.field2539[var33] & 255); // L: 260 + if (var37 < 0) { // L: 261 + var37 = 0; + } + + if (var37 > 128) { // L: 262 + var37 = 128; + } + + this.field2539[var33] = (byte)var37; // L: 263 + var32 += var48 - var46; // L: 264 + } + + var49 = var30; // L: 266 + var46 = var48; // L: 267 + } + + for (var47 = var49; var47 < 128; ++var47) { // L: 270 + var48 = var46 + (this.field2539[var47] & 255); // L: 271 + if (var48 < 0) { // L: 272 + var48 = 0; + } + + if (var48 > 128) { // L: 273 + var48 = 128; + } + + this.field2539[var47] = (byte)var48; // L: 274 + } + + Object var45 = null; // L: 276 } - for (var27 = 0; var27 < var12; ++var27) { // L: 272 - var38[var27].field2424 = var2.readUnsignedByte(); - } - - for (var27 = 0; var27 < var12; ++var27) { // L: 273 - var40 = var38[var27]; // L: 274 - if (var40.field2427 != null) { // L: 275 - var40.field2425 = var2.readUnsignedByte(); - } - - if (var40.field2423 != null) { // L: 276 - var40.field2426 = var2.readUnsignedByte(); - } - - if (var40.field2424 > 0) { // L: 277 - var40.field2431 = var2.readUnsignedByte(); - } + for (var27 = 0; var27 < var12; ++var27) { // L: 278 + var39[var27].field2469 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { // L: 279 - var38[var27].field2429 = var2.readUnsignedByte(); - } + var41 = var39[var27]; // L: 280 + if (var41.field2470 != null) { // L: 281 + var41.field2475 = var2.readUnsignedByte(); + } - for (var27 = 0; var27 < var12; ++var27) { // L: 280 - var40 = var38[var27]; // L: 281 - if (var40.field2429 > 0) { // L: 282 - var40.field2428 = var2.readUnsignedByte(); + if (var41.field2467 != null) { // L: 282 + var41.field2476 = var2.readUnsignedByte(); + } + + if (var41.field2469 > 0) { // L: 283 + var41.field2472 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { // L: 284 - var40 = var38[var27]; // L: 285 - if (var40.field2428 > 0) { // L: 286 - var40.field2422 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 285 + var39[var27].field2474 = var2.readUnsignedByte(); + } + + for (var27 = 0; var27 < var12; ++var27) { // L: 286 + var41 = var39[var27]; // L: 287 + if (var41.field2474 > 0) { // L: 288 + var41.field2473 = var2.readUnsignedByte(); } } - } // L: 288 + for (var27 = 0; var27 < var12; ++var27) { // L: 290 + var41 = var39[var27]; // L: 291 + if (var41.field2473 > 0) { // L: 292 + var41.field2468 = var2.readUnsignedByte(); + } + } - @ObfuscatedName("n") + } // L: 294 + + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ldy;[B[II)Z", - garbageValue = "2106723997" + descriptor = "(Lbi;[B[II)Z", + garbageValue = "-1205073092" ) - boolean method4086(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; // L: 291 - int var5 = 0; // L: 292 - RawSound var6 = null; // L: 293 + boolean method4111(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) { // L: 294 - if (var2 == null || var2[var7] != 0) { // L: 295 - int var8 = this.field2506[var7]; // L: 296 - if (var8 != 0) { // L: 297 - if (var8 != var5) { // L: 298 - var5 = var8--; // L: 299 300 - if ((var8 & 1) == 0) { // L: 301 + for (int var7 = 0; var7 < 128; ++var7) { // L: 300 + if (var2 == null || var2[var7] != 0) { // L: 301 + int var8 = this.field2538[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); // L: 302 + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308 } - if (var6 == null) { // L: 303 + if (var6 == null) { // L: 309 var4 = false; } } - if (var6 != null) { // L: 305 - this.rawSounds[var7] = var6; // L: 306 - this.field2506[var7] = 0; // L: 307 + if (var6 != null) { // L: 311 + this.rawSounds[var7] = var6; // L: 312 + this.field2538[var7] = 0; // L: 313 } } } } - return var4; // L: 311 + return var4; // L: 317 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "26821632" + garbageValue = "424702467" ) @Export("clear") void clear() { - this.field2506 = null; // L: 315 - } // L: 316 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-9" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; // L: 13 - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lkd;I)V", - garbageValue = "-1581933835" - ) - static final void method4095(PacketBuffer var0) { - for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { // L: 445 - int var2 = Players.Players_pendingUpdateIndices[var1]; // L: 446 - Player var3 = Client.players[var2]; // L: 447 - int var4 = var0.readUnsignedByte(); // L: 448 - if ((var4 & 4) != 0) { // L: 449 - var4 += var0.readUnsignedByte() << 8; - } - - Skills.method4320(var0, var2, var3, var4); // L: 450 - } - - } // L: 452 + this.field2538 = null; // L: 321 + } // L: 322 } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 606d680735..337b93648e 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,133 +4,130 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hj") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("ey") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 550011447 + intValue = 923209033 ) - int field2471; - @ObfuscatedName("v") + int field2554; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lha;" + descriptor = "Lhc;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ldm;" + descriptor = "Lah;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lgy;" + descriptor = "Lha;" ) - MusicPatchNode2 field2473; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 2110028369 - ) - int field2474; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -96343197 - ) - int field2475; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1440668291 - ) - int field2476; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1716873171 - ) - int field2477; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1965253533 - ) - int field2478; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -323457353 - ) - int field2472; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1000773439 - ) - int field2480; + MusicPatchNode2 field2550; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1349292389 + intValue = -645577827 ) - int field2481; - @ObfuscatedName("a") + int field2551; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -720324353 + intValue = -1425204299 ) - int field2491; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1839598813 - ) - int field2483; + int field2547; @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -378867617 + intValue = -1052221875 ) - int field2486; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -449130681 - ) - int field2482; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1114388965 - ) - int field2488; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 1049905099 - ) - int field2487; + int field2553; @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -59060905 + ) + int field2557; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -990038091 + ) + int field2555; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1971126449 + ) + int field2556; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1100690869 + ) + int field2552; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -978602639 + ) + int field2568; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1970474251 + ) + int field2559; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -874480547 + ) + int field2560; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 741885295 + ) + int field2561; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1928199641 + ) + int field2562; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 463873485 + ) + int field2563; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 372649253 + ) + int field2564; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Lbk;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2011885117 + intValue = 987730343 ) - int field2484; - @ObfuscatedName("p") + int field2566; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1908320753 + intValue = -1210964927 ) - int field2479; + int field2567; MusicPatchNode() { } // L: 31 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "71" + descriptor = "(I)V", + garbageValue = "1071892920" ) - void method4032() { + void method4163() { this.patch = null; // L: 34 this.rawSound = null; // L: 35 - this.field2473 = null; // L: 36 + this.field2550 = 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 7dcafc3a69..f2a8b39001 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,53 +1,49 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gy") +@ObfuscatedName("ha") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("gv") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("n") - byte[] field2427; - @ObfuscatedName("v") - byte[] field2423; - @ObfuscatedName("d") + @ObfuscatedName("f") + byte[] field2470; + @ObfuscatedName("o") + byte[] field2467; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -60094231 + intValue = -1877428517 ) - int field2424; - @ObfuscatedName("c") + int field2469; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 296644157 + intValue = -1878715995 ) - int field2425; - @ObfuscatedName("y") + int field2475; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1202436859 + intValue = 1235467717 ) - int field2426; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 458226763 - ) - int field2431; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 205219227 - ) - int field2428; + int field2476; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 584378027 + intValue = 337586923 ) - int field2429; - @ObfuscatedName("q") + int field2472; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -798284831 + intValue = -1393879737 ) - int field2422; + int field2473; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -257585679 + ) + int field2474; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1349826997 + ) + int field2468; MusicPatchNode2() { } // L: 14 diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index ed1e101de8..bcddcd0c66 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,39 +1,40 @@ +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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("he") +@ObfuscatedName("hv") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("s") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -148316237 + intValue = -838217357 ) - static int field2516; - @ObfuscatedName("n") + static int field2544; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgg;" + descriptor = "Lhn;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Ldi;" + descriptor = "Lak;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lgg;)V" + descriptor = "(Lhn;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); // L: 11 @@ -41,646 +42,729 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; // L: 15 } // L: 16 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lhq;[IIIIS)V", - garbageValue = "23507" + descriptor = "(Lhj;[IIIIS)V", + garbageValue = "-24010" ) - void method4102(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2458[var1.field2471] & 4) != 0 && var1.field2486 < 0) { - int var6 = this.superStream.field2468[var1.field2471] / StructComposition.field3338; + void method4127(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2516[var1.field2554] & 4) != 0 && var1.field2561 < 0) { // L: 73 + int var6 = this.superStream.field2490[var1.field2554] / PcmPlayer.field394; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field2479) / var6; - if (var7 > var4) { - var1.field2479 += var6 * var4; + int var7 = (var6 + 1048575 - var1.field2567) / var6; // L: 76 + if (var7 > var4) { // L: 77 + var1.field2567 += var4 * var6; // L: 99 break; } - var1.stream.fill(var2, var3, var7); - var3 += var7; - var4 -= var7; - var1.field2479 += var6 * var7 - 1048576; - int var8 = StructComposition.field3338 / 100; // L: 82 - int var9 = 262144 / var6; - if (var9 < var8) { + var1.stream.fill(var2, var3, var7); // L: 78 + var3 += var7; // L: 79 + var4 -= var7; // L: 80 + var1.field2567 += var6 * var7 - 1048576; // L: 81 + int var8 = PcmPlayer.field394 / 100; // L: 82 + int var9 = 262144 / var6; // L: 83 + if (var9 < var8) { // L: 84 var8 = var9; } - RawPcmStream var10 = var1.stream; - if (this.superStream.field2460[var1.field2471] == 0) { - var1.stream = RawPcmStream.method2845(var1.rawSound, var10.method2728(), var10.method2719(), var10.method2773()); + RawPcmStream var10 = var1.stream; // L: 85 + if (this.superStream.field2503[var1.field2554] == 0) { // L: 86 + var1.stream = RawPcmStream.method898(var1.rawSound, var10.method981(), var10.method904(), var10.method905()); // L: 87 } else { - var1.stream = RawPcmStream.method2845(var1.rawSound, var10.method2728(), 0, var10.method2773()); - this.superStream.method3923(var1, var1.patch.field2513[var1.field2475] < 0); - var1.stream.method2741(var8, var10.method2719()); + var1.stream = RawPcmStream.method898(var1.rawSound, var10.method981(), 0, var10.method905()); // L: 90 + this.superStream.method3933(var1, var1.patch.field2533[var1.field2547] < 0); // L: 91 + var1.stream.method909(var8, var10.method904()); // L: 92 } - if (var1.patch.field2513[var1.field2475] < 0) { + if (var1.patch.field2533[var1.field2547] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method2803(var8); + var10.method920(var8); // L: 95 var10.fill(var2, var3, var5 - var3); // L: 96 - if (var10.method2730()) { + if (var10.method941()) { // L: 97 this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); - } + var1.stream.fill(var2, var3, var4); // L: 101 + } // L: 102 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lhq;II)V", - garbageValue = "-1159313608" + descriptor = "(Lhj;IB)V", + garbageValue = "0" ) - void method4103(MusicPatchNode var1, int var2) { - if ((this.superStream.field2458[var1.field2471] & 4) != 0 && var1.field2486 < 0) { - int var3 = this.superStream.field2468[var1.field2471] / StructComposition.field3338; - int var4 = (var3 + 1048575 - var1.field2479) / var3; - var1.field2479 = var3 * var2 + var1.field2479 & 1048575; // L: 108 + void method4128(MusicPatchNode var1, int var2) { + if ((this.superStream.field2516[var1.field2554] & 4) != 0 && var1.field2561 < 0) { // L: 105 + int var3 = this.superStream.field2490[var1.field2554] / PcmPlayer.field394; // L: 106 + int var4 = (var3 + 1048575 - var1.field2567) / var3; // L: 107 + var1.field2567 = var3 * var2 + var1.field2567 & 1048575; // L: 108 if (var4 <= var2) { // L: 109 - if (this.superStream.field2460[var1.field2471] == 0) { // L: 110 - var1.stream = RawPcmStream.method2845(var1.rawSound, var1.stream.method2728(), var1.stream.method2719(), var1.stream.method2773()); // L: 111 + if (this.superStream.field2503[var1.field2554] == 0) { // L: 110 + var1.stream = RawPcmStream.method898(var1.rawSound, var1.stream.method981(), var1.stream.method904(), var1.stream.method905()); // L: 111 } else { - var1.stream = RawPcmStream.method2845(var1.rawSound, var1.stream.method2728(), 0, var1.stream.method2773()); // L: 114 - this.superStream.method3923(var1, var1.patch.field2513[var1.field2475] < 0); // L: 115 + var1.stream = RawPcmStream.method898(var1.rawSound, var1.stream.method981(), 0, var1.stream.method905()); // L: 114 + this.superStream.method3933(var1, var1.patch.field2533[var1.field2547] < 0); // L: 115 } - if (var1.patch.field2513[var1.field2475] < 0) { // L: 117 + if (var1.patch.field2533[var1.field2547] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field2479 / var3; // L: 118 + var2 = var1.field2567 / var3; // L: 118 } } var1.stream.skip(var2); // L: 121 } // L: 122 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @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("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { MusicPatchNode var1; do { - var1 = (MusicPatchNode)this.queue.previous(); - if (var1 == null) { + var1 = (MusicPatchNode)this.queue.previous(); // L: 27 + if (var1 == null) { // L: 28 return null; } - } while(var1.stream == null); + } while(var1.stream == null); // L: 29 return var1.stream; } - @ObfuscatedName("e") - protected int vmethod4099() { - return 0; + @ObfuscatedName("g") + protected int vmethod4124() { + return 0; // L: 34 } - @ObfuscatedName("q") + @ObfuscatedName("h") @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.method3927(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.method3964(var6)) { // L: 42 + int var4 = var2; // L: 43 + int var5 = var3; // L: 44 do { - if (var5 <= var6.field2484) { - this.method4102(var6, var1, var4, var5, var5 + var4); - var6.field2484 -= var5; + if (var5 <= var6.field2566) { // L: 45 + this.method4127(var6, var1, var4, var5, var5 + var4); // L: 51 + var6.field2566 -= var5; // L: 52 break; } - this.method4102(var6, var1, var4, var6.field2484, var5 + var4); // L: 46 - var4 += var6.field2484; - var5 -= var6.field2484; - } while(!this.superStream.method3953(var6, var1, var4, var5)); + this.method4127(var6, var1, var4, var6.field2566, var5 + var4); // L: 46 + var4 += var6.field2566; // L: 47 + var5 -= var6.field2566; // L: 48 + } while(!this.superStream.method3965(var6, var1, var4, var5)); // L: 49 } } } // L: 54 - @ObfuscatedName("s") + @ObfuscatedName("l") @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.method3927(var3)) { + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 + if (!this.superStream.method3964(var3)) { // L: 60 int var2 = var1; // L: 61 do { - if (var2 <= var3.field2484) { - this.method4103(var3, var2); - var3.field2484 -= var2; // L: 68 + if (var2 <= var3.field2566) { // L: 62 + this.method4128(var3, var2); // L: 67 + var3.field2566 -= var2; // L: 68 break; } - this.method4103(var3, var3.field2484); - var2 -= var3.field2484; - } while(!this.superStream.method3953(var3, (int[])null, 0, var2)); + this.method4128(var3, var3.field2566); // L: 63 + var2 -= var3.field2566; // L: 64 + } while(!this.superStream.method3965(var3, (int[])null, 0, var2)); // L: 65 } } - } + } // L: 70 - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IILgz;Lfe;I)Z", - garbageValue = "604178296" + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "918211470" ) - public static final boolean method4098(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 19 - int var5 = var1; // L: 20 - byte var6 = 64; // L: 21 - byte var7 = 64; // L: 22 - int var8 = var0 - var6; // L: 23 - int var9 = var1 - var7; // L: 24 - class182.directions[var6][var7] = 99; // L: 25 - class182.distances[var6][var7] = 0; // L: 26 - byte var10 = 0; // L: 27 - int var11 = 0; // L: 28 - class182.bufferX[var10] = var0; // L: 29 - byte var10001 = var10; - int var18 = var10 + 1; - class182.bufferY[var10001] = var1; // L: 30 - int[][] var12 = var3.flags; // L: 31 - - while (var18 != var11) { // L: 34 - var4 = class182.bufferX[var11]; // L: 35 - var5 = class182.bufferY[var11]; // L: 36 - var11 = var11 + 1 & 4095; // L: 37 - int var16 = var4 - var8; // L: 38 - int var17 = var5 - var9; // L: 39 - int var13 = var4 - var3.xInset; // L: 40 - int var14 = var5 - var3.yInset; // L: 41 - if (var2.hasArrived(1, var4, var5, var3)) { // L: 42 - class182.field2118 = var4; // L: 43 - class182.field2124 = var5; // L: 44 - return true; // L: 45 - } - - int var15 = class182.distances[var16][var17] + 1; // L: 47 - if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48 - class182.bufferX[var18] = var4 - 1; // L: 49 - class182.bufferY[var18] = var5; // L: 50 - var18 = var18 + 1 & 4095; // L: 51 - class182.directions[var16 - 1][var17] = 2; // L: 52 - class182.distances[var16 - 1][var17] = var15; // L: 53 - } - - if (var16 < 127 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55 - class182.bufferX[var18] = var4 + 1; // L: 56 - class182.bufferY[var18] = var5; // L: 57 - var18 = var18 + 1 & 4095; // L: 58 - class182.directions[var16 + 1][var17] = 8; // L: 59 - class182.distances[var16 + 1][var17] = var15; // L: 60 - } - - if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62 - class182.bufferX[var18] = var4; // L: 63 - class182.bufferY[var18] = var5 - 1; // L: 64 - var18 = var18 + 1 & 4095; // L: 65 - class182.directions[var16][var17 - 1] = 1; // L: 66 - class182.distances[var16][var17 - 1] = var15; // L: 67 - } - - if (var17 < 127 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 69 - class182.bufferX[var18] = var4; // L: 70 - class182.bufferY[var18] = var5 + 1; // L: 71 - var18 = var18 + 1 & 4095; // L: 72 - class182.directions[var16][var17 + 1] = 4; // L: 73 - class182.distances[var16][var17 + 1] = var15; // L: 74 - } - - if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 76 - class182.bufferX[var18] = var4 - 1; // L: 77 - class182.bufferY[var18] = var5 - 1; // L: 78 - var18 = var18 + 1 & 4095; // L: 79 - class182.directions[var16 - 1][var17 - 1] = 3; // L: 80 - class182.distances[var16 - 1][var17 - 1] = var15; // L: 81 - } - - if (var16 < 127 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 83 - class182.bufferX[var18] = var4 + 1; // L: 84 - class182.bufferY[var18] = var5 - 1; // L: 85 - var18 = var18 + 1 & 4095; // L: 86 - class182.directions[var16 + 1][var17 - 1] = 9; // L: 87 - class182.distances[var16 + 1][var17 - 1] = var15; // L: 88 - } - - if (var16 > 0 && var17 < 127 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 90 - class182.bufferX[var18] = var4 - 1; // L: 91 - class182.bufferY[var18] = var5 + 1; // L: 92 - var18 = var18 + 1 & 4095; // L: 93 - class182.directions[var16 - 1][var17 + 1] = 6; // L: 94 - class182.distances[var16 - 1][var17 + 1] = var15; // L: 95 - } - - if (var16 < 127 && var17 < 127 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 97 - class182.bufferX[var18] = var4 + 1; // L: 98 - class182.bufferY[var18] = var5 + 1; // L: 99 - var18 = var18 + 1 & 4095; // L: 100 - class182.directions[var16 + 1][var17 + 1] = 12; // L: 101 - class182.distances[var16 + 1][var17 + 1] = var15; // L: 102 - } - } - - class182.field2118 = var4; // L: 105 - class182.field2124 = var5; // L: 106 - return false; // L: 107 - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1484291347" - ) - static int method4118(int var0, Script var1, boolean var2) { - String var7; - if (var0 == ScriptOpcodes.MES) { // L: 1328 - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1329 - AbstractWorldMapData.addGameMessage(0, "", var7); // L: 1330 - return 1; // L: 1331 - } else if (var0 == ScriptOpcodes.ANIM) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1334 - UserComparator7.performPlayerAnimation(UserComparator9.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1335 - return 1; // L: 1336 - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1122) { // L: 1339 - Interpreter.field1120 = true; // L: 1340 - } - - return 1; // L: 1342 + static boolean method4150(String var0) { + if (var0 == null) { // L: 173 + return false; } else { - int var16; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1345 - var16 = 0; // L: 1346 - if (WorldMapDecoration.isNumber(var7)) { // L: 1347 - var16 = class217.parseInt(var7); + try { + new URL(var0); + return true; // L: 180 + } catch (MalformedURLException var2) { // L: 177 + return false; // L: 178 + } + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "551121602" + ) + public static void method4123() { + NPCComposition.NpcDefinition_cached.clear(); // L: 274 + NPCComposition.NpcDefinition_cachedModels.clear(); // L: 275 + } // L: 276 + + @ObfuscatedName("fs") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1879723646" + ) + static final void method4122() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3179 + var0 = Varcs.localPlayer.x; // L: 3180 + var1 = Varcs.localPlayer.y; // L: 3181 + if (class6.oculusOrbFocalPointX - var0 < -500 || class6.oculusOrbFocalPointX - var0 > 500 || Players.oculusOrbFocalPointY - var1 < -500 || Players.oculusOrbFocalPointY - var1 > 500) { // L: 3182 + class6.oculusOrbFocalPointX = var0; // L: 3183 + Players.oculusOrbFocalPointY = var1; // L: 3184 + } + + if (var0 != class6.oculusOrbFocalPointX) { // L: 3186 + class6.oculusOrbFocalPointX += (var0 - class6.oculusOrbFocalPointX) / 16; + } + + if (var1 != Players.oculusOrbFocalPointY) { // L: 3187 + Players.oculusOrbFocalPointY += (var1 - Players.oculusOrbFocalPointY) / 16; + } + + var2 = class6.oculusOrbFocalPointX >> 7; // L: 3188 + var3 = Players.oculusOrbFocalPointY >> 7; // L: 3189 + var4 = UserComparator7.getTileHeight(class6.oculusOrbFocalPointX, Players.oculusOrbFocalPointY, class26.Client_plane); // L: 3190 + var5 = 0; // L: 3191 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3192 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3193 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3194 + int var8 = class26.Client_plane; // L: 3195 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3196 + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3197 + if (var9 > var5) { // L: 3198 + var5 = var9; + } + } + } + } + + var6 = var5 * 192; // L: 3202 + if (var6 > 98048) { // L: 3203 + var6 = 98048; + } + + if (var6 < 32768) { // L: 3204 + var6 = 32768; + } + + if (var6 > Client.field735) { // L: 3205 + Client.field735 += (var6 - Client.field735) / 24; + } else if (var6 < Client.field735) { // L: 3206 + Client.field735 += (var6 - Client.field735) / 80; + } + + VarbitComposition.field3544 = UserComparator7.getTileHeight(Varcs.localPlayer.x, Varcs.localPlayer.y, class26.Client_plane) - Client.camFollowHeight; // L: 3207 + } else if (Client.oculusOrbState == 1) { // L: 3209 + method4149(); // L: 3210 + short var10 = -1; // L: 3211 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3212 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3213 + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3214 + if (var10 == 0) { // L: 3215 + var10 = 1792; + } else if (var10 == 1024) { // L: 3216 + var10 = 1280; + } else { + var10 = 1536; // L: 3217 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3219 + if (var10 == 0) { // L: 3220 + var10 = 256; + } else if (var10 == 1024) { // L: 3221 + var10 = 768; + } else { + var10 = 512; // L: 3222 + } + } + + byte var11 = 0; // L: 3224 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3225 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3226 + var11 = 1; + } + + var2 = 0; // L: 3227 + if (var10 >= 0 || var11 != 0) { // L: 3228 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -894225967 * -1126512847 : Client.oculusOrbNormalSpeed * 1800151859 * -1466920965; // L: 3229 + var2 *= 16; // L: 3230 + Client.field702 = var10; // L: 3231 + Client.field681 = var11; // L: 3232 + } + + if (Client.field679 < var2) { // L: 3234 + Client.field679 += var2 / 8; // L: 3235 + if (Client.field679 > var2) { // L: 3236 + Client.field679 = var2; + } + } else if (Client.field679 > var2) { // L: 3238 + Client.field679 = Client.field679 * 9 / 10; + } + + if (Client.field679 > 0) { // L: 3239 + var3 = Client.field679 / 16; // L: 3240 + if (Client.field702 >= 0) { // L: 3241 + var0 = Client.field702 - class69.cameraYaw & 2047; // L: 3242 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3243 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3244 + class6.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3245 + Players.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3246 } - PacketBufferNode var14 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); // L: 1349 - var14.packetBuffer.writeInt(var16); // L: 1350 - Client.packetWriter.addNode(var14); // L: 1351 - return 1; // L: 1352 + if (Client.field681 != 0) { // L: 3248 + VarbitComposition.field3544 += var3 * Client.field681; // L: 3249 + if (VarbitComposition.field3544 > 0) { // L: 3250 + VarbitComposition.field3544 = 0; + } + } } else { - PacketBufferNode var12; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1355 - var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); // L: 1357 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1358 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1359 - Client.packetWriter.addNode(var12); // L: 1360 - return 1; // L: 1361 - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1364 - var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher); // L: 1366 - var12.packetBuffer.writeByte(var7.length() + 1); // L: 1367 - var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1368 - Client.packetWriter.addNode(var12); // L: 1369 - return 1; // L: 1370 + Client.field702 = -1; // L: 3254 + Client.field681 = -1; // L: 3255 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3257 + Client.packetWriter.addNode(ObjectComposition.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher)); // L: 3259 + Client.oculusOrbState = 0; // L: 3260 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && MouseHandler.mouseCam) { // L: 3264 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3265 + Client.camAngleDX = var0 * 2; // L: 3266 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * 964260245 * 1997230525; // L: 3267 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3268 + Client.camAngleDY = var1 * 2; // L: 3269 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * 77229373 * -1775381995; // L: 3270 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3273 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3274 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 3275 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3276 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3277 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 3278 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3279 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3280 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3282 + Client.camAngleX += Client.camAngleDX / 2; // L: 3283 + if (Client.camAngleX < 128) { // L: 3284 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 3285 + Client.camAngleX = 383; + } + + } // L: 3286 + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(Lgl;I)V", + garbageValue = "-1679293239" + ) + static final void method4148(class203 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6504 + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + if (class203.field2328 == var0) { // L: 6505 + var2 = var1.method6623(); // L: 6506 + var3 = var1.readUnsignedShort(); // L: 6507 + var4 = var1.method6609(); // L: 6508 + var5 = (var4 >> 4 & 7) + class18.field145; // L: 6509 + var6 = (var4 & 7) + ClanChat.field3818; // L: 6510 + var7 = var1.method6623(); // L: 6511 + var8 = var7 >> 4 & 15; // L: 6512 + var9 = var7 & 7; // L: 6513 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 6514 + var10 = var8 + 1; // L: 6515 + if (Varcs.localPlayer.pathX[0] >= var5 - var10 && Varcs.localPlayer.pathX[0] <= var5 + var10 && Varcs.localPlayer.pathY[0] >= var6 - var10 && Varcs.localPlayer.pathY[0] <= var10 + var6 && Login.clientPreferences.areaSoundEffectsVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { // L: 6516 6517 + Client.soundEffectIds[Client.soundEffectCount] = var3; // L: 6518 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; // L: 6519 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 6520 + Client.soundEffects[Client.soundEffectCount] = null; // L: 6521 + Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16); // L: 6522 + ++Client.soundEffectCount; // L: 6523 + } + } + } + + if (class203.field2335 == var0) { // L: 6528 + var2 = var1.method6623(); // L: 6529 + var3 = var2 >> 2; // L: 6530 + var4 = var2 & 3; // L: 6531 + var5 = Client.field663[var3]; // L: 6532 + var6 = var1.method6609(); // L: 6533 + var7 = (var6 >> 4 & 7) + class18.field145; // L: 6534 + var8 = (var6 & 7) + ClanChat.field3818; // L: 6535 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6536 + class16.updatePendingSpawn(class26.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 6537 + } + + } else { + int var40; + if (class203.field2329 == var0) { // L: 6541 + var2 = var1.method6617(); // L: 6542 + var3 = var1.readUnsignedByte(); // L: 6543 + var4 = var3 >> 2; // L: 6544 + var5 = var3 & 3; // L: 6545 + var6 = Client.field663[var4]; // L: 6546 + var7 = var1.method6609(); // L: 6547 + var8 = (var7 >> 4 & 7) + class18.field145; // L: 6548 + var9 = (var7 & 7) + ClanChat.field3818; // L: 6549 + if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 6550 + if (var6 == 0) { // L: 6551 + BoundaryObject var36 = WorldMapArea.scene.method3457(class26.Client_plane, var8, var9); // L: 6552 + if (var36 != null) { // L: 6553 + var40 = WorldMapSection1.Entity_unpackID(var36.tag); // L: 6554 + if (var4 == 2) { // L: 6555 + var36.renderable1 = new DynamicObject(var40, 2, var5 + 4, class26.Client_plane, var8, var9, var2, false, var36.renderable1); // L: 6556 + var36.renderable2 = new DynamicObject(var40, 2, var5 + 1 & 3, class26.Client_plane, var8, var9, var2, false, var36.renderable2); // L: 6557 + } else { + var36.renderable1 = new DynamicObject(var40, var4, var5, class26.Client_plane, var8, var9, var2, false, var36.renderable1); // L: 6559 + } + } + } + + if (var6 == 1) { // L: 6562 + WallDecoration var44 = WorldMapArea.scene.method3458(class26.Client_plane, var8, var9); // L: 6563 + if (var44 != null) { // L: 6564 + var40 = WorldMapSection1.Entity_unpackID(var44.tag); // L: 6565 + if (var4 != 4 && var4 != 5) { // L: 6566 + if (var4 == 6) { // L: 6567 + var44.renderable1 = new DynamicObject(var40, 4, var5 + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable1); + } else if (var4 == 7) { // L: 6568 + var44.renderable1 = new DynamicObject(var40, 4, (var5 + 2 & 3) + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable1); + } else if (var4 == 8) { // L: 6569 + var44.renderable1 = new DynamicObject(var40, 4, var5 + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable1); // L: 6570 + var44.renderable2 = new DynamicObject(var40, 4, (var5 + 2 & 3) + 4, class26.Client_plane, var8, var9, var2, false, var44.renderable2); // L: 6571 + } + } else { + var44.renderable1 = new DynamicObject(var40, 4, var5, class26.Client_plane, var8, var9, var2, false, var44.renderable1); + } + } + } + + if (var6 == 2) { // L: 6575 + GameObject var45 = WorldMapArea.scene.method3459(class26.Client_plane, var8, var9); // L: 6576 + if (var4 == 11) { // L: 6577 + var4 = 10; + } + + if (var45 != null) { // L: 6578 + var45.renderable = new DynamicObject(WorldMapSection1.Entity_unpackID(var45.tag), var4, var5, class26.Client_plane, var8, var9, var2, false, var45.renderable); + } + } + + if (var6 == 3) { // L: 6580 + FloorDecoration var46 = WorldMapArea.scene.getFloorDecoration(class26.Client_plane, var8, var9); // L: 6581 + if (var46 != null) { // L: 6582 + var46.renderable = new DynamicObject(WorldMapSection1.Entity_unpackID(var46.tag), 22, var5, class26.Client_plane, var8, var9, var2, false, var46.renderable); + } + } + } + + } else { + int var13; + int var14; + if (class203.field2332 == var0) { // L: 6587 + var2 = var1.method6617(); // L: 6588 + var3 = var1.readUnsignedShort(); // L: 6589 + byte var37 = var1.method6678(); // L: 6590 + var5 = var1.method6617(); // L: 6591 + var6 = var1.readUnsignedByte(); // L: 6592 + var7 = var1.readUnsignedByte(); // L: 6593 + var8 = var1.readUnsignedByte() * 4; // L: 6594 + var9 = var1.method6621(); // L: 6595 + var10 = var1.method6609(); // L: 6596 + var40 = (var10 >> 4 & 7) + class18.field145; // L: 6597 + int var41 = (var10 & 7) + ClanChat.field3818; // L: 6598 + byte var42 = var1.method6612(); // L: 6599 + var14 = var1.method6610() * 4; // L: 6600 + var4 = var37 + var40; // L: 6601 + var13 = var42 + var41; // L: 6602 + if (var40 >= 0 && var41 >= 0 && var40 < 104 && var41 < 104 && var4 >= 0 && var13 >= 0 && var4 < 104 && var13 < 104 && var5 != 65535) { // L: 6603 + var40 = var40 * 128 + 64; // L: 6604 + var41 = var41 * 128 + 64; // L: 6605 + var4 = var4 * 128 + 64; // L: 6606 + var13 = var13 * 128 + 64; // L: 6607 + Projectile var35 = new Projectile(var5, class26.Client_plane, var40, var41, UserComparator7.getTileHeight(var40, var41, class26.Client_plane) - var14, var3 + Client.cycle, var2 + Client.cycle, var6, var7, var9, var8); // L: 6608 + var35.setDestination(var4, var13, UserComparator7.getTileHeight(var4, var13, class26.Client_plane) - var8, var3 + Client.cycle); // L: 6609 + Client.projectiles.addFirst(var35); // L: 6610 + } + } else { - String var4; - int var10; - if (var0 == ScriptOpcodes.OPPLAYER) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1373 - var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1374 - class7.method83(var10, var4); // L: 1375 - return 1; // L: 1376 - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 3; // L: 1379 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1380 - var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1381 - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1382 - Widget var15 = class237.getWidget(var9); // L: 1383 - FriendSystem.clickWidget(var15, var10, var16); // L: 1384 - return 1; // L: 1385 - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1388 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1389 - var16 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1390 - Widget var13 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1391 - FriendSystem.clickWidget(var13, var10, var16); // L: 1392 - return 1; // L: 1393 - } else if (var0 == ScriptOpcodes.MOUSECAM) { - class8.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1396 - return 1; // L: 1397 - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.clientPreferences.roofsHidden ? 1 : 0; // L: 1400 - return 1; // L: 1401 - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - WorldMapSectionType.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1404 - class23.savePreferences(); // L: 1405 - return 1; // L: 1406 - } else if (var0 == ScriptOpcodes.OPENURL) { - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1409 - boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1410 - WorldMapRectangle.openURL(var7, var8, false); // L: 1411 - return 1; // L: 1412 - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1415 - var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2331, Client.packetWriter.isaacCipher); // L: 1417 - var12.packetBuffer.writeShort(var10); // L: 1418 - Client.packetWriter.addNode(var12); // L: 1419 - return 1; // L: 1420 - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1423 - Interpreter.Interpreter_stringStackSize -= 2; // L: 1424 - var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 1425 - String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 1426 - if (var4.length() > 500) { // L: 1427 - return 1; - } else if (var5.length() > 500) { // L: 1428 - return 1; - } else { - PacketBufferNode var6 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2319, Client.packetWriter.isaacCipher); // L: 1429 - var6.packetBuffer.writeShort(1 + WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var4) + WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var5)); // L: 1430 - var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1431 - var6.packetBuffer.method5778(var10); // L: 1432 - var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1433 - Client.packetWriter.addNode(var6); // L: 1434 - return 1; // L: 1435 - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1438 - return 1; // L: 1439 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1442 - return 1; // L: 1443 - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1446 - return 1; // L: 1447 - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1450 - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; // L: 1451 + TileItem var31; + if (class203.field2331 == var0) { // L: 6614 + var2 = var1.method6610(); // L: 6615 + var3 = (var2 >> 4 & 7) + class18.field145; // L: 6616 + var4 = (var2 & 7) + ClanChat.field3818; // L: 6617 + var5 = var1.readUnsignedShort(); // L: 6618 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6619 + NodeDeque var34 = Client.groundItems[class26.Client_plane][var3][var4]; // L: 6620 + if (var34 != null) { // L: 6621 + for (var31 = (TileItem)var34.last(); var31 != null; var31 = (TileItem)var34.previous()) { // L: 6622 6623 6628 + if ((var5 & 32767) == var31.id) { // L: 6624 + var31.remove(); // L: 6625 + break; + } + } + + if (var34.last() == null) { // L: 6630 + Client.groundItems[class26.Client_plane][var3][var4] = null; + } + + class225.updateItemPile(var3, var4); // L: 6631 + } } - return 1; // L: 1452 - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1455 - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; // L: 1456 + } else if (class203.field2339 == var0) { // L: 6636 + var2 = var1.readUnsignedByte(); // L: 6637 + var3 = var1.method6748(); // L: 6638 + var4 = var1.readUnsignedShort(); // L: 6639 + var5 = var1.method6623(); // L: 6640 + var6 = (var5 >> 4 & 7) + class18.field145; // L: 6641 + var7 = (var5 & 7) + ClanChat.field3818; // L: 6642 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6643 + var6 = var6 * 128 + 64; // L: 6644 + var7 = var7 * 128 + 64; // L: 6645 + GraphicsObject var43 = new GraphicsObject(var3, class26.Client_plane, var6, var7, UserComparator7.getTileHeight(var6, var7, class26.Client_plane) - var2, var4, Client.cycle); // L: 6646 + Client.graphicsObjects.addFirst(var43); // L: 6647 } - return 1; // L: 1457 - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1460 - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; // L: 1461 + } else if (class203.field2333 == var0) { // L: 6651 + var2 = var1.readUnsignedShort(); // L: 6652 + var3 = var1.readUnsignedShort(); // L: 6653 + var4 = var1.method6617(); // L: 6654 + var5 = var1.readUnsignedByte(); // L: 6655 + var6 = (var5 >> 4 & 7) + class18.field145; // L: 6656 + var7 = (var5 & 7) + ClanChat.field3818; // L: 6657 + if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6658 + NodeDeque var32 = Client.groundItems[class26.Client_plane][var6][var7]; // L: 6659 + if (var32 != null) { // L: 6660 + for (TileItem var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) { // L: 6661 6662 6667 + if ((var2 & 32767) == var33.id && var4 == var33.quantity) { // L: 6663 + var33.quantity = var3; // L: 6664 + break; + } + } + + class225.updateItemPile(var6, var7); // L: 6669 + } } - return 1; // L: 1462 - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1465 - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; // L: 1466 + } else if (class203.field2334 == var0) { // L: 6674 + var2 = var1.readUnsignedShort(); // L: 6675 + var3 = var1.method6610(); // L: 6676 + var4 = (var3 >> 4 & 7) + class18.field145; // L: 6677 + var5 = (var3 & 7) + ClanChat.field3818; // L: 6678 + var6 = var1.readUnsignedShort(); // L: 6679 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6680 + var31 = new TileItem(); // L: 6681 + var31.id = var6; // L: 6682 + var31.quantity = var2; // L: 6683 + if (Client.groundItems[class26.Client_plane][var4][var5] == null) { // L: 6684 + Client.groundItems[class26.Client_plane][var4][var5] = new NodeDeque(); + } + + Client.groundItems[class26.Client_plane][var4][var5].addFirst(var31); // L: 6685 + class225.updateItemPile(var4, var5); // L: 6686 } - return 1; // L: 1467 - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; // L: 1470 - return 1; // L: 1471 - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1474 - return 1; // L: 1475 - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1478 - return 1; // L: 1479 - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - Tiles.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1482 - return 1; // L: 1483 - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapArea.getTapToDrop() ? 1 : 0; // L: 1486 - return 1; // L: 1487 - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1490 - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1491 - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1492 - return 1; // L: 1493 - } else if (var0 == 3130) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1496 - return 1; // L: 1497 - } else if (var0 == 3131) { - --Interpreter.Interpreter_intStackSize; // L: 1500 - return 1; // L: 1501 - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.canvasWidth; // L: 1504 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class25.canvasHeight; // L: 1505 - return 1; // L: 1506 - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --Interpreter.Interpreter_intStackSize; // L: 1509 - return 1; // L: 1510 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; // L: 1513 - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1516 - return 1; // L: 1517 - } else if (var0 == 3136) { - Client.field705 = 3; // L: 1520 - Client.field699 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1521 - return 1; // L: 1522 - } else if (var0 == 3137) { - Client.field705 = 2; // L: 1525 - Client.field699 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1526 - return 1; // L: 1527 - } else if (var0 == 3138) { - Client.field705 = 0; // L: 1530 - return 1; // L: 1531 - } else if (var0 == 3139) { - Client.field705 = 1; // L: 1534 - return 1; // L: 1535 - } else if (var0 == 3140) { - Client.field705 = 3; // L: 1538 - Client.field699 = var2 ? class277.scriptDotWidget.id * 584503877 * -1745850227 : Interpreter.scriptActiveWidget.id * 584503877 * -1745850227; // L: 1539 - return 1; // L: 1540 } else { - boolean var11; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1543 - WorldMapSectionType.clientPreferences.hideUsername = var11; // L: 1544 - class23.savePreferences(); // L: 1545 - return 1; // L: 1546 - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.clientPreferences.hideUsername ? 1 : 0; // L: 1549 - return 1; // L: 1550 - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1553 - Client.Login_isUsernameRemembered = var11; // L: 1554 - if (!var11) { // L: 1555 - WorldMapSectionType.clientPreferences.rememberedUsername = ""; // L: 1556 - class23.savePreferences(); // L: 1557 + if (class203.field2327 == var0) { // L: 6690 + var2 = var1.method6610(); // L: 6691 + var3 = var2 >> 2; // L: 6692 + var4 = var2 & 3; // L: 6693 + var5 = Client.field663[var3]; // L: 6694 + var6 = var1.readUnsignedShort(); // L: 6695 + var7 = var1.method6766(); // L: 6696 + byte var38 = var1.readByte(); // L: 6697 + var9 = var1.method6748(); // L: 6698 + byte var39 = var1.method6612(); // L: 6699 + byte var11 = var1.method6678(); // L: 6700 + byte var12 = var1.method6678(); // L: 6701 + var13 = var1.readUnsignedByte(); // L: 6702 + var14 = (var13 >> 4 & 7) + class18.field145; // L: 6703 + int var15 = (var13 & 7) + ClanChat.field3818; // L: 6704 + int var16 = var1.readUnsignedShort(); // L: 6705 + Player var17; + if (var7 == Client.localPlayerIndex) { // L: 6707 + var17 = Varcs.localPlayer; + } else { + var17 = Client.players[var7]; // L: 6708 } - return 1; // L: 1559 - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1562 - return 1; // L: 1563 - } else if (var0 == 3145) { - return 1; // L: 1566 - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1569 - if (var11 == WorldMapSectionType.clientPreferences.titleMusicDisabled) { // L: 1570 - WorldMapSectionType.clientPreferences.titleMusicDisabled = !var11; // L: 1571 - class23.savePreferences(); // L: 1572 + if (var17 != null) { // L: 6709 + ObjectComposition var18 = class19.getObjectDefinition(var16); // L: 6710 + int var19; + int var20; + if (var4 != 1 && var4 != 3) { // L: 6713 + var19 = var18.sizeX; // L: 6718 + var20 = var18.sizeY; // L: 6719 + } else { + var19 = var18.sizeY; // L: 6714 + var20 = var18.sizeX; // L: 6715 + } + + int var21 = var14 + (var19 >> 1); // L: 6721 + int var22 = var14 + (var19 + 1 >> 1); // L: 6722 + int var23 = var15 + (var20 >> 1); // L: 6723 + int var24 = var15 + (var20 + 1 >> 1); // L: 6724 + int[][] var25 = Tiles.Tiles_heights[class26.Client_plane]; // L: 6725 + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var22][var23] + var25[var21][var23] >> 2; // L: 6726 + int var27 = (var14 << 7) + (var19 << 6); // L: 6727 + int var28 = (var15 << 7) + (var20 << 6); // L: 6728 + Model var29 = var18.getModel(var3, var4, var25, var27, var26, var28); // L: 6729 + if (var29 != null) { // L: 6730 + class16.updatePendingSpawn(class26.Client_plane, var14, var15, var5, -1, 0, 0, var6 + 1, var9 + 1); // L: 6731 + var17.animationCycleStart = var6 + Client.cycle; // L: 6732 + var17.animationCycleEnd = var9 + Client.cycle; // L: 6733 + var17.model0 = var29; // L: 6734 + var17.field1175 = var19 * 64 + var14 * 128; // L: 6735 + var17.field1177 = var20 * 64 + var15 * 128; // L: 6736 + var17.tileHeight2 = var26; // L: 6737 + byte var30; + if (var38 > var39) { // L: 6738 + var30 = var38; // L: 6739 + var38 = var39; // L: 6740 + var39 = var30; // L: 6741 + } + + if (var12 > var11) { // L: 6743 + var30 = var12; // L: 6744 + var12 = var11; // L: 6745 + var11 = var30; // L: 6746 + } + + var17.minX = var38 + var14; // L: 6748 + var17.maxX = var14 + var39; // L: 6749 + var17.minY = var12 + var15; // L: 6750 + var17.maxY = var15 + var11; // L: 6751 + } + } + } + + if (class203.field2330 == var0) { // L: 6755 + var2 = var1.method6609(); // L: 6756 + var3 = var2 >> 2; // L: 6757 + var4 = var2 & 3; // L: 6758 + var5 = Client.field663[var3]; // L: 6759 + var6 = var1.method6766(); // L: 6760 + var7 = var1.readUnsignedByte(); // L: 6761 + var8 = (var7 >> 4 & 7) + class18.field145; // L: 6762 + var9 = (var7 & 7) + ClanChat.field3818; // L: 6763 + if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 6764 + class16.updatePendingSpawn(class26.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1); // L: 6765 } - return 1; // L: 1574 - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1577 - return 1; // L: 1578 - } else if (var0 == 3148) { - return 1; // L: 1581 - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1584 - return 1; // L: 1585 - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1588 - return 1; // L: 1589 - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1592 - return 1; // L: 1593 - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1596 - return 1; // L: 1597 - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1600 - return 1; // L: 1601 - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ViewportMouse.method3161(); // L: 1604 - return 1; // L: 1605 - } else if (var0 == 3155) { - --Interpreter.Interpreter_stringStackSize; // L: 1608 - return 1; // L: 1609 - } else if (var0 == 3156) { - return 1; // L: 1612 - } else if (var0 == 3157) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1615 - return 1; // L: 1616 - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1619 - return 1; // L: 1620 - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1623 - return 1; // L: 1624 - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1627 - return 1; // L: 1628 - } else if (var0 == 3161) { - --Interpreter.Interpreter_intStackSize; // L: 1631 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1632 - return 1; // L: 1633 - } else if (var0 == 3162) { - --Interpreter.Interpreter_intStackSize; // L: 1636 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1637 - return 1; // L: 1638 - } else if (var0 == 3163) { - --Interpreter.Interpreter_stringStackSize; // L: 1641 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1642 - return 1; // L: 1643 - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; // L: 1646 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1647 - return 1; // L: 1648 - } else if (var0 == 3165) { - --Interpreter.Interpreter_intStackSize; // L: 1651 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1652 - return 1; // L: 1653 - } else if (var0 == 3166) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1656 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1657 - return 1; // L: 1658 - } else if (var0 == 3167) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1661 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1662 - return 1; // L: 1663 - } else if (var0 == 3168) { - Interpreter.Interpreter_intStackSize -= 2; // L: 1666 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1667 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1668 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1669 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1670 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1671 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1672 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1673 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1674 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1675 - return 1; // L: 1676 - } else if (var0 == 3169) { - return 1; // L: 1679 - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1682 - return 1; // L: 1683 - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1686 - return 1; // L: 1687 - } else if (var0 == 3172) { - --Interpreter.Interpreter_intStackSize; // L: 1690 - return 1; // L: 1691 - } else if (var0 == 3173) { - --Interpreter.Interpreter_intStackSize; // L: 1694 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1695 - return 1; // L: 1696 - } else if (var0 == 3174) { - --Interpreter.Interpreter_intStackSize; // L: 1699 - return 1; // L: 1700 - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1703 - return 1; // L: 1704 - } else if (var0 == 3176) { - return 1; // L: 1707 - } else if (var0 == 3177) { - return 1; // L: 1710 - } else if (var0 == 3178) { - --Interpreter.Interpreter_stringStackSize; // L: 1713 - return 1; // L: 1714 - } else if (var0 == 3179) { - return 1; // L: 1717 - } else if (var0 == 3180) { - --Interpreter.Interpreter_stringStackSize; // L: 1720 - return 1; // L: 1721 - } else if (var0 == 3181) { - var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize], 0), 100); // L: 1724 - Decimator.method2707((double)(0.5F + (float)var10 / 200.0F)); // L: 1725 - return 1; // L: 1726 - } else if (var0 == 3182) { - float var3 = 200.0F * ((float)WorldMapSectionType.clientPreferences.field1072 - 0.5F); // L: 1729 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1730 - return 1; // L: 1731 - } else { - return 2; // L: 1733 } } } } } - } + } // L: 6539 6585 6612 6634 6649 6672 6688 6767 6769 + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1958659772" + ) + static final void method4126(int var0) { + var0 = Math.min(Math.max(var0, 0), 127); // L: 11181 + Login.clientPreferences.areaSoundEffectsVolume = var0; // L: 11182 + Message.savePreferences(); // L: 11183 + } // L: 11184 + + @ObfuscatedName("lu") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-2" + ) + static void method4149() { + if (Client.field685 && Varcs.localPlayer != null) { // L: 11706 + int var0 = Varcs.localPlayer.pathX[0]; // L: 11707 + int var1 = Varcs.localPlayer.pathY[0]; // L: 11708 + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11709 + return; + } + + class6.oculusOrbFocalPointX = Varcs.localPlayer.x; // L: 11710 + int var2 = UserComparator7.getTileHeight(Varcs.localPlayer.x, Varcs.localPlayer.y, class26.Client_plane) - Client.camFollowHeight; // L: 11711 + if (var2 < VarbitComposition.field3544) { // L: 11712 + VarbitComposition.field3544 = var2; + } + + Players.oculusOrbFocalPointY = Varcs.localPlayer.y; // L: 11713 + Client.field685 = false; // L: 11714 + } + + } // L: 11716 } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index bbca9b6551..f69bb17ede 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("ho") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; // L: 22 @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } // L: 271 - @ObfuscatedName("v") - void method4125() { + @ObfuscatedName("o") + void method4154() { if (this.table == null) { // L: 274 this.table = new NodeHashTable(16); // L: 275 int[] var1 = new int[16]; // L: 276 @@ -416,15 +416,15 @@ public class MusicTrack extends Node { } } // L: 331 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("clear") void clear() { this.table = null; // L: 334 } // L: 335 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;II)Lhr;" + descriptor = "(Lir;II)Lho;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 66eafd0daa..62f04de2bc 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,21 +1,17 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("do") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("si") - @ObfuscatedGetter( - intValue = -1643634883 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("n") + @ObfuscatedName("gp") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Lkc;" ) @Export("definition") NPCComposition definition; @@ -23,12 +19,12 @@ public final class NPC extends Actor { NPC() { } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IBB)V", - garbageValue = "1" + descriptor = "(IBI)V", + garbageValue = "82987501" ) - final void method2178(int var1, byte var2) { + final void method2235(int var1, byte var2) { int var3 = super.pathX[0]; // L: 15 int var4 = super.pathY[0]; // L: 16 if (var1 == 0) { // L: 17 @@ -67,7 +63,7 @@ public final class NPC extends Actor { --var4; // L: 35 } - if (super.sequence != -1 && InterfaceParent.SequenceDefinition_get(super.sequence).field3565 == 1) { // L: 37 + if (super.sequence != -1 && class225.SequenceDefinition_get(super.sequence).field3723 == 1) { // L: 37 super.sequence = -1; } @@ -76,7 +72,7 @@ public final class NPC extends Actor { } for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 - super.pathX[var5] = super.pathX[var5 - 1]; + 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 } @@ -86,13 +82,49 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; // L: 46 } // L: 47 - @ObfuscatedName("v") + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lgv;", + garbageValue = "1835906978" + ) + @Export("getModel") + protected final Model getModel() { + if (this.definition == null) { // L: 77 + return null; + } else { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class225.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : class225.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(); // L: 82 + super.defaultHeight = var3.height; // L: 83 + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 + Model var4 = Varps.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + if (var4 != null) { // L: 86 + var4.offsetBy(0, -super.field1238, 0); // L: 87 + Model[] var5 = new Model[]{var3, var4}; // L: 88 + var3 = new Model(var5, 2); // L: 89 + } + } + + if (this.definition.size == 1) { // L: 92 + var3.isSingleTile = true; + } + + return var3; // L: 93 + } + } + } + + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "502000680" + garbageValue = "1417387159" ) - final void method2181(int var1, int var2, boolean var3) { - if (super.sequence != -1 && InterfaceParent.SequenceDefinition_get(super.sequence).field3565 == 1) { // L: 50 + final void method2236(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class225.SequenceDefinition_get(super.sequence).field3723 == 1) { // L: 50 super.sequence = -1; } @@ -113,94 +145,26 @@ public final class NPC extends Actor { super.pathX[0] = var1; // L: 61 super.pathY[0] = var2; // L: 62 super.pathTraversed[0] = 1; // L: 63 - return; + return; // L: 64 } } super.pathLength = 0; // L: 67 - super.field1012 = 0; // L: 68 - super.field989 = 0; // L: 69 + super.field1224 = 0; // L: 68 + super.field1267 = 0; // L: 69 super.pathX[0] = var1; // L: 70 super.pathY[0] = var2; // L: 71 - super.x = super.pathX[0] * 128 + super.field1007 * 64; // L: 72 - super.y = super.pathY[0] * 128 + super.field1007 * 64; // L: 73 + super.x = super.pathX[0] * 128 + super.field1258 * 64; // L: 72 + super.y = super.pathY[0] * 128 + super.field1258 * 64; // L: 73 } // L: 74 - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" - ) - @Export("getModel") - protected final Model getModel() { - if (this.definition == null) { // L: 77 - return null; - } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? InterfaceParent.SequenceDefinition_get(super.sequence) : null; // L: 78 - SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? InterfaceParent.SequenceDefinition_get(super.movementSequence) : null; // L: 79 - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 - if (var3 == null) { // L: 81 - return null; - } else { - var3.calculateBoundsCylinder(); // L: 82 - super.defaultHeight = var3.height; // L: 83 - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 - Model var4 = AbstractUserComparator.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 - if (var4 != null) { // L: 86 - var4.offsetBy(0, -super.field994, 0); // L: 87 - Model[] var5 = new Model[]{var3, var4}; // L: 88 - var3 = new Model(var5, 2); // L: 89 - } - } - - if (this.definition.size == 1) { // L: 92 - var3.isSingleTile = true; - } - - return var3; // L: 93 - } - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-251916247" + descriptor = "(B)Z", + garbageValue = "-3" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; // L: 97 } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)Lbd;", - garbageValue = "874682655" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-55" - ) - public static int method2179(int var0) { - return GrandExchangeOfferNameComparator.Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 64 - } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "51" - ) - static void method2180(int var0, int var1) { - if (WorldMapSectionType.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3395 - ReflectionCheck.method2450(WorldMapManager.archive11, var0, 0, WorldMapSectionType.clientPreferences.musicVolume, false); // L: 3396 - Client.field899 = true; // L: 3397 - } - - } // L: 3399 } diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java index 0ac15abd35..1ec5b16a5b 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("jy") +@ObfuscatedName("kc") @Implements("NPCComposition") public class NPCComposition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("NpcDefinition_archive") static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("NpcDefinition_modelArchive") static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("NpcDefinition_cached") - public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("c") + static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("NpcDefinition_cachedModels") - public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("bw") + static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lig;" ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("y") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 24232169 + intValue = -1649417671 ) @Export("id") public int id; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("name") public String name; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2004298727 + intValue = -1998596805 ) @Export("size") public int size; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("models") int[] models; - @ObfuscatedName("q") - int[] field3505; - @ObfuscatedName("l") + @ObfuscatedName("h") + int[] field3482; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1510853809 + intValue = -1691111705 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1120127837 + intValue = 1695307641 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1037555383 + intValue = 1999840245 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1864602667 + intValue = 112818229 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1620043443 + intValue = 700827257 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -934098427 + intValue = -234007681 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 549437629 + intValue = 1469049329 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("actions") public String[] actions; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1257946639 + intValue = -285106033 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1224141093 + intValue = 2085195021 ) @Export("widthScale") int widthScale; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1903775087 + intValue = -631164779 ) @Export("heightScale") int heightScale; - @ObfuscatedName("j") + @ObfuscatedName("y") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1351720473 + intValue = 272083875 ) @Export("ambient") int ambient; - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 815139319 + intValue = 522457773 ) @Export("contrast") int contrast; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1867413513 + intValue = 97612235 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1974627065 + intValue = 433378497 ) @Export("rotation") public int rotation; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("transforms") public int[] transforms; - @ObfuscatedName("aq") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -564802311 + intValue = -488885679 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1138034643 + intValue = 1760354399 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("params") IterableNodeHashTable params; @@ -225,19 +231,19 @@ public class NPCComposition extends DualNode { this.isFollower = false; // L: 51 } // L: 54 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1161139559" + garbageValue = "2075807129" ) @Export("postDecode") void postDecode() { } // L: 73 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "0" + descriptor = "(Lnu;I)V", + garbageValue = "-2104011211" ) @Export("decode") void decode(Buffer var1) { @@ -251,10 +257,10 @@ public class NPCComposition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;IB)V", - garbageValue = "43" + descriptor = "(Lnu;II)V", + garbageValue = "1990891317" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -284,306 +290,319 @@ public class NPCComposition extends DualNode { this.walkBackSequence = var1.readUnsignedShort(); // L: 97 this.walkLeftSequence = var1.readUnsignedShort(); // L: 98 this.walkRightSequence = var1.readUnsignedShort(); // L: 99 - } else if (var2 >= 30 && var2 < 35) { // L: 101 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 102 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 103 + } else if (var2 == 18) { // L: 101 + var1.readUnsignedShort(); // L: 102 + } else if (var2 >= 30 && var2 < 35) { // L: 104 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 105 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 106 this.actions[var2 - 30] = null; } - } else if (var2 == 40) { // L: 105 - var3 = var1.readUnsignedByte(); // L: 106 - this.recolorFrom = new short[var3]; // L: 107 - this.recolorTo = new short[var3]; // L: 108 + } else if (var2 == 40) { // L: 108 + var3 = var1.readUnsignedByte(); // L: 109 + this.recolorFrom = new short[var3]; // L: 110 + this.recolorTo = new short[var3]; // L: 111 - for (var4 = 0; var4 < var3; ++var4) { // L: 109 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 110 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 111 + for (var4 = 0; var4 < var3; ++var4) { // L: 112 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 113 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 114 } - } else if (var2 == 41) { // L: 114 - var3 = var1.readUnsignedByte(); // L: 115 - this.retextureFrom = new short[var3]; // L: 116 - this.retextureTo = new short[var3]; // L: 117 + } else if (var2 == 41) { // L: 117 + var3 = var1.readUnsignedByte(); // L: 118 + this.retextureFrom = new short[var3]; // L: 119 + this.retextureTo = new short[var3]; // L: 120 - for (var4 = 0; var4 < var3; ++var4) { // L: 118 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 119 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 120 + for (var4 = 0; var4 < var3; ++var4) { // L: 121 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 122 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 123 } - } else if (var2 == 60) { // L: 123 - var3 = var1.readUnsignedByte(); // L: 124 - this.field3505 = new int[var3]; // L: 125 + } else if (var2 == 60) { // L: 126 + var3 = var1.readUnsignedByte(); // L: 127 + this.field3482 = new int[var3]; // L: 128 - for (var4 = 0; var4 < var3; ++var4) { // L: 126 - this.field3505[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 129 + this.field3482[var4] = var1.readUnsignedShort(); } - } else if (var2 == 93) { // L: 128 + } else if (var2 == 93) { // L: 131 this.drawMapDot = false; - } else if (var2 == 95) { // L: 129 + } else if (var2 == 95) { // L: 132 this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { // L: 130 + } else if (var2 == 97) { // L: 133 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { // L: 131 + } else if (var2 == 98) { // L: 134 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { // L: 132 + } else if (var2 == 99) { // L: 135 this.isVisible = true; - } else if (var2 == 100) { // L: 133 + } else if (var2 == 100) { // L: 136 this.ambient = var1.readByte(); - } else if (var2 == 101) { // L: 134 + } else if (var2 == 101) { // L: 137 this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { // L: 135 + } else if (var2 == 102) { // L: 138 this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { // L: 136 + } else if (var2 == 103) { // L: 139 this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { // L: 137 - if (var2 == 107) { // L: 155 + } else if (var2 != 106 && var2 != 118) { // L: 140 + if (var2 == 107) { // L: 158 this.isInteractable = false; - } else if (var2 == 109) { // L: 156 + } else if (var2 == 109) { // L: 159 this.isClickable = false; - } else if (var2 == 111) { // L: 157 + } else if (var2 == 111) { // L: 160 this.isFollower = true; - } else if (var2 == 249) { // L: 158 - this.params = TextureProvider.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 161 + this.params = class105.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 138 - if (this.transformVarbit == 65535) { // L: 139 - this.transformVarbit = -1; + this.transformVarbit = var1.readUnsignedShort(); // L: 141 + if (this.transformVarbit == 65535) { + this.transformVarbit = -1; // L: 142 } - this.transformVarp = var1.readUnsignedShort(); // L: 140 - if (this.transformVarp == 65535) { // L: 141 + this.transformVarp = var1.readUnsignedShort(); // L: 143 + if (this.transformVarp == 65535) { // L: 144 this.transformVarp = -1; } - var3 = -1; // L: 142 - if (var2 == 118) { // L: 143 - var3 = var1.readUnsignedShort(); // L: 144 - if (var3 == 65535) { // L: 145 + var3 = -1; // L: 145 + if (var2 == 118) { // L: 146 + var3 = var1.readUnsignedShort(); // L: 147 + if (var3 == 65535) { // L: 148 var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 147 - this.transforms = new int[var4 + 2]; // L: 148 + var4 = var1.readUnsignedByte(); // L: 150 + this.transforms = new int[var4 + 2]; // L: 151 - for (int var5 = 0; var5 <= var4; ++var5) { // L: 149 - this.transforms[var5] = var1.readUnsignedShort(); // L: 150 - if (this.transforms[var5] == 65535) { // L: 151 + for (int var5 = 0; var5 <= var4; ++var5) { // L: 152 + this.transforms[var5] = var1.readUnsignedShort(); // L: 153 + if (this.transforms[var5] == 65535) { // L: 154 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 153 + this.transforms[var4 + 1] = var3; // L: 156 } - } // L: 160 + } // L: 163 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljs;ILjs;II)Lef;", - garbageValue = "-2134889702" + descriptor = "(Lkw;ILkw;II)Lgv;", + garbageValue = "448059998" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.transforms != null) { // L: 163 - NPCComposition var12 = this.transform(); // L: 164 - return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 165 166 + if (this.transforms != null) { // L: 166 + NPCComposition var12 = this.transform(); // L: 167 + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 168 169 } else { - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 168 - if (var5 == null) { // L: 169 - boolean var6 = false; // L: 170 + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 171 + if (var5 == null) { // L: 172 + boolean var6 = false; // L: 173 - for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 171 + for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 174 if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } - if (var6) { // L: 172 + if (var6) { // L: 175 return null; } - ModelData[] var8 = new ModelData[this.models.length]; // L: 174 + ModelData[] var8 = new ModelData[this.models.length]; // L: 177 int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { // L: 175 + for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178 var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); } ModelData var10; - if (var8.length == 1) { // L: 176 + if (var8.length == 1) { // L: 179 var10 = var8[0]; } else { - var10 = new ModelData(var8, var8.length); // L: 177 + var10 = new ModelData(var8, var8.length); // L: 180 } - if (this.recolorFrom != null) { // L: 178 - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 179 - var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 180 + if (this.recolorFrom != null) { // L: 181 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 182 + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 183 } } - if (this.retextureFrom != null) { // L: 183 - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 184 - var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 185 + if (this.retextureFrom != null) { // L: 186 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 187 + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 188 } } - var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 188 - NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 189 + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192 } Model var11; - if (var1 != null && var3 != null) { // L: 192 + if (var1 != null && var3 != null) { // L: 195 var11 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { // L: 193 + } else if (var1 != null) { // L: 196 var11 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { // L: 194 + } else if (var3 != null) { // L: 197 var11 = var3.transformActorModel(var5, var4); } else { - var11 = var5.toSharedSequenceModel(true); // L: 195 + var11 = var5.toSharedSequenceModel(true); // L: 198 } - if (this.widthScale != 128 || this.heightScale != 128) { // L: 196 + if (this.widthScale != 128 || this.heightScale != 128) { // L: 199 var11.scale(this.widthScale, this.heightScale, this.widthScale); } - return var11; // L: 197 + return var11; // L: 200 } } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Lek;", - garbageValue = "-5" + descriptor = "(I)Lfs;", + garbageValue = "454555672" ) @Export("getModelData") public final ModelData getModelData() { - if (this.transforms != null) { // L: 201 - NPCComposition var7 = this.transform(); // L: 202 - return var7 == null ? null : var7.getModelData(); // L: 203 204 - } else if (this.field3505 == null) { // L: 206 + if (this.transforms != null) { // L: 204 + NPCComposition var7 = this.transform(); // L: 205 + return var7 == null ? null : var7.getModelData(); // L: 206 207 + } else if (this.field3482 == null) { // L: 209 return null; } else { - boolean var1 = false; // L: 207 + boolean var1 = false; // L: 210 - for (int var2 = 0; var2 < this.field3505.length; ++var2) { // L: 208 - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3505[var2], 0)) { + for (int var2 = 0; var2 < this.field3482.length; ++var2) { // L: 211 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3482[var2], 0)) { var1 = true; } } - if (var1) { // L: 209 + if (var1) { // L: 212 return null; } else { - ModelData[] var5 = new ModelData[this.field3505.length]; // L: 210 + ModelData[] var5 = new ModelData[this.field3482.length]; // L: 213 - for (int var3 = 0; var3 < this.field3505.length; ++var3) { // L: 211 - var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3505[var3], 0); + for (int var3 = 0; var3 < this.field3482.length; ++var3) { // L: 214 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3482[var3], 0); } ModelData var6; if (var5.length == 1) { - var6 = var5[0]; // L: 213 + var6 = var5[0]; // L: 216 } else { - var6 = new ModelData(var5, var5.length); // L: 214 + var6 = new ModelData(var5, var5.length); // L: 217 } int var4; - if (this.recolorFrom != null) { // L: 215 - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 216 - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 217 + if (this.recolorFrom != null) { // L: 218 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 219 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 220 } } - if (this.retextureFrom != null) { // L: 220 - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 221 - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 222 + if (this.retextureFrom != null) { // L: 223 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 224 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 225 } } - return var6; // L: 225 + return var6; // L: 228 } } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Ljy;", - garbageValue = "1357950663" + descriptor = "(I)Lkc;", + garbageValue = "1907764322" ) @Export("transform") public final NPCComposition transform() { - int var1 = -1; // L: 229 - if (this.transformVarbit != -1) { // L: 230 - var1 = FontName.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 231 + int var1 = -1; // L: 232 + if (this.transformVarbit != -1) { // L: 233 + var1 = class2.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 234 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 233 - var2 = this.transforms[var1]; // L: 234 + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 236 + var2 = this.transforms[var1]; // L: 237 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class90.getNpcDefinition(var2) : null; // L: 235 236 + return var2 != -1 ? GraphicsObject.getNpcDefinition(var2) : null; // L: 238 239 } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "122" + descriptor = "(I)Z", + garbageValue = "1062780964" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { // L: 240 + if (this.transforms == null) { // L: 243 return true; } else { - int var1 = -1; // L: 241 - if (this.transformVarbit != -1) { // L: 242 - var1 = FontName.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 243 + int var1 = -1; // L: 244 + if (this.transformVarbit != -1) { // L: 245 + var1 = class2.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 246 var1 = Varps.Varps_main[this.transformVarp]; } - if (var1 >= 0 && var1 < this.transforms.length) { // L: 244 - return this.transforms[var1] != -1; // L: 245 + if (var1 >= 0 && var1 < this.transforms.length) { + return this.transforms[var1] != -1; } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "93" + descriptor = "(III)I", + garbageValue = "-337730907" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 250 + IterableNodeHashTable var4 = this.params; // L: 253 int var3; - if (var4 == null) { // L: 252 - var3 = var2; // L: 253 + if (var4 == null) { // L: 255 + var3 = var2; // L: 256 } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 256 - if (var5 == null) { // L: 257 - var3 = var2; // L: 258 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 259 + if (var5 == null) { // L: 260 + var3 = var2; // L: 261 } else { - var3 = var5.integer; // L: 261 + var3 = var5.integer; // L: 264 } } - return var3; // L: 263 + return var3; // L: 266 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "2" + descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "-22620" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class69.method1258(this.params, var1, var2); // L: 267 + return MouseHandler.method725(this.params, var1, var2); // L: 270 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Lbu;", + garbageValue = "-1878564834" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 247 + return ScriptFrame.getNextWorldListWorld(); // L: 248 } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index dae5070e28..0da054fb99 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("dj") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 7306161736253436303L + longValue = 898288013005373267L ) @Export("lastTimeNano") long lastTimeNano; - public NanoClock() { + NanoClock() { this.lastTimeNano = System.nanoTime(); // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "46" + descriptor = "(S)V", + garbageValue = "-629" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); // L: 14 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1861957348" + garbageValue = "1172254968" ) @Export("wait") public int wait(int var1, int var2) { @@ -41,7 +41,7 @@ public class NanoClock extends Clock { var5 = var3; } - ApproximateRouteStrategy.sleepExact(var5 / 1000000L); // L: 21 + GrandExchangeEvent.sleepExact(var5 / 1000000L); // L: 21 long var7 = System.nanoTime(); // L: 22 int var9; diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index de7b81f373..208066aa7c 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,120 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("in") @Implements("NetCache") public class NetCache { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2069303121 + intValue = -124880601 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = 5972391004989116827L + longValue = 5332801206251428939L ) - public static long field3222; - @ObfuscatedName("c") + public static long field3284; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1443113315 + intValue = 1054215943 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1708401617 + intValue = -1139184707 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljo;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("NetCache_pendingWrites") public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -767239881 + intValue = -80901939 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -462830745 + intValue = 1355603673 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lnu;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lkx;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1342919903 + intValue = -1154684579 ) - public static int field3219; - @ObfuscatedName("g") + public static int field3295; + @ObfuscatedName("v") @Export("NetCache_crc") - public static CRC32 NetCache_crc; - @ObfuscatedName("t") + static CRC32 NetCache_crc; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Liy;" + descriptor = "[Lig;" ) @Export("NetCache_archives") - public static Archive[] NetCache_archives; - @ObfuscatedName("p") - public static byte field3213; - @ObfuscatedName("m") + static Archive[] NetCache_archives; + @ObfuscatedName("i") + public static byte field3287; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 26880845 + intValue = -306717703 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 953608549 + intValue = -1924806693 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; - @ObfuscatedName("gz") - @ObfuscatedGetter( - intValue = -128407789 - ) - @Export("baseY") - static int baseY; static { NetCache_loadTime = 0; // L: 13 @@ -132,10 +120,10 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 NetCache_pendingResponsesCount = 0; // L: 23 NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 - field3219 = 0; // L: 28 + field3295 = 0; // L: 28 NetCache_crc = new CRC32(); // L: 30 NetCache_archives = new Archive[256]; // L: 32 - field3213 = 0; // L: 33 + field3287 = 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 633f407294..ea80520a9b 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,25 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("ic") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Lig;" ) @Export("archive") - public Archive archive; - @ObfuscatedName("v") + Archive archive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -319627239 + intValue = -8399381 ) @Export("crc") - public int crc; - @ObfuscatedName("d") + int crc; + @ObfuscatedName("u") @Export("padding") - public byte padding; + byte padding; NetFileRequest() { } // L: 10 + + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-392050849" + ) + static final void method4472() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6816 6817 6823 + if (var0.hitpoints == -1) { // L: 6818 + var0.delay = 0; // L: 6819 + class341.method6017(var0); // L: 6820 + } else { + var0.remove(); // L: 6822 + } + } + + } // L: 6825 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 1433faf810..18fc750e29 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,72 +9,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("ek") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "Lfl;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("n") + @ObfuscatedName("d") + static boolean field1498; + @ObfuscatedName("f") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("v") - @Export("outputStream") - OutputStream outputStream; - @ObfuscatedName("d") + @ObfuscatedName("o") @Export("socket") Socket socket; - @ObfuscatedName("c") + @ObfuscatedName("u") + @Export("outputStream") + OutputStream outputStream; + @ObfuscatedName("p") @Export("isClosed") boolean isClosed; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lfu;" + descriptor = "Ldt;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lep;" ) @Export("task") Task task; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -80175503 + intValue = 1893029663 ) @Export("outLength") int outLength; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -502445773 + intValue = -1275635837 ) @Export("outOffset") int outOffset; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1447892009 + intValue = -1698435769 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1889811971 + intValue = 190776071 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lfu;I)V" + descriptor = "(Ljava/net/Socket;Ldt;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; // L: 16 @@ -93,10 +89,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); // L: 37 } // L: 38 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "136255387" + garbageValue = "-1705512918" ) @Export("close") public void close() { @@ -108,7 +104,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { // L: 46 while (this.task.status == 0) { // L: 47 - ApproximateRouteStrategy.sleepExact(1L); // L: 48 + GrandExchangeEvent.sleepExact(1L); // L: 48 } if (this.task.status == 1) { // L: 50 @@ -123,30 +119,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 58 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-29" + garbageValue = "-75" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "1" + garbageValue = "-65" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1621767276" + garbageValue = "1604537239" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -157,10 +153,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "([BIIB)I", - garbageValue = "-127" + garbageValue = "121" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -182,10 +178,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-2045267371" + garbageValue = "277239733" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -217,10 +213,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } // L: 111 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1032488862" + garbageValue = "199608149" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -238,7 +234,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { int var1; int var2; synchronized(this) { // L: 118 - if (this.outOffset == this.outLength) { // L: 119 + if (this.outLength == this.outOffset) { // L: 119 if (this.isClosed) { // L: 120 break label84; } @@ -298,17 +294,21 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { // L: 154 - SequenceDefinition.RunException_sendStackTrace((String)null, var12); // L: 155 + class223.RunException_sendStackTrace((String)null, var12); // L: 155 } } // L: 157 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-3619" + descriptor = "(II)I", + garbageValue = "1850245175" ) - static final void method3748() { - class300.method5473("You can't add yourself to your own ignore list"); // L: 162 - } // L: 163 + public static int method2587(int var0) { + if (var0 > 0) { // L: 206 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 207 208 + } + } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 612272ac86..c81762bf71 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,26 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("mh") @Implements("Node") public class Node { - @ObfuscatedName("cm") + @ObfuscatedName("fk") @Export("key") public long key; - @ObfuscatedName("cc") + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("previous") public Node previous; - @ObfuscatedName("co") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("next") public Node next; - @ObfuscatedName("ea") + @ObfuscatedName("ex") @Export("remove") public void remove() { if (this.next != null) { // L: 9 @@ -33,7 +33,7 @@ public class Node { } } // L: 14 - @ObfuscatedName("eu") + @ObfuscatedName("ed") @Export("hasNext") public boolean hasNext() { return this.next != null; // L: 17 diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 914edaf9c7..3fd165ba00 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("ju") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; // L: 11 } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lga;)V" + descriptor = "(Lmh;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 28 } // L: 29 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lga;)V" + descriptor = "(Lmh;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; // L: 36 } // L: 37 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lga;Lga;)V" + descriptor = "(Lmh;Lmh;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 5ff3a55947..baedde8071 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("mg") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("size") int size; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lga;" + descriptor = "[Lmh;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lga;" + descriptor = "Lmh;" ) @Export("current") Node current; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } // L: 20 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(J)Lga;" + descriptor = "(J)Lmh;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; // L: 34 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lga;J)V" + descriptor = "(Lmh;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; // L: 44 } // L: 45 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); // L: 49 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "()Lga;" + descriptor = "()Lmh;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java index 6f5b059a36..edf66092d0 100644 --- a/runescape-client/src/main/java/ObjectComposition.java +++ b/runescape-client/src/main/java/ObjectComposition.java @@ -4,259 +4,259 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jg") +@ObfuscatedName("kj") @Implements("ObjectComposition") public class ObjectComposition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("ObjectDefinition_isLowDetail") - static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("v") + public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("d") + public static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("c") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ObjectDefinition_cached") public static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ObjectDefinition_cachedEntities") public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ObjectDefinition_cachedModels") public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lek;" + descriptor = "[Lfs;" ) - static ModelData[] field3410; - @ObfuscatedName("q") + static ModelData[] field3594; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -448703229 + intValue = -388952591 ) @Export("id") public int id; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("modelIds") int[] modelIds; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("models") int[] models; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("name") public String name; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 298630257 + intValue = -245426657 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1328331405 + intValue = 1331772245 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 270471379 + intValue = -286896143 ) @Export("interactType") public int interactType; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 49633811 + intValue = 1015419665 ) @Export("int1") public int int1; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1668805195 + intValue = -2016083235 ) @Export("clipType") int clipType; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 581638001 + intValue = -1364258777 ) @Export("animationId") public int animationId; - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -211640911 + intValue = 765268969 ) @Export("int2") public int int2; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 453955421 + intValue = 200308371 ) @Export("ambient") int ambient; - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1979235761 + intValue = -893543153 ) @Export("contrast") int contrast; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("actions") public String[] actions; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2137777107 + intValue = 238268559 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 59768053 + intValue = 1334531505 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("isRotated") boolean isRotated; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("clipped") public boolean clipped; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1499464739 + intValue = -1552847517 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -561367673 + intValue = 1124613467 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1882279433 + intValue = 1162195677 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1934528115 + intValue = -149015433 ) @Export("offsetX") int offsetX; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1408363841 + intValue = -90416831 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("as") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1403538025 + intValue = -707117971 ) @Export("offsetY") int offsetY; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1437084271 + intValue = -361469485 ) @Export("int3") public int int3; - @ObfuscatedName("ap") + @ObfuscatedName("az") @Export("transforms") public int[] transforms; - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -351065157 + intValue = 454079943 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 759778209 + intValue = -708471829 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 411474029 + intValue = 373458889 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 968058385 + intValue = -2047725015 ) @Export("int4") public int int4; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 693369209 + intValue = 2043681109 ) @Export("int5") public int int5; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1791348031 + intValue = -1784620887 ) @Export("int6") public int int6; - @ObfuscatedName("af") + @ObfuscatedName("an") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("av") - public boolean field3429; - @ObfuscatedName("ao") + @ObfuscatedName("ah") + public boolean field3621; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("params") IterableNodeHashTable params; @@ -267,17 +267,17 @@ public class ObjectComposition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22 ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23 - field3410 = new ModelData[4]; // L: 24 + field3594 = new ModelData[4]; // L: 24 } ObjectComposition() { - this.name = "null"; // L: 28 - this.sizeX = 1; // L: 33 - this.sizeY = 1; // L: 34 - this.interactType = 2; // L: 35 - this.boolean1 = true; // L: 36 - this.int1 = -1; // L: 37 - this.clipType = -1; // L: 38 + this.name = "null"; + this.sizeX = 1; + this.sizeY = 1; + this.interactType = 2; + this.boolean1 = true; + this.int1 = -1; + this.clipType = -1; this.nonFlatShading = false; // L: 39 this.modelClipped = false; // L: 40 this.animationId = -1; // L: 41 @@ -304,692 +304,658 @@ public class ObjectComposition extends DualNode { this.int4 = 0; // L: 63 this.int5 = 0; // L: 64 this.int6 = 0; // L: 65 - this.field3429 = true; // L: 67 + this.field3621 = true; // L: 67 } // L: 70 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-80" + garbageValue = "-32" ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { // L: 95 - this.int1 = 0; // L: 96 - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97 + if (this.int1 == -1) { // 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) { // L: 98 + for (int var1 = 0; var1 < 5; ++var1) { // L: 92 if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { // L: 100 + if (this.int3 == -1) { // L: 94 this.int3 = this.interactType != 0 ? 1 : 0; } - } // L: 101 + } // L: 95 - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "0" + descriptor = "(Lnu;B)V", + garbageValue = "1" ) @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); + this.decodeNext(var1, var2); // L: 101 } } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "504124934" + descriptor = "(Lnu;II)V", + garbageValue = "-1885968960" ) @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; + 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]; - this.modelIds = new int[var3]; + this.models = new int[var3]; // L: 110 + this.modelIds = new int[var3]; // L: 111 - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); - this.models[var4] = var1.readUnsignedByte(); + 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) { + } else if (var2 == 2) { // L: 120 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 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 += var3 * 2; // L: 129 } else { - this.models = null; - this.modelIds = new int[var3]; + this.models = null; // L: 125 + this.modelIds = new int[var3]; // L: 126 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 127 this.modelIds[var4] = var1.readUnsignedShort(); } } } - } else if (var2 == 14) { // L: 138 + } else if (var2 == 14) { // L: 132 this.sizeX = var1.readUnsignedByte(); - } else if (var2 == 15) { // L: 139 + } else if (var2 == 15) { // L: 133 this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { // L: 140 - this.interactType = 0; // L: 141 - this.boolean1 = false; // L: 142 - } else if (var2 == 18) { // L: 144 + } else if (var2 == 17) { // 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: 145 + } else if (var2 == 19) { // L: 139 this.int1 = var1.readUnsignedByte(); - } else if (var2 == 21) { // L: 146 + } else if (var2 == 21) { // L: 140 this.clipType = 0; - } else if (var2 == 22) { // L: 147 + } else if (var2 == 22) { // L: 141 this.nonFlatShading = true; - } else if (var2 == 23) { // L: 148 + } else if (var2 == 23) { // L: 142 this.modelClipped = true; - } else if (var2 == 24) { // L: 149 - this.animationId = var1.readUnsignedShort(); // L: 150 - if (this.animationId == 65535) { // L: 151 + } else if (var2 == 24) { // L: 143 + this.animationId = var1.readUnsignedShort(); // L: 144 + if (this.animationId == 65535) { // L: 145 this.animationId = -1; } - } else if (var2 == 27) { // L: 153 + } else if (var2 == 27) { // L: 147 this.interactType = 1; - } else if (var2 == 28) { // L: 154 + } else if (var2 == 28) { // L: 148 this.int2 = var1.readUnsignedByte(); - } else if (var2 == 29) { // L: 155 + } else if (var2 == 29) { // L: 149 this.ambient = var1.readByte(); - } else if (var2 == 39) { // L: 156 + } else if (var2 == 39) { // L: 150 this.contrast = var1.readByte() * 25; - } else if (var2 >= 30 && var2 < 35) { // L: 157 - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158 - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159 + } else if (var2 >= 30 && var2 < 35) { // 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: 161 - var3 = var1.readUnsignedByte(); // L: 162 - this.recolorFrom = new short[var3]; // L: 163 - this.recolorTo = new short[var3]; // L: 164 + } 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: 165 - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166 - this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167 + 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: 170 - var3 = var1.readUnsignedByte(); // L: 171 - this.retextureFrom = new short[var3]; // L: 172 - this.retextureTo = new short[var3]; // L: 173 + } 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: 174 - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175 - this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176 + 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 == 62) { // L: 179 + } else if (var2 == 62) { // L: 173 this.isRotated = true; - } else if (var2 == 64) { // L: 180 + } else if (var2 == 64) { // L: 174 this.clipped = false; - } else if (var2 == 65) { // L: 181 + } else if (var2 == 65) { // L: 175 this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { // L: 182 + } else if (var2 == 66) { // L: 176 this.modelHeight = var1.readUnsignedShort(); - } else if (var2 == 67) { // L: 183 + } else if (var2 == 67) { // L: 177 this.modelSizeY = var1.readUnsignedShort(); - } else if (var2 == 68) { // L: 184 + } else if (var2 == 68) { // L: 178 this.mapSceneId = var1.readUnsignedShort(); - } else if (var2 == 69) { // L: 185 - var1.readUnsignedByte(); // L: 186 - } else if (var2 == 70) { // L: 188 + } else if (var2 == 69) { // L: 179 + var1.readUnsignedByte(); // L: 180 + } else if (var2 == 70) { // L: 182 this.offsetX = var1.readShort(); - } else if (var2 == 71) { // L: 189 + } else if (var2 == 71) { // L: 183 this.offsetHeight = var1.readShort(); - } else if (var2 == 72) { // L: 190 + } else if (var2 == 72) { // L: 184 this.offsetY = var1.readShort(); - } else if (var2 == 73) { // L: 191 - this.boolean2 = true; - } else if (var2 == 74) { // L: 192 + } else if (var2 == 73) { + this.boolean2 = true; // L: 185 + } else if (var2 == 74) { // L: 186 this.isSolid = true; - } else if (var2 == 75) { // L: 193 + } else if (var2 == 75) { // L: 187 this.int3 = var1.readUnsignedByte(); - } else if (var2 != 77 && var2 != 92) { // L: 194 - if (var2 == 78) { // L: 212 - this.ambientSoundId = var1.readUnsignedShort(); // L: 213 - this.int4 = var1.readUnsignedByte(); // L: 214 - } else if (var2 == 79) { // L: 216 - this.int5 = var1.readUnsignedShort(); // L: 217 - this.int6 = var1.readUnsignedShort(); // L: 218 - this.int4 = var1.readUnsignedByte(); // L: 219 - var3 = var1.readUnsignedByte(); // L: 220 - this.soundEffectIds = new int[var3]; // L: 221 + } else if (var2 != 77 && var2 != 92) { // L: 188 + if (var2 == 78) { // L: 206 + this.ambientSoundId = var1.readUnsignedShort(); // L: 207 + this.int4 = var1.readUnsignedByte(); // L: 208 + } else if (var2 == 79) { // L: 210 + this.int5 = var1.readUnsignedShort(); // L: 211 + this.int6 = var1.readUnsignedShort(); // L: 212 + this.int4 = var1.readUnsignedByte(); // L: 213 + var3 = var1.readUnsignedByte(); // L: 214 + this.soundEffectIds = new int[var3]; // L: 215 - for (var4 = 0; var4 < var3; ++var4) { // L: 222 + for (var4 = 0; var4 < var3; ++var4) { // L: 216 this.soundEffectIds[var4] = var1.readUnsignedShort(); } - } else if (var2 == 81) { // L: 224 + } else if (var2 == 81) { // L: 218 this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { // L: 225 + } else if (var2 == 82) { // L: 219 this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 89) { // L: 226 - this.field3429 = false; - } else if (var2 == 249) { // L: 227 - this.params = TextureProvider.readStringIntParameters(var1, this.params); + } else if (var2 == 89) { // L: 220 + this.field3621 = false; + } else if (var2 == 249) { // L: 221 + this.params = class105.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); // L: 195 - if (this.transformVarbit == 65535) { // L: 196 + this.transformVarbit = var1.readUnsignedShort(); // L: 189 + if (this.transformVarbit == 65535) { // L: 190 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); // L: 197 - if (this.transformVarp == 65535) { // L: 198 + this.transformVarp = var1.readUnsignedShort(); // L: 191 + if (this.transformVarp == 65535) { // L: 192 this.transformVarp = -1; } - var3 = -1; // L: 199 - if (var2 == 92) { // L: 200 - var3 = var1.readUnsignedShort(); // L: 201 - if (var3 == 65535) { // L: 202 + var3 = -1; // L: 193 + if (var2 == 92) { // L: 194 + var3 = var1.readUnsignedShort(); // L: 195 + if (var3 == 65535) { // L: 196 var3 = -1; } } - var4 = var1.readUnsignedByte(); // L: 204 - this.transforms = new int[var4 + 2]; // L: 205 + var4 = var1.readUnsignedByte(); // L: 198 + this.transforms = new int[var4 + 2]; // L: 199 - for (int var5 = 0; var5 <= var4; ++var5) { // L: 206 - this.transforms[var5] = var1.readUnsignedShort(); // L: 207 - if (this.transforms[var5] == 65535) { // L: 208 + for (int var5 = 0; var5 <= var4; ++var5) { // L: 200 + this.transforms[var5] = var1.readUnsignedShort(); // L: 201 + if (this.transforms[var5] == 65535) { // L: 202 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; // L: 210 + this.transforms[var4 + 1] = var3; // L: 204 } - } // L: 229 + } // L: 223 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "2131864128" + garbageValue = "451556136" ) - public final boolean method4806(int var1) { - if (this.models != null) { // L: 232 - for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 242 - if (this.models[var4] == var1) { // L: 243 + public final boolean method5173(int var1) { + if (this.models != null) { // L: 226 + for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 236 + if (this.models[var4] == var1) { // L: 237 return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } - return true; // L: 245 - } else if (this.modelIds == null) { // L: 233 + return true; // L: 239 + } else if (this.modelIds == null) { // L: 227 return true; - } else if (var1 != 10) { // L: 234 + } else if (var1 != 10) { // L: 228 return true; } else { - boolean var2 = true; // L: 235 + boolean var2 = true; // L: 229 - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 236 - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 237 + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 230 + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 231 } - return var2; // L: 239 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "2" - ) - @Export("needsModelFiles") - public final boolean needsModelFiles() { - if (this.modelIds == null) { // L: 250 - return true; - } else { - boolean var1 = true; // L: 251 - - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 252 - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 253 - } - - return var1; // L: 255 + return var2; // L: 233 } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lem;", - garbageValue = "2086147511" + descriptor = "(I)Z", + garbageValue = "-431429123" + ) + @Export("needsModelFiles") + public final boolean needsModelFiles() { + if (this.modelIds == null) { // L: 244 + return true; + } else { + boolean var1 = true; // L: 245 + + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 246 + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 247 + } + + return var1; // L: 249 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(II[[IIIIB)Lfm;", + garbageValue = "-92" ) @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: 260 + if (this.models == null) { // L: 254 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 261 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 255 } - Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 262 - if (var9 == null) { // L: 263 - ModelData var10 = this.getModelData(var1, var2); // L: 264 - if (var10 == null) { // L: 265 + Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 256 + if (var9 == null) { // L: 257 + ModelData var10 = this.getModelData(var1, var2); // L: 258 + if (var10 == null) { // L: 259 return null; } - if (!this.nonFlatShading) { // L: 266 + if (!this.nonFlatShading) { // L: 260 var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { - var10.ambient = (short)(this.ambient + 64); // L: 268 - var10.contrast = (short)(this.contrast + 768); // L: 269 - var10.calculateVertexNormals(); // L: 270 - var9 = var10; // L: 271 + var10.ambient = (short)(this.ambient + 64); // L: 262 + var10.contrast = (short)(this.contrast + 768); // L: 263 + var10.calculateVertexNormals(); // L: 264 + var9 = var10; // L: 265 } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 273 + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 267 } - if (this.nonFlatShading) { // L: 275 - var9 = ((ModelData)var9).method2945(); // L: 276 + if (this.nonFlatShading) { // L: 269 + var9 = ((ModelData)var9).method3326(); // L: 270 } - if (this.clipType >= 0) { // L: 278 - if (var9 instanceof Model) { // L: 279 + if (this.clipType >= 0) { // L: 272 + if (var9 instanceof Model) { // L: 273 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2946(var3, var4, var5, var6, true, this.clipType); // L: 280 + var9 = ((ModelData)var9).method3314(var3, var4, var5, var6, true, this.clipType); // L: 274 } } - return (Renderable)var9; // L: 282 + return (Renderable)var9; // L: 276 } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lef;", - garbageValue = "-1813150019" + descriptor = "(II[[IIIII)Lgv;", + garbageValue = "1855793031" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { // L: 287 + if (this.models == null) { // L: 281 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 288 + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 282 } - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 289 - if (var9 == null) { // L: 290 - ModelData var10 = this.getModelData(var1, var2); // L: 291 - if (var10 == null) { // L: 292 + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 283 + if (var9 == null) { // L: 284 + ModelData var10 = this.getModelData(var1, var2); // L: 285 + if (var10 == null) { // L: 286 return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 293 - ObjectDefinition_cachedModels.put(var9, var7); // L: 294 + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 287 + ObjectDefinition_cachedModels.put(var9, var7); // L: 288 } if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 296 + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 290 } - return var9; // L: 297 + return var9; // L: 291 } - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II[[IIIILjs;II)Lef;", - garbageValue = "1938080829" + descriptor = "(II[[IIIILkw;II)Lgv;", + garbageValue = "-1469385099" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { long var9; - if (this.models == null) { // L: 302 + if (this.models == null) { // L: 296 var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 303 + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 297 } - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 304 - if (var11 == null) { // L: 305 - ModelData var12 = this.getModelData(var1, var2); // L: 306 - if (var12 == null) { // L: 307 + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 298 + if (var11 == null) { // L: 299 + ModelData var12 = this.getModelData(var1, var2); // L: 300 + if (var12 == null) { // L: 301 return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 308 - ObjectDefinition_cachedModels.put(var11, var9); // L: 309 + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 302 + ObjectDefinition_cachedModels.put(var11, var9); // L: 303 } - if (var7 == null && this.clipType == -1) { - return var11; // L: 311 + if (var7 == null && this.clipType == -1) { // L: 305 + return var11; } else { - if (var7 != null) { // L: 312 + if (var7 != null) { // L: 306 var11 = var7.transformObjectModel(var11, var8, var2); } else { - var11 = var11.toSharedSequenceModel(true); // L: 313 + var11 = var11.toSharedSequenceModel(true); // L: 307 } - if (this.clipType >= 0) { // L: 314 + if (this.clipType >= 0) { // L: 308 var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; // L: 315 + return var11; // L: 309 } } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(III)Lek;", - garbageValue = "-1880429080" + descriptor = "(III)Lfs;", + garbageValue = "1641615272" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; // L: 319 + ModelData var3 = null; // L: 313 boolean var4; int var5; int var7; - if (this.models == null) { // L: 320 - if (var1 != 10) { // L: 321 + if (this.models == null) { // L: 314 + if (var1 != 10) { // L: 315 return null; } - if (this.modelIds == null) { // L: 322 + if (this.modelIds == null) { // L: 316 return null; } - var4 = this.isRotated; // L: 323 - if (var1 == 2 && var2 > 3) { // L: 324 + var4 = this.isRotated; // L: 317 + if (var1 == 2 && var2 > 3) { // L: 318 var4 = !var4; } - var5 = this.modelIds.length; // L: 325 + var5 = this.modelIds.length; // L: 319 - for (int var6 = 0; var6 < var5; ++var6) { // L: 326 - var7 = this.modelIds[var6]; // L: 327 - if (var4) { // L: 328 + for (int var6 = 0; var6 < var5; ++var6) { // L: 320 + var7 = this.modelIds[var6]; // L: 321 + if (var4) { // L: 322 var7 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 329 - if (var3 == null) { // L: 330 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 331 - if (var3 == null) { // L: 332 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 323 + if (var3 == null) { // L: 324 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 325 + if (var3 == null) { // L: 326 return null; } - if (var4) { // L: 333 - var3.method2989(); + if (var4) { // L: 327 + var3.method3290(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 334 + ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 328 } - if (var5 > 1) { // L: 336 - field3410[var6] = var3; + if (var5 > 1) { // L: 330 + field3594[var6] = var3; } } - if (var5 > 1) { // L: 338 - var3 = new ModelData(field3410, var5); + if (var5 > 1) { // L: 332 + var3 = new ModelData(field3594, var5); } } else { - int var9 = -1; // L: 341 + int var9 = -1; // L: 335 - for (var5 = 0; var5 < this.models.length; ++var5) { // L: 342 - if (this.models[var5] == var1) { // L: 343 - var9 = var5; // L: 344 + for (var5 = 0; var5 < this.models.length; ++var5) { // L: 336 + if (this.models[var5] == var1) { // L: 337 + var9 = var5; // L: 338 break; } } - if (var9 == -1) { // L: 348 + if (var9 == -1) { // L: 342 return null; } - var5 = this.modelIds[var9]; // L: 349 - boolean var10 = this.isRotated ^ var2 > 3; // L: 350 - if (var10) { // L: 351 + var5 = this.modelIds[var9]; // L: 343 + boolean var10 = this.isRotated ^ var2 > 3; // L: 344 + if (var10) { // L: 345 var5 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 352 - if (var3 == null) { // L: 353 - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 354 - if (var3 == null) { // L: 355 + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 346 + if (var3 == null) { // L: 347 + var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 348 + if (var3 == null) { // L: 349 return null; } - if (var10) { // L: 356 - var3.method2989(); + if (var10) { // L: 350 + var3.method3290(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 357 + ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 351 } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 361 - var4 = false; // L: 362 + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 355 + var4 = false; // L: 356 } else { var4 = true; } boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 364 - var11 = false; // L: 365 + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 358 + var11 = false; // L: 359 } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 366 - if (var1 == 4 && var2 > 3) { // L: 367 - var8.method2951(256); // L: 368 - var8.changeOffset(45, 0, -45); // L: 369 + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); // L: 360 + if (var1 == 4 && var2 > 3) { // L: 361 + var8.method3286(256); // L: 362 + var8.changeOffset(45, 0, -45); // L: 363 } - var2 &= 3; // L: 371 - if (var2 == 1) { // L: 372 - var8.method2948(); - } else if (var2 == 2) { // L: 373 - var8.method2949(); - } else if (var2 == 3) { // L: 374 - var8.method3006(); + var2 &= 3; // L: 365 + if (var2 == 1) { // L: 366 + var8.method3303(); + } else if (var2 == 2) { // L: 367 + var8.method3284(); + } else if (var2 == 3) { // L: 368 + var8.method3285(); } - if (this.recolorFrom != null) { // L: 375 - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 376 - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 377 + if (this.recolorFrom != null) { // L: 369 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 370 + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 371 } } - if (this.retextureFrom != null) { // L: 380 - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 381 - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 382 + if (this.retextureFrom != null) { // L: 374 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 375 + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 376 } } - if (var4) { // L: 385 + if (var4) { // L: 379 var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { // L: 386 + if (var11) { // L: 380 var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; // L: 387 + return var8; // L: 381 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Ljg;", - garbageValue = "-1578474044" + descriptor = "(I)Lkj;", + garbageValue = "-1972162411" ) @Export("transform") public final ObjectComposition transform() { - int var1 = -1; // L: 391 - if (this.transformVarbit != -1) { // L: 392 - var1 = FontName.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { // L: 393 + int var1 = -1; // L: 385 + if (this.transformVarbit != -1) { // L: 386 + var1 = class2.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 387 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 395 - var2 = this.transforms[var1]; // L: 396 + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 389 + var2 = this.transforms[var1]; // L: 390 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? WorldMapAreaData.getObjectDefinition(var2) : null; // L: 397 398 + return var2 != -1 ? class19.getObjectDefinition(var2) : null; // L: 391 392 } - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "495952846" + garbageValue = "-537424191" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 403 + IterableNodeHashTable var4 = this.params; // L: 397 int var3; - if (var4 == null) { // L: 405 - var3 = var2; // L: 406 + if (var4 == null) { // L: 399 + var3 = var2; // L: 400 } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 409 - if (var5 == null) { // L: 410 - var3 = var2; // L: 411 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 403 + if (var5 == null) { // L: 404 + var3 = var2; // L: 405 } else { - var3 = var5.integer; // L: 414 + var3 = var5.integer; // L: 408 } } - return var3; // L: 416 + return var3; // L: 410 } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "244944647" + garbageValue = "-1571754470" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class69.method1258(this.params, var1, var2); // L: 420 + IterableNodeHashTable var4 = this.params; // L: 415 + String var3; + if (var4 == null) { // L: 417 + var3 = var2; // L: 418 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 421 + if (var5 == null) { // L: 422 + var3 = var2; // L: 423 + } else { + var3 = (String)var5.obj; // L: 426 + } + } + + return var3; // L: 428 } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1187773047" + descriptor = "(B)Z", + garbageValue = "84" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { // L: 424 + if (this.transforms == null) { // L: 432 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 425 - if (this.transforms[var1] != -1) { // L: 426 - ObjectComposition var2 = WorldMapAreaData.getObjectDefinition(this.transforms[var1]); // L: 427 - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 428 + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 433 + if (this.transforms[var1] != -1) { // L: 434 + ObjectComposition var2 = class19.getObjectDefinition(this.transforms[var1]); // L: 435 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 436 return true; } } } - return false; // L: 431 + return false; // L: 439 } } - @ObfuscatedName("y") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-314683087" + descriptor = "(Lgx;Loy;I)Lgy;", + garbageValue = "-1853010810" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; // L: 104 - - for (int var6 = 0; var6 < var5; ++var6) { // L: 105 - char var7 = var0.charAt(var6 + var1); // L: 106 - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 107 - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { // L: 108 - var3[var6 + var4] = -128; - } else if (var7 == 8218) { // L: 109 - var3[var6 + var4] = -126; - } else if (var7 == 402) { // L: 110 - var3[var6 + var4] = -125; - } else if (var7 == 8222) { // L: 111 - var3[var6 + var4] = -124; - } else if (var7 == 8230) { // L: 112 - var3[var6 + var4] = -123; - } else if (var7 == 8224) { // L: 113 - var3[var6 + var4] = -122; - } else if (var7 == 8225) { // L: 114 - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; // L: 115 - } else if (var7 == 8240) { // L: 116 - var3[var6 + var4] = -119; - } else if (var7 == 352) { // L: 117 - var3[var6 + var4] = -118; - } else if (var7 == 8249) { // L: 118 - var3[var6 + var4] = -117; - } else if (var7 == 338) { // L: 119 - var3[var6 + var4] = -116; - } else if (var7 == 381) { // L: 120 - var3[var6 + var4] = -114; - } else if (var7 == 8216) { // L: 121 - var3[var6 + var4] = -111; - } else if (var7 == 8217) { // L: 122 - var3[var6 + var4] = -110; - } else if (var7 == 8220) { // L: 123 - var3[var6 + var4] = -109; - } else if (var7 == 8221) { // L: 124 - var3[var6 + var4] = -108; - } else if (var7 == 8226) { // L: 125 - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; // L: 126 - } else if (var7 == 8212) { // L: 127 - var3[var6 + var4] = -105; - } else if (var7 == 732) { // L: 128 - var3[var6 + var4] = -104; - } else if (var7 == 8482) { // L: 129 - var3[var6 + var4] = -103; - } else if (var7 == 353) { // L: 130 - var3[var6 + var4] = -102; - } else if (var7 == 8250) { // L: 131 - var3[var6 + var4] = -101; - } else if (var7 == 339) { // L: 132 - var3[var6 + var4] = -100; - } else if (var7 == 382) { // L: 133 - var3[var6 + var4] = -98; - } else if (var7 == 376) { // L: 134 - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; // L: 135 - } + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = class192.method3812(); // 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 } - return var5; // L: 137 + var2.packetBuffer.setIsaacCipher(var1); // L: 35 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 + var2.index = 0; // L: 37 + return var2; // L: 38 } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 4540726796..17d077ab5c 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gf") +@ObfuscatedName("mm") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("obj") public final Object obj; diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 1fe69f9710..b5a27f6fdc 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,102 +1,99 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("bx") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("n") + @ObfuscatedName("qb") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lm;" + ) + static class11 field928; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lju;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "[Lly;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("hv") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1964902031 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -2133589173 + intValue = 1467616233 ) @Export("plane") int plane; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1700481629 + intValue = -1683122899 ) @Export("x") int x; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 63156075 + intValue = -2011686891 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1427133393 + intValue = -1571650761 ) - int field1090; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -125163379 - ) - int field1094; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1800180133 - ) - int field1092; + int field916; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -334742389 + intValue = 606469859 + ) + int field917; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 948333273 + ) + int field918; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1224516347 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Lbk;" ) @Export("stream1") RawPcmStream stream1; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -300336185 + ) + int field921; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -718153563 + intValue = -1348614677 ) - int field1095; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1722103043 - ) - int field1096; - @ObfuscatedName("b") + int field922; + @ObfuscatedName("m") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -603753603 + intValue = 57547595 ) - int field1097; - @ObfuscatedName("w") + int field924; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Lbk;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ljg;" + descriptor = "Lkj;" ) @Export("obj") ObjectComposition obj; @@ -108,10 +105,10 @@ public final class ObjectSound extends Node { ObjectSound() { } // L: 27 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "82" + descriptor = "(I)V", + garbageValue = "1410090359" ) @Export("set") void set() { @@ -119,67 +116,146 @@ public final class ObjectSound extends Node { ObjectComposition var2 = this.obj.transform(); // L: 31 if (var2 != null) { // L: 32 this.soundEffectId = var2.ambientSoundId; // L: 33 - this.field1092 = var2.int4 * 128; // L: 34 - this.field1095 = var2.int5; // L: 35 - this.field1096 = var2.int6; // L: 36 - this.soundEffectIds = var2.soundEffectIds; // L: 37 + this.field918 = var2.int4 * 128; // L: 34 + this.field921 = var2.int5; // L: 35 + this.field922 = var2.int6; + this.soundEffectIds = var2.soundEffectIds; } else { - this.soundEffectId = -1; // L: 40 - this.field1092 = 0; // L: 41 - this.field1095 = 0; // L: 42 - this.field1096 = 0; // L: 43 - this.soundEffectIds = null; // L: 44 + this.soundEffectId = -1; + this.field918 = 0; + this.field921 = 0; + this.field922 = 0; + this.soundEffectIds = null; } - if (var1 != this.soundEffectId && this.stream1 != null) { // L: 46 - VarbitComposition.pcmStreamMixer.removeSubStream(this.stream1); // L: 47 - this.stream1 = null; // L: 48 + if (var1 != this.soundEffectId && this.stream1 != null) { + Huffman.pcmStreamMixer.removeSubStream(this.stream1); // L: 47 + this.stream1 = null; } - } // L: 50 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)J", - garbageValue = "-293129030" - ) - public static long method2044(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 52 } - @ObfuscatedName("is") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Lhz;IIIZI)V", - garbageValue = "2024248022" + descriptor = "(B)J", + garbageValue = "0" ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9956 - Widget var6 = var0[var5]; // L: 9957 - if (var6 != null && var6.parentId == var1) { // L: 9958 9959 - WorldMapManager.alignWidgetSize(var6, var2, var3, var4); // L: 9960 - ClientPreferences.alignWidgetPosition(var6, var2, var3); // L: 9961 - if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9962 - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { // L: 9963 - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9964 - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { // L: 9965 - var6.scrollY = 0; - } - - if (var6.type == 0) { // L: 9966 - class182.revalidateWidgetScroll(var0, var6, var4); - } - } + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class378.field4146) { // L: 15 + class378.field4145 += class378.field4146 - var0; // L: 16 } - } // L: 9968 + class378.field4146 = var0; // L: 18 + return var0 + class378.field4145; // L: 19 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)J", + garbageValue = "-23572140" + ) + static long method1798() { + try { + URL var0 = new URL(FontName.method6285("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 + + 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 + } + + 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("o") + @ObfuscatedSignature( + descriptor = "(Lir;Lir;ZIS)V", + garbageValue = "12426" + ) + static void method1796(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (class5.clearLoginScreen) { // L: 128 + if (var3 == 4) { // L: 129 + Login.loginIndex = 4; // L: 130 + } + + } else { + Login.loginIndex = var3; // L: 134 + Rasterizer2D.Rasterizer2D_clear(); // L: 135 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 136 + Client.leftTitleSprite = WorldMapDecorationType.convertJpgToSprite(var4); // L: 137 + ArchiveDiskActionHandler.rightTitleSprite = Client.leftTitleSprite.mirrorHorizontally(); // L: 138 + int var5 = Client.worldProperties; // L: 139 + if ((var5 & 536870912) != 0) { // L: 141 + class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 142 + } else if ((var5 & 1073741824) != 0) { // L: 144 + class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 145 + } else { + class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 148 + } + + TileItem.titleboxSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 151 + Interpreter.titlebuttonSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 152 + Login.runesSprite = Players.method2284(var1, "runes", ""); // L: 153 + class373.title_muteSprite = Players.method2284(var1, "title_mute", ""); // L: 154 + TileItem.options_buttons_0Sprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 155 + UrlRequester.field1400 = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 156 + Skeleton.options_buttons_2Sprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 157 + VarcInt.field3429 = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 158 + class225.field2777 = TileItem.options_buttons_0Sprite.subWidth; // L: 159 + class34.field232 = TileItem.options_buttons_0Sprite.subHeight; // L: 160 + Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 161 + if (var2) { // L: 162 + Login.Login_username = ""; // L: 163 + Login.Login_password = ""; // L: 164 + } + + class139.field1560 = 0; // L: 166 + Bounds.otp = ""; // L: 167 + Login.field1005 = true; // L: 168 + Login.worldSelectOpen = false; // L: 169 + if (!Login.clientPreferences.titleMusicDisabled) { // L: 170 + WorldMapRectangle.method3103(2, class8.archive6, "scape main", "", 255, false); + } else { + PacketWriter.method2368(2); // L: 171 + } + + class246.method4409(false); // L: 172 + class5.clearLoginScreen = true; // L: 173 + Login.xPadding = (InterfaceParent.canvasWidth - 765) / 2; // L: 174 + Login.loginBoxX = Login.xPadding + 202; // L: 175 + GraphicsObject.loginBoxCenter = Login.loginBoxX + 180; // L: 176 + Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 177 + ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 178 + class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 179 + } + } // L: 132 180 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1063868291" + ) + public static boolean method1797(int var0) { + return (var0 >> 20 & 1) != 0; // L: 21 + } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 08c7e60f57..2c2f7beff4 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -2,492 +2,112 @@ import 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("ea") +@ObfuscatedName("fd") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "[Lly;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1869642923 + intValue = 231812381 ) @Export("minTileX") int minTileX; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1553345215 + intValue = 897356107 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -419916701 + intValue = 1764781541 ) @Export("minTileY") int minTileY; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 249944423 + intValue = -1759651047 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1981412121 + intValue = 418466411 ) @Export("type") int type; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -552540519 + intValue = -419810531 ) @Export("minX") int minX; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -558367511 + intValue = 1880707225 ) @Export("maxX") int maxX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 246269295 + intValue = 327372073 ) @Export("minZ") int minZ; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 371713265 + intValue = -1759977967 ) @Export("maxZ") int maxZ; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1905227411 + intValue = -129815607 ) @Export("minY") int minY; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1548952897 + intValue = 2058617869 ) @Export("maxY") int maxY; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -806607637 + intValue = -1358030565 ) - int field1918; - @ObfuscatedName("a") + int field2021; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1254231211 + intValue = 2087386633 ) - int field1920; - @ObfuscatedName("w") + int field2019; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1231922825 + intValue = -263403349 ) - int field1909; - @ObfuscatedName("k") + int field2023; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1302725109 + intValue = 151544725 ) - int field1922; - @ObfuscatedName("i") + int field2024; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 634677509 + intValue = 1510098795 ) - int field1919; - @ObfuscatedName("x") + int field2016; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -321996029 + intValue = -546604535 ) - int field1923; - @ObfuscatedName("f") + int field2012; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1993636743 + intValue = 1373604239 ) - int field1924; + int field2026; Occluder() { } // L: 23 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)Lcq;", - garbageValue = "37280546" - ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; // L: 237 - return Player.getNextWorldListWorld(); // L: 238 - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "809632906" - ) - static int method3447(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 1972 - if (InterfaceParent.friendSystem.field1084 == 0) { // L: 1973 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (InterfaceParent.friendSystem.field1084 == 1) { // L: 1974 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.friendSystem.friendsList.getSize(); // L: 1975 - } - - return 1; // L: 1976 - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1979 - if (InterfaceParent.friendSystem.method1974() && var3 >= 0 && var3 < InterfaceParent.friendSystem.friendsList.getSize()) { // L: 1980 - Friend var8 = (Friend)InterfaceParent.friendSystem.friendsList.get(var3); // L: 1981 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); // L: 1982 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 1983 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1986 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1987 - } - - return 1; // L: 1989 - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1992 - if (InterfaceParent.friendSystem.method1974() && var3 >= 0 && var3 < InterfaceParent.friendSystem.friendsList.getSize()) { // L: 1993 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.friendSystem.friendsList.get(var3)).world; // L: 1994 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1996 - } - - return 1; // L: 1997 - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2000 - if (InterfaceParent.friendSystem.method1974() && var3 >= 0 && var3 < InterfaceParent.friendSystem.friendsList.getSize()) { // L: 2001 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.friendSystem.friendsList.get(var3)).rank; // L: 2002 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2004 - } - - return 1; // L: 2005 - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2008 - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2009 - GrandExchangeOfferTotalQuantityComparator.method163(var5, var6); // L: 2010 - return 1; // L: 2011 - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2014 - InterfaceParent.friendSystem.addFriend(var5); // L: 2015 - return 1; // L: 2016 - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2019 - InterfaceParent.friendSystem.removeFriend(var5); // L: 2020 - return 1; // L: 2021 - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2024 - InterfaceParent.friendSystem.addIgnore(var5); // L: 2025 - return 1; // L: 2026 - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2029 - InterfaceParent.friendSystem.removeIgnore(var5); // L: 2030 - return 1; // L: 2031 - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2034 - var5 = Calendar.method4153(var5); // L: 2035 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.friendSystem.isFriended(new Username(var5, Message.loginType), false) ? 1 : 0; // L: 2036 - return 1; // L: 2037 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (WorldMapID.clanChat != null) { // L: 2040 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapID.clanChat.name; // L: 2041 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2043 - } - - return 1; // L: 2044 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (WorldMapID.clanChat != null) { // L: 2047 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.clanChat.getSize(); // L: 2048 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2050 - } - - return 1; // L: 2051 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2054 - if (WorldMapID.clanChat != null && var3 < WorldMapID.clanChat.getSize()) { // L: 2055 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapID.clanChat.get(var3).getUsername().getName(); // L: 2056 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2058 - } - - return 1; // L: 2059 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2062 - if (WorldMapID.clanChat != null && var3 < WorldMapID.clanChat.getSize()) { // L: 2063 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)WorldMapID.clanChat.get(var3)).getWorld(); // L: 2064 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2066 - } - - return 1; // L: 2067 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2070 - if (WorldMapID.clanChat != null && var3 < WorldMapID.clanChat.getSize()) { // L: 2071 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)WorldMapID.clanChat.get(var3)).rank; // L: 2072 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2074 - } - - return 1; // L: 2075 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.clanChat != null ? WorldMapID.clanChat.minKick : 0; // L: 2078 - return 1; // L: 2079 - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2082 - PacketWriter.clanKickUser(var5); // L: 2083 - return 1; // L: 2084 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.clanChat != null ? WorldMapID.clanChat.rank * 1770422849 * 1364889025 : 0; // L: 2087 - return 1; // L: 2088 - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2091 - VarbitComposition.Clan_joinChat(var5); // L: 2092 - return 1; // L: 2093 - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - Canvas.Clan_leaveChat(); // L: 2096 - return 1; // L: 2097 - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!InterfaceParent.friendSystem.method1974()) { // L: 2100 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.friendSystem.ignoreList.getSize(); // L: 2101 - } - - return 1; // L: 2102 - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2105 - if (InterfaceParent.friendSystem.method1974() && var3 >= 0 && var3 < InterfaceParent.friendSystem.ignoreList.getSize()) { // L: 2106 - Ignored var4 = (Ignored)InterfaceParent.friendSystem.ignoreList.get(var3); // L: 2107 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2108 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2109 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2112 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2113 - } - - return 1; // L: 2115 - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2118 - var5 = Calendar.method4153(var5); // L: 2119 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.friendSystem.isIgnored(new Username(var5, Message.loginType)) ? 1 : 0; // L: 2120 - return 1; // L: 2121 - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2124 - if (WorldMapID.clanChat != null && var3 < WorldMapID.clanChat.getSize() && WorldMapID.clanChat.get(var3).getUsername().equals(UserComparator9.localPlayer.username)) { // L: 2125 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2126 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2128 - } - - return 1; // L: 2129 - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (WorldMapID.clanChat != null && WorldMapID.clanChat.owner != null) { // L: 2132 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapID.clanChat.owner; // L: 2133 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2135 - } - - return 1; // L: 2136 - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2139 - if (WorldMapID.clanChat != null && var3 < WorldMapID.clanChat.getSize() && ((ClanMate)WorldMapID.clanChat.get(var3)).isFriend()) { // L: 2140 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2141 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2143 - } - - return 1; // L: 2144 - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - InterfaceParent.friendSystem.friendsList.removeComparator(); // L: 2155 - return 1; // L: 2156 - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2159 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2160 - return 1; // L: 2161 - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2164 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2165 - return 1; // L: 2166 - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2169 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2170 - return 1; // L: 2171 - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2174 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2175 - return 1; // L: 2176 - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2179 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2180 - return 1; // L: 2181 - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2184 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2185 - return 1; // L: 2186 - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2189 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2190 - return 1; // L: 2191 - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2194 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2195 - return 1; // L: 2196 - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2199 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2200 - return 1; // L: 2201 - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2204 - InterfaceParent.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2205 - return 1; // L: 2206 - } else if (var0 == 3639) { - InterfaceParent.friendSystem.friendsList.sort(); // L: 2209 - return 1; // L: 2210 - } else if (var0 == 3640) { - InterfaceParent.friendSystem.ignoreList.removeComparator(); // L: 2213 - return 1; // L: 2214 - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2217 - InterfaceParent.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2218 - return 1; // L: 2219 - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2222 - InterfaceParent.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2223 - return 1; // L: 2224 - } else if (var0 == 3643) { - InterfaceParent.friendSystem.ignoreList.sort(); // L: 2227 - return 1; // L: 2228 - } else if (var0 == 3644) { - if (WorldMapID.clanChat != null) { // L: 2231 - WorldMapID.clanChat.removeComparator(); // L: 2232 - } - - return 1; // L: 2234 - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2237 - if (WorldMapID.clanChat != null) { // L: 2238 - WorldMapID.clanChat.addComparator(new UserComparator1(var7)); // L: 2239 - } - - return 1; // L: 2241 - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2244 - if (WorldMapID.clanChat != null) { // L: 2245 - WorldMapID.clanChat.addComparator(new UserComparator2(var7)); // L: 2246 - } - - return 1; // L: 2248 - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2251 - if (WorldMapID.clanChat != null) { // L: 2252 - WorldMapID.clanChat.addComparator(new UserComparator3(var7)); // L: 2253 - } - - return 1; // L: 2255 - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2258 - if (WorldMapID.clanChat != null) { // L: 2259 - WorldMapID.clanChat.addComparator(new UserComparator4(var7)); // L: 2260 - } - - return 1; // L: 2262 - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2265 - if (WorldMapID.clanChat != null) { // L: 2266 - WorldMapID.clanChat.addComparator(new UserComparator5(var7)); // L: 2267 - } - - return 1; // L: 2269 - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2272 - if (WorldMapID.clanChat != null) { // L: 2273 - WorldMapID.clanChat.addComparator(new UserComparator6(var7)); // L: 2274 - } - - return 1; // L: 2276 - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2279 - if (WorldMapID.clanChat != null) { // L: 2280 - WorldMapID.clanChat.addComparator(new UserComparator7(var7)); // L: 2281 - } - - return 1; // L: 2283 - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2286 - if (WorldMapID.clanChat != null) { // L: 2287 - WorldMapID.clanChat.addComparator(new UserComparator8(var7)); // L: 2288 - } - - return 1; // L: 2290 - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2293 - if (WorldMapID.clanChat != null) { // L: 2294 - WorldMapID.clanChat.addComparator(new UserComparator9(var7)); // L: 2295 - } - - return 1; // L: 2297 - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2300 - if (WorldMapID.clanChat != null) { // L: 2301 - WorldMapID.clanChat.addComparator(new UserComparator10(var7)); // L: 2302 - } - - return 1; // L: 2304 - } else if (var0 == 3655) { - if (WorldMapID.clanChat != null) { // L: 2307 - WorldMapID.clanChat.sort(); // L: 2308 - } - - return 1; // L: 2310 - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2313 - InterfaceParent.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2314 - return 1; // L: 2315 - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2318 - if (WorldMapID.clanChat != null) { // L: 2319 - WorldMapID.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2320 - } - - return 1; // L: 2322 - } else { - return 2; // L: 2324 - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2147 - if (WorldMapID.clanChat != null && var3 < WorldMapID.clanChat.getSize() && ((ClanMate)WorldMapID.clanChat.get(var3)).isIgnored()) { // L: 2148 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2149 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2151 - } - - return 1; // L: 2152 - } - } - } - } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index a26c86dfcf..b34e0d8a3a 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -3,87 +3,88 @@ 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("kd") +@ObfuscatedName("nk") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("v") - static final int[] field3738; - @ObfuscatedName("n") + @ObfuscatedName("o") + static final int[] field4149; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Loy;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1273165901 + intValue = 1837417315 ) @Export("bitIndex") int bitIndex; static { - field3738 = 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 + field4149 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7 } public PacketBuffer(int var1) { - super(var1); // L: 11 + super(var1); } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-20223224" + descriptor = "([IB)V", + garbageValue = "87" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); // L: 15 } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lmw;B)V", - garbageValue = "-10" + descriptor = "(Loy;B)V", + garbageValue = "1" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; // L: 19 } // L: 20 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "31106" + descriptor = "(IB)V", + garbageValue = "2" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 } // L: 24 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "150314526" + descriptor = "(B)I", + garbageValue = "94" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1479248666" + garbageValue = "-689040710" ) - public boolean method5634() { - int var1 = super.array[super.offset] - this.isaacCipher.method6474() & 255; // L: 31 + public boolean method6529() { + int var1 = super.array[super.offset] - this.isaacCipher.method7100() & 255; // L: 31 return var1 >= 128; // L: 32 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "726838641" + descriptor = "(B)I", + garbageValue = "-114" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { @@ -91,32 +92,32 @@ public class PacketBuffer extends Buffer { return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([BIIS)V", - garbageValue = "-3177" + descriptor = "([BIII)V", + garbageValue = "990689178" ) - public void method5642(byte[] var1, int var2, int var3) { + public void method6530(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("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1484486196" + garbageValue = "1082258734" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; // L: 47 } // L: 48 - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-102" + descriptor = "(II)I", + garbageValue = "1718914740" ) @Export("readBits") public int readBits(int var1) { @@ -125,36 +126,195 @@ public class PacketBuffer extends Buffer { int var4 = 0; // L: 53 for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 - var4 += (super.array[var2++] & field3738[var3]) << var1 - var3; // L: 56 + var4 += (super.array[var2++] & field4149[var3]) << var1 - var3; // L: 56 var1 -= var3; // L: 57 } if (var3 == var1) { // L: 60 - var4 += super.array[var2] & field3738[var3]; + var4 += super.array[var2] & field4149[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3738[var1]; // L: 61 + var4 += super.array[var2] >> var3 - var1 & field4149[var1]; // L: 61 } return var4; // L: 62 } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1519575230" + garbageValue = "1142217359" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; // L: 66 } // L: 67 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "716997837" + garbageValue = "1244745268" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; // L: 70 } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)Let;", + garbageValue = "-1779924577" + ) + public static Clock method6523() { + try { + return new NanoClock(); // L: 8 + } catch (Throwable var1) { // L: 10 + return new MilliClock(); // L: 11 + } + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1312881118" + ) + static int method6559(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2603 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2604 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2605 + return 1; // L: 2606 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2608 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2609 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2610 + return 1; // L: 2611 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2613 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2614 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2615 + return 1; // L: 2616 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2618 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2619 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2620 + return 1; // L: 2621 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2623 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2624 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2625 + return 1; // L: 2626 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2628 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2629 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2630 + return 1; // L: 2631 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2633 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2634 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2635 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2636 + return 1; // L: 2637 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2639 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2640 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2641 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2642 + return 1; // L: 2643 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2645 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2646 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2647 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2648 + return 1; // L: 2649 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2651 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2652 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2653 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2654 + return 1; // L: 2655 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2657 + var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2658 + if (Calendar.grandExchangeEvents != null) { // L: 2659 + Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2660 + } + + return 1; // L: 2662 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2664 + var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2665 + if (Calendar.grandExchangeEvents != null) { // L: 2666 + Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2667 + } + + return 1; // L: 2669 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2671 + class16.Interpreter_intStackSize -= 2; // L: 2672 + var12 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] == 1; // L: 2673 + boolean var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 2674 + if (Calendar.grandExchangeEvents != null) { // L: 2675 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2676 + Calendar.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2677 + } + + return 1; // L: 2679 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2681 + var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2682 + if (Calendar.grandExchangeEvents != null) { // L: 2683 + Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2684 + } + + return 1; // L: 2686 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2688 + var12 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2689 + if (Calendar.grandExchangeEvents != null) { // L: 2690 + Calendar.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2691 + } + + return 1; // L: 2693 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2695 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Calendar.grandExchangeEvents == null ? 0 : Calendar.grandExchangeEvents.events.size(); // L: 2696 + return 1; // L: 2697 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2699 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2700 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2701 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.world; // L: 2702 + return 1; // L: 2703 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2705 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2706 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2707 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2708 + return 1; // L: 2709 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2711 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2712 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2713 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2714 + return 1; // L: 2715 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2717 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2718 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2719 + long var5 = ObjectSound.currentTimeMillis() - HealthBarUpdate.field1272 - var4.age; // L: 2720 + int var7 = (int)(var5 / 3600000L); // L: 2721 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2722 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2723 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2724 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; // L: 2725 + return 1; // L: 2726 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2728 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2729 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2730 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2731 + return 1; // L: 2732 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2734 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2735 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2736 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2737 + return 1; // L: 2738 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2740 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2741 + var4 = (GrandExchangeEvent)Calendar.grandExchangeEvents.events.get(var3); // L: 2742 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2743 + return 1; // L: 2744 + } else { + return 2; // L: 2746 + } + } + } + } + } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 751b7482fd..43533ae937 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,42 +4,47 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gy") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "[Lgk;" + descriptor = "[Lgy;" ) @Export("PacketBufferNode_packetBufferNodes") - public static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("h") + static PacketBufferNode[] PacketBufferNode_packetBufferNodes; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -547850915 + intValue = 1286692403 ) @Export("PacketBufferNode_packetBufferNodeCount") - public static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("n") + static int PacketBufferNode_packetBufferNodeCount; + @ObfuscatedName("dr") + @ObfuscatedGetter( + longValue = 2196332218574994447L + ) + static long field2348; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgx;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("v") + ClientPacket clientPacket; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 60073813 + intValue = -1793898605 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("d") + int clientPacketLength; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lnk;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -646251635 + intValue = 356559831 ) @Export("index") public int index; @@ -49,15 +54,117 @@ public class PacketBufferNode extends Node { PacketBufferNode_packetBufferNodeCount = 0; // L: 14 } - @ObfuscatedName("v") + PacketBufferNode() { + } // L: 19 + + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2134338868" + garbageValue = "-546801970" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 45 - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 46 + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 58 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 59 } - } // L: 47 + } // L: 60 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;IIIZI)V", + garbageValue = "-1085289699" + ) + public static void method3898(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class210.musicPlayerStatus = 1; // L: 26 + class210.musicTrackArchive = var0; // L: 27 + FaceNormal.musicTrackGroupId = var1; // L: 28 + WorldMapID.musicTrackFileId = var2; // L: 29 + class375.musicTrackVolume = var3; // L: 30 + class210.musicTrackBoolean = var4; // L: 31 + class1.pcmSampleLength = 10000; // L: 32 + } // L: 33 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(ZZB)I", + garbageValue = "1" + ) + public static int method3896(boolean var0, boolean var1) { + byte var2 = 0; // L: 264 + int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 265 + return var3; // L: 266 + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "387339011" + ) + static final void method3888() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6848 6849 6892 + if (var0.hitpoints > 0) { // L: 6850 + --var0.hitpoints; + } + + boolean var1; + int var2; + int var3; + ObjectComposition var4; + if (var0.hitpoints == 0) { // L: 6851 + if (var0.objectId >= 0) { // L: 6853 + var2 = var0.objectId; // L: 6855 + var3 = var0.field1203; // L: 6856 + var4 = class19.getObjectDefinition(var2); // L: 6858 + if (var3 == 11) { // L: 6859 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 6860 + var3 = 4; + } + + var1 = var4.method5173(var3); // L: 6861 + if (!var1) { // L: 6863 + continue; + } + } + + class7.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1199, var0.field1203); // L: 6865 + var0.remove(); // L: 6866 + } else { + if (var0.delay > 0) { // L: 6870 + --var0.delay; + } + + if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 6871 + if (var0.id >= 0) { // L: 6873 + var2 = var0.id; // L: 6875 + var3 = var0.field1196; // L: 6876 + var4 = class19.getObjectDefinition(var2); // L: 6878 + if (var3 == 11) { // L: 6879 + var3 = 10; + } + + if (var3 >= 5 && var3 <= 8) { // L: 6880 + var3 = 4; + } + + var1 = var4.method5173(var3); // L: 6881 + if (!var1) { // L: 6883 + continue; + } + } + + class7.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1196); // L: 6885 + var0.delay = -1; // L: 6886 + if (var0.objectId == var0.id && var0.objectId == -1) { // L: 6887 + var0.remove(); + } else if (var0.id == var0.objectId && var0.orientation == var0.field1199 && var0.field1196 == var0.field1203) { // L: 6888 + var0.remove(); + } + } + } + } + + } // L: 6894 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 2a643ae248..00d5df59ca 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,85 +5,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dx") +@ObfuscatedName("dn") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("n") + @ObfuscatedName("jx") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lhu;" + ) + static Widget field1394; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lli;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljc;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1444259663 + intValue = -1424950051 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lnu;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lmw;" + descriptor = "Loy;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkd;" + descriptor = "Lnk;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1918231479 + intValue = -408097885 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("q") - boolean field1327; + @ObfuscatedName("h") + boolean field1388; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1141971331 + ) + int field1391; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 2141926027 - ) - int field1330; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1260062843 + intValue = -1591339787 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - ServerPacket field1331; - @ObfuscatedName("a") + ServerPacket field1381; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - ServerPacket field1333; - @ObfuscatedName("w") + ServerPacket field1392; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - ServerPacket field1334; + ServerPacket field1393; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); // L: 15 @@ -92,15 +97,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); // L: 19 this.serverPacket = null; // L: 20 this.serverPacketLength = 0; // L: 21 - this.field1327 = true; // L: 22 - this.field1330 = 0; // L: 23 + this.field1388 = true; + this.field1391 = 0; // L: 23 this.pendingWrites = 0; // L: 24 } // L: 29 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-126347974" + descriptor = "(B)V", + garbageValue = "5" ) @Export("clearBuffer") final void clearBuffer() { @@ -108,10 +113,10 @@ public class PacketWriter { this.bufferSize = 0; // L: 33 } // L: 34 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "523459495" + descriptor = "(B)V", + garbageValue = "18" ) @Export("flush") final void flush() throws IOException { @@ -136,33 +141,33 @@ public class PacketWriter { } // L: 52 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lgk;I)V", - garbageValue = "-315377283" + descriptor = "(Lgy;B)V", + garbageValue = "95" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { this.packetBufferNodes.addFirst(var1); // L: 55 var1.index = var1.packetBuffer.offset; // L: 56 var1.packetBuffer.offset = 0; // L: 57 - this.bufferSize += var1.index; // L: 58 - } // L: 59 + this.bufferSize += var1.index; + } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lls;I)V", - garbageValue = "-1829169841" + descriptor = "(Lli;I)V", + garbageValue = "949465191" ) @Export("setSocket") void setSocket(AbstractSocket var1) { - this.socket = var1; // L: 62 - } // L: 63 + this.socket = var1; + } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1622261099" + descriptor = "(B)V", + garbageValue = "-76" ) @Export("close") void close() { @@ -173,361 +178,47 @@ public class PacketWriter { } // L: 70 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1730600275" + descriptor = "(B)V", + garbageValue = "-80" ) @Export("removeSocket") void removeSocket() { this.socket = null; // L: 73 } // L: 74 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Lls;", - garbageValue = "-1714919219" + descriptor = "(I)Lli;", + garbageValue = "-99883679" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; // L: 77 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lby;I)V", - garbageValue = "1366873098" + descriptor = "(B)[Lgc;", + garbageValue = "22" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - GrandExchangeOfferWorldComparator.runScript(var0, 500000); // L: 99 - } // L: 100 + static LoginPacket[] method2386() { + return new LoginPacket[]{LoginPacket.field2449, LoginPacket.field2450, LoginPacket.field2454, LoginPacket.field2452, LoginPacket.field2451, LoginPacket.field2456}; // L: 22 + } - @ObfuscatedName("hf") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lgs;I)V", - garbageValue = "-718074338" + descriptor = "(IB)V", + garbageValue = "35" ) - static final void method2429(class194 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6977 - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - if (class194.field2354 == var0) { // L: 6978 - var2 = var1.method5720(); // L: 6979 - var3 = var2 >> 2; // L: 6980 - var4 = var2 & 3; // L: 6981 - var5 = Client.field724[var3]; // L: 6982 - var6 = var1.readUnsignedByte(); // L: 6983 - var7 = (var6 >> 4 & 7) + GrandExchangeEvent.field82; // L: 6984 - var8 = (var6 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 6985 - var9 = var1.method5727(); // L: 6986 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6987 - Canvas.updatePendingSpawn(class90.Client_plane, var7, var8, var5, var9, var3, var4, 0, -1); // L: 6988 - } - - } else if (class194.field2347 == var0) { // L: 6992 - var2 = var1.method5729(); // L: 6993 - var3 = var1.readUnsignedByte(); // L: 6994 - var4 = var1.readUnsignedShort(); // L: 6995 - var5 = var1.method5776(); // L: 6996 - var6 = (var5 >> 4 & 7) + GrandExchangeEvent.field82; // L: 6997 - var7 = (var5 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 6998 - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6999 - var6 = var6 * 128 + 64; // L: 7000 - var7 = var7 * 128 + 64; // L: 7001 - GraphicsObject var44 = new GraphicsObject(var2, class90.Client_plane, var6, var7, WorldMapRegion.getTileHeight(var6, var7, class90.Client_plane) - var3, var4, Client.cycle); // L: 7002 - Client.graphicsObjects.addFirst(var44); // L: 7003 - } - - } else { - TileItem var35; - if (class194.field2348 == var0) { // L: 7007 - var2 = var1.method5717(); // L: 7008 - var3 = (var2 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7009 - var4 = (var2 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7010 - var5 = var1.readUnsignedShort(); // L: 7011 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7012 - NodeDeque var36 = Client.groundItems[class90.Client_plane][var3][var4]; // L: 7013 - if (var36 != null) { // L: 7014 - for (var35 = (TileItem)var36.last(); var35 != null; var35 = (TileItem)var36.previous()) { // L: 7015 7016 7021 - if ((var5 & 32767) == var35.id) { // L: 7017 - var35.remove(); // L: 7018 - break; - } - } - - if (var36.last() == null) { // L: 7023 - Client.groundItems[class90.Client_plane][var3][var4] = null; - } - - HitSplatDefinition.updateItemPile(var3, var4); // L: 7024 - } - } - - } else { - int var10; - if (class194.field2346 == var0) { // L: 7029 - var2 = var1.method5728(); // L: 7030 - var3 = var1.method5720(); // L: 7031 - var4 = (var3 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7032 - var5 = (var3 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7033 - var6 = var1.readUnsignedByte(); // L: 7034 - var7 = var6 >> 4 & 15; // L: 7035 - var8 = var6 & 7; // L: 7036 - var9 = var1.method5717(); // L: 7037 - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7038 - var10 = var7 + 1; // L: 7039 - if (UserComparator9.localPlayer.pathX[0] >= var4 - var10 && UserComparator9.localPlayer.pathX[0] <= var4 + var10 && UserComparator9.localPlayer.pathY[0] >= var5 - var10 && UserComparator9.localPlayer.pathY[0] <= var5 + var10 && WorldMapSectionType.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 7040 7041 - Client.soundEffectIds[Client.soundEffectCount] = var2; // L: 7042 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 7043 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; // L: 7044 - Client.soundEffects[Client.soundEffectCount] = null; // L: 7045 - Client.soundLocations[Client.soundEffectCount] = var7 + (var5 << 8) + (var4 << 16); // L: 7046 - ++Client.soundEffectCount; // L: 7047 - } - } - } - - if (class194.field2356 == var0) { // L: 7052 - var2 = var1.method5729(); // L: 7053 - var3 = var1.method5728(); // L: 7054 - var4 = var1.readUnsignedByte(); // L: 7055 - var5 = (var4 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7056 - var6 = (var4 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7057 - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7058 - var35 = new TileItem(); // L: 7059 - var35.id = var2; // L: 7060 - var35.quantity = var3; // L: 7061 - if (Client.groundItems[class90.Client_plane][var5][var6] == null) { // L: 7062 - Client.groundItems[class90.Client_plane][var5][var6] = new NodeDeque(); - } - - Client.groundItems[class90.Client_plane][var5][var6].addFirst(var35); // L: 7063 - HitSplatDefinition.updateItemPile(var5, var6); // L: 7064 - } - - } else { - int var11; - int var12; - int var14; - if (class194.field2352 == var0) { // L: 7068 - var2 = var1.method5776(); // L: 7069 - var3 = var1.method5717() * 4; // L: 7070 - var4 = var1.method5731(); // L: 7071 - var5 = var1.method5729(); // L: 7072 - byte var38 = var1.method5747(); // L: 7073 - var7 = var1.readUnsignedShort(); // L: 7074 - var8 = var1.method5776() * 4; // L: 7075 - byte var39 = var1.method5722(); // L: 7076 - var10 = var1.method5776(); // L: 7077 - var11 = var1.method5729(); // L: 7078 - var12 = var1.method5717(); // L: 7079 - int var40 = (var12 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7080 - var14 = (var12 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7081 - var6 = var38 + var40; // L: 7082 - var9 = var39 + var14; // L: 7083 - if (var40 >= 0 && var14 >= 0 && var40 < 104 && var14 < 104 && var6 >= 0 && var9 >= 0 && var6 < 104 && var9 < 104 && var5 != 65535) { // L: 7084 - var40 = var40 * 128 + 64; // L: 7085 - var14 = var14 * 128 + 64; // L: 7086 - var6 = var6 * 128 + 64; // L: 7087 - var9 = var9 * 128 + 64; // L: 7088 - Projectile var34 = new Projectile(var5, class90.Client_plane, var40, var14, WorldMapRegion.getTileHeight(var40, var14, class90.Client_plane) - var3, var7 + Client.cycle, var11 + Client.cycle, var10, var2, var4, var8); // L: 7089 - var34.setDestination(var6, var9, WorldMapRegion.getTileHeight(var6, var9, class90.Client_plane) - var8, var7 + Client.cycle); // L: 7090 - Client.projectiles.addFirst(var34); // L: 7091 - } - - } else if (class194.field2351 == var0) { // L: 7095 - var2 = var1.readUnsignedByte(); // L: 7096 - var3 = (var2 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7097 - var4 = (var2 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7098 - var5 = var1.method5727(); // L: 7099 - var6 = var1.method5727(); // L: 7100 - var7 = var1.method5727(); // L: 7101 - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7102 - NodeDeque var32 = Client.groundItems[class90.Client_plane][var3][var4]; // L: 7103 - if (var32 != null) { // L: 7104 - for (TileItem var33 = (TileItem)var32.last(); var33 != null; var33 = (TileItem)var32.previous()) { // L: 7105 7106 7111 - if ((var7 & 32767) == var33.id && var5 == var33.quantity) { // L: 7107 - var33.quantity = var6; // L: 7108 - break; - } - } - - HitSplatDefinition.updateItemPile(var3, var4); // L: 7113 - } - } - - } else if (class194.field2353 == var0) { // L: 7118 - var2 = var1.method5717(); // L: 7119 - var3 = var2 >> 2; // L: 7120 - var4 = var2 & 3; // L: 7121 - var5 = Client.field724[var3]; // L: 7122 - var6 = var1.method5729(); // L: 7123 - var7 = var1.readUnsignedByte(); // L: 7124 - var8 = (var7 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7125 - var9 = (var7 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7126 - if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) { // L: 7127 - if (var5 == 0) { // L: 7128 - BoundaryObject var31 = MilliClock.scene.method3351(class90.Client_plane, var8, var9); // L: 7129 - if (var31 != null) { // L: 7130 - var11 = class25.Entity_unpackID(var31.tag); // L: 7131 - if (var3 == 2) { // L: 7132 - var31.renderable1 = new DynamicObject(var11, 2, var4 + 4, class90.Client_plane, var8, var9, var6, false, var31.renderable1); // L: 7133 - var31.renderable2 = new DynamicObject(var11, 2, var4 + 1 & 3, class90.Client_plane, var8, var9, var6, false, var31.renderable2); // L: 7134 - } else { - var31.renderable1 = new DynamicObject(var11, var3, var4, class90.Client_plane, var8, var9, var6, false, var31.renderable1); // L: 7136 - } - } - } - - if (var5 == 1) { // L: 7139 - WallDecoration var41 = MilliClock.scene.method3264(class90.Client_plane, var8, var9); // L: 7140 - if (var41 != null) { // L: 7141 - var11 = class25.Entity_unpackID(var41.tag); // L: 7142 - if (var3 != 4 && var3 != 5) { // L: 7143 - if (var3 == 6) { // L: 7144 - var41.renderable1 = new DynamicObject(var11, 4, var4 + 4, class90.Client_plane, var8, var9, var6, false, var41.renderable1); - } else if (var3 == 7) { // L: 7145 - var41.renderable1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, class90.Client_plane, var8, var9, var6, false, var41.renderable1); - } else if (var3 == 8) { // L: 7146 - var41.renderable1 = new DynamicObject(var11, 4, var4 + 4, class90.Client_plane, var8, var9, var6, false, var41.renderable1); // L: 7147 - var41.renderable2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, class90.Client_plane, var8, var9, var6, false, var41.renderable2); // L: 7148 - } - } else { - var41.renderable1 = new DynamicObject(var11, 4, var4, class90.Client_plane, var8, var9, var6, false, var41.renderable1); - } - } - } - - if (var5 == 2) { // L: 7152 - GameObject var42 = MilliClock.scene.method3385(class90.Client_plane, var8, var9); // L: 7153 - if (var3 == 11) { // L: 7154 - var3 = 10; - } - - if (var42 != null) { // L: 7155 - var42.renderable = new DynamicObject(class25.Entity_unpackID(var42.tag), var3, var4, class90.Client_plane, var8, var9, var6, false, var42.renderable); - } - } - - if (var5 == 3) { // L: 7157 - FloorDecoration var43 = MilliClock.scene.getFloorDecoration(class90.Client_plane, var8, var9); // L: 7158 - if (var43 != null) { // L: 7159 - var43.renderable = new DynamicObject(class25.Entity_unpackID(var43.tag), 22, var4, class90.Client_plane, var8, var9, var6, false, var43.renderable); - } - } - } - - } else if (class194.field2355 == var0) { // L: 7164 - var2 = var1.method5717(); // L: 7165 - var3 = var2 >> 2; // L: 7166 - var4 = var2 & 3; // L: 7167 - var5 = Client.field724[var3]; // L: 7168 - var6 = var1.method5720(); // L: 7169 - var7 = (var6 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7170 - var8 = (var6 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7171 - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7172 - Canvas.updatePendingSpawn(class90.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 7173 - } - - } else { - if (class194.field2350 == var0) { // L: 7177 - var2 = var1.method5729(); // L: 7178 - var3 = var1.method5720(); // L: 7179 - var4 = var3 >> 2; // L: 7180 - var5 = var3 & 3; // L: 7181 - var6 = Client.field724[var4]; // L: 7182 - byte var37 = var1.method5722(); // L: 7183 - var8 = var1.method5727(); // L: 7184 - var9 = var1.method5720(); // L: 7185 - var10 = (var9 >> 4 & 7) + GrandExchangeEvent.field82; // L: 7186 - var11 = (var9 & 7) + GrandExchangeOfferUnitPriceComparator.field103; // L: 7187 - var12 = var1.readUnsignedShort(); // L: 7188 - byte var13 = var1.method5722(); // L: 7189 - var14 = var1.method5727(); // L: 7190 - byte var15 = var1.method5721(); // L: 7191 - byte var16 = var1.readByte(); // L: 7192 - Player var17; - if (var14 == Client.localPlayerIndex) { // L: 7194 - var17 = UserComparator9.localPlayer; - } else { - var17 = Client.players[var14]; // L: 7195 - } - - if (var17 != null) { // L: 7196 - ObjectComposition var18 = WorldMapAreaData.getObjectDefinition(var12); // L: 7197 - int var19; - int var20; - if (var5 != 1 && var5 != 3) { // L: 7200 - var19 = var18.sizeX; // L: 7205 - var20 = var18.sizeY; // L: 7206 - } else { - var19 = var18.sizeY; // L: 7201 - var20 = var18.sizeX; // L: 7202 - } - - int var21 = var10 + (var19 >> 1); // L: 7208 - int var22 = var10 + (var19 + 1 >> 1); // L: 7209 - int var23 = var11 + (var20 >> 1); // L: 7210 - int var24 = var11 + (var20 + 1 >> 1); // L: 7211 - int[][] var25 = Tiles.Tiles_heights[class90.Client_plane]; // L: 7212 - int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 7213 - int var27 = (var10 << 7) + (var19 << 6); // L: 7214 - int var28 = (var11 << 7) + (var20 << 6); // L: 7215 - Model var29 = var18.getModel(var4, var5, var25, var27, var26, var28); // L: 7216 - if (var29 != null) { // L: 7217 - Canvas.updatePendingSpawn(class90.Client_plane, var10, var11, var6, -1, 0, 0, var8 + 1, var2 + 1); // L: 7218 - var17.animationCycleStart = var8 + Client.cycle; // L: 7219 - var17.animationCycleEnd = var2 + Client.cycle; // L: 7220 - var17.model0 = var29; // L: 7221 - var17.field637 = var19 * 64 + var10 * 128; // L: 7222 - var17.field639 = var20 * 64 + var11 * 128; // L: 7223 - var17.tileHeight2 = var26; // L: 7224 - byte var30; - if (var15 > var13) { // L: 7225 - var30 = var15; // L: 7226 - var15 = var13; // L: 7227 - var13 = var30; // L: 7228 - } - - if (var16 > var37) { // L: 7230 - var30 = var16; // L: 7231 - var16 = var37; // L: 7232 - var37 = var30; // L: 7233 - } - - var17.minX = var10 + var15; // L: 7235 - var17.maxX = var10 + var13; // L: 7236 - var17.minY = var11 + var16; // L: 7237 - var17.maxY = var11 + var37; // L: 7238 - } - } - } - - } - } - } - } - } // L: 6990 7005 7027 7066 7093 7116 7162 7175 7242 - - @ObfuscatedName("kj") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "216002934" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (WorldMapID.clanChat != null) { // L: 11450 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); // L: 11451 - var1.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var0)); // L: 11452 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11453 - Client.packetWriter.addNode(var1); // L: 11454 - } - } // L: 11455 + public static void method2368(int var0) { + class210.musicPlayerStatus = 1; // L: 58 + class210.musicTrackArchive = null; // L: 59 + FaceNormal.musicTrackGroupId = -1; // L: 60 + WorldMapID.musicTrackFileId = -1; // L: 61 + class375.musicTrackVolume = 0; // L: 62 + class210.musicTrackBoolean = false; // L: 63 + class1.pcmSampleLength = var0; // L: 64 + } // L: 65 } diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java index 332399fdd9..a1f4e1abef 100644 --- a/runescape-client/src/main/java/ParamComposition.java +++ b/runescape-client/src/main/java/ParamComposition.java @@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("kz") @Implements("ParamComposition") public class ParamComposition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("ParamDefinition_archive") static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("ParamDefinition_cached") public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("type") char type; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -551037179 + intValue = 1078497239 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("autoDisable") boolean autoDisable; @@ -43,19 +43,19 @@ public class ParamComposition extends DualNode { this.autoDisable = true; // L: 16 } // L: 18 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1000046844" + garbageValue = "-1223154324" ) @Export("postDecode") void postDecode() { } // L: 35 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "1362546091" + descriptor = "(Lnu;B)V", + garbageValue = "-36" ) @Export("decode") void decode(Buffer var1) { @@ -69,10 +69,10 @@ public class ParamComposition extends DualNode { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "1500921565" + descriptor = "(Lnu;II)V", + garbageValue = "1477627389" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -84,7 +84,7 @@ public class ParamComposition extends DualNode { } if (var5 >= 128 && var5 < 160) { // L: 52 - char var6 = class298.cp1252AsciiExtension[var5 - 128]; // L: 53 + char var6 = class300.cp1252AsciiExtension[var5 - 128]; // L: 53 if (var6 == 0) { // L: 54 var6 = '?'; } @@ -104,48 +104,22 @@ public class ParamComposition extends DualNode { } // L: 65 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "31310" + descriptor = "(I)Z", + garbageValue = "206427050" ) @Export("isString") public boolean isString() { - return this.type == 's'; // L: 68 + return this.type == 's'; } - @ObfuscatedName("gc") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1478943473" + descriptor = "(I)V", + garbageValue = "1027659488" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4883 - int var3 = WorldMapRegion.getTileHeight(var0, var1, class90.Client_plane) - var2; // L: 4888 - var0 -= SecureRandomFuture.cameraX; // L: 4889 - var3 -= ArchiveLoader.cameraY; // L: 4890 - var1 -= ObjectSound.cameraZ; // L: 4891 - int var4 = Rasterizer3D.Rasterizer3D_sine[KeyHandler.cameraPitch]; // L: 4892 - int var5 = Rasterizer3D.Rasterizer3D_cosine[KeyHandler.cameraPitch]; // L: 4893 - int var6 = Rasterizer3D.Rasterizer3D_sine[class39.cameraYaw]; // L: 4894 - int var7 = Rasterizer3D.Rasterizer3D_cosine[class39.cameraYaw]; // L: 4895 - int var8 = var6 * var1 + var0 * var7 >> 16; // L: 4896 - var1 = var7 * var1 - var0 * var6 >> 16; // L: 4897 - var0 = var8; // L: 4898 - var8 = var5 * var3 - var4 * var1 >> 16; // L: 4899 - var1 = var5 * var1 + var3 * var4 >> 16; // L: 4900 - if (var1 >= 50) { // L: 4902 - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 4903 - Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 4904 - } else { - Client.viewportTempX = -1; // L: 4907 - Client.viewportTempY = -1; // L: 4908 - } - - } else { - Client.viewportTempX = -1; // L: 4884 - Client.viewportTempY = -1; // L: 4885 - } - } // L: 4886 4910 + public static void method5096() { + StructComposition.StructDefinition_cached.clear(); // L: 67 + } // L: 68 } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index a32e9560a2..441df57484 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,214 +1,202 @@ -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("dh") +@ObfuscatedName("bh") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("h") + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 2104703857 + ) + public static int field394; + @ObfuscatedName("e") @Export("PcmPlayer_stereo") public static boolean PcmPlayer_stereo; - @ObfuscatedName("e") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 967437073 - ) - public static int field1419; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Ldp;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("ai") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("samples") protected int[] samples; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Lbt;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -464372219 + intValue = 1516229081 ) - int field1424; - @ObfuscatedName("x") + int field386; + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 2749366115172109131L + longValue = -4287014230983004767L ) @Export("timeMs") long timeMs; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 167448973 + intValue = -2087539793 ) @Export("capacity") int capacity; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 237802631 + intValue = 846758933 ) - int field1427; - @ObfuscatedName("u") + int field395; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1086019069 + intValue = -970388059 ) - int field1430; - @ObfuscatedName("t") + int field396; + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 5727430496503551515L + longValue = -2154226267889325457L ) - long field1429; - @ObfuscatedName("p") + long field397; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 319512497 + intValue = 2102380923 ) - int field1428; - @ObfuscatedName("m") + int field402; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1292152149 + intValue = -395356405 ) - int field1439; - @ObfuscatedName("r") + int field399; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -264782125 + intValue = 97839813 ) - int field1432; - @ObfuscatedName("o") + int field400; + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 4709147703826691947L + longValue = 7909474248429099415L ) - long field1425; - @ObfuscatedName("j") - boolean field1433; - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = 1127821299 - ) - int field1417; + long field398; + @ObfuscatedName("y") + boolean field390; @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "[Ldw;" + @ObfuscatedGetter( + intValue = 214387207 ) - PcmStream[] field1437; - @ObfuscatedName("ak") + int field403; + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "[Ldw;" + descriptor = "[Lbt;" ) - PcmStream[] field1438; + PcmStream[] field401; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "[Lbt;" + ) + PcmStream[] field393; protected PcmPlayer() { - this.field1424 = 32; // L: 22 - this.timeMs = Tiles.currentTimeMillis(); // L: 23 - this.field1429 = 0L; // L: 27 - this.field1428 = 0; // L: 28 - this.field1439 = 0; // L: 29 - this.field1432 = 0; // L: 30 - this.field1425 = 0L; // L: 31 - this.field1433 = true; // L: 32 - this.field1417 = 0; // L: 38 - this.field1437 = new PcmStream[8]; // L: 39 - this.field1438 = new PcmStream[8]; // L: 40 + this.field386 = 32; // L: 22 + this.timeMs = ObjectSound.currentTimeMillis(); // L: 23 + this.field397 = 0L; // L: 27 + this.field402 = 0; // L: 28 + this.field399 = 0; // L: 29 + this.field400 = 0; // L: 30 + this.field398 = 0L; // L: 31 + this.field390 = true; // L: 32 + this.field403 = 0; // L: 38 + this.field401 = new PcmStream[8]; // L: 39 + this.field393 = new PcmStream[8]; // L: 40 } // L: 42 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "757289607" ) @Export("init") protected void init() throws Exception { } // L: 273 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1929759603" + garbageValue = "-1868594255" ) @Export("open") protected void open(int var1) throws Exception { } // L: 274 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "6543" + descriptor = "(I)I", + garbageValue = "-1317116866" ) @Export("position") protected int position() throws Exception { return this.capacity; // L: 277 } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("write") protected void write() throws Exception { } // L: 280 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "64" + garbageValue = "46" ) @Export("close") protected void close() { } // L: 281 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-674709942" + descriptor = "(B)V", + garbageValue = "-41" ) @Export("discard") protected void discard() throws Exception { } // L: 282 - @ObfuscatedName("am") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Ldw;I)V", - garbageValue = "-1612898797" + descriptor = "(Lbt;I)V", + garbageValue = "-192979862" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; // L: 72 } // L: 73 - @ObfuscatedName("ag") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-310510465" + garbageValue = "-1348614677" ) @Export("run") public final synchronized void run() { if (this.samples != null) { // L: 76 - long var1 = Tiles.currentTimeMillis(); // L: 77 + long var1 = ObjectSound.currentTimeMillis(); // L: 77 try { - if (this.field1429 != 0L) { // L: 79 - if (var1 < this.field1429) { // L: 80 + if (0L != this.field397) { // L: 79 + if (var1 < this.field397) { // L: 80 return; } this.open(this.capacity); // L: 81 - this.field1429 = 0L; // L: 82 - this.field1433 = true; // L: 83 + this.field397 = 0L; // L: 82 + this.field390 = true; // L: 83 } int var3 = this.position(); // L: 85 - if (this.field1432 - var3 > this.field1428) { // L: 86 - this.field1428 = this.field1432 - var3; + if (this.field400 - var3 > this.field402) { // L: 86 + this.field402 = this.field400 - var3; } - int var4 = this.field1427 + this.field1430; // L: 87 + int var4 = this.field396 + this.field395; // L: 87 if (var4 + 256 > 16384) { // L: 88 var4 = 16128; } @@ -222,10 +210,10 @@ public class PcmPlayer { this.close(); // L: 92 this.open(this.capacity); // L: 93 var3 = 0; // L: 94 - this.field1433 = true; // L: 95 + this.field390 = true; // L: 95 if (var4 + 256 > this.capacity) { // L: 96 var4 = this.capacity - 256; // L: 97 - this.field1430 = var4 - this.field1427; // L: 98 + this.field396 = var4 - this.field395; // L: 98 } } @@ -235,28 +223,28 @@ public class PcmPlayer { var3 += 256; // L: 104 } - if (var1 > this.field1425) { // L: 106 - if (!this.field1433) { // L: 107 - if (this.field1428 == 0 && this.field1439 == 0) { // L: 108 + if (var1 > this.field398) { // L: 106 + if (!this.field390) { // L: 107 + if (this.field402 == 0 && this.field399 == 0) { // L: 108 this.close(); // L: 109 - this.field1429 = 2000L + var1; // L: 110 + this.field397 = 2000L + var1; // L: 110 return; // L: 111 } - this.field1430 = Math.min(this.field1439, this.field1428); // L: 113 - this.field1439 = this.field1428; // L: 114 + this.field396 = Math.min(this.field399, this.field402); // L: 113 + this.field399 = this.field402; // L: 114 } else { - this.field1433 = false; // L: 116 + this.field390 = false; // L: 116 } - this.field1428 = 0; // L: 117 - this.field1425 = 2000L + var1; // L: 118 + this.field402 = 0; // L: 117 + this.field398 = 2000L + var1; // L: 118 } - this.field1432 = var3; // L: 120 + this.field400 = var3; // L: 120 } catch (Exception var7) { // L: 122 this.close(); // L: 123 - this.field1429 = 2000L + var1; // L: 124 + this.field397 = var1 + 2000L; // L: 124 } try { @@ -264,9 +252,9 @@ public class PcmPlayer { var1 = this.timeMs; } - while (var1 > this.timeMs + 5000L) { // L: 128 + while (var1 > 5000L + this.timeMs) { // L: 128 this.skip(256); // L: 129 - this.timeMs += (long)(256000 / StructComposition.field3338); // L: 130 + this.timeMs += (long)(256000 / field394); // L: 130 } } catch (Exception var6) { // L: 133 this.timeMs = var1; // L: 134 @@ -275,57 +263,57 @@ public class PcmPlayer { } } // L: 136 - @ObfuscatedName("ae") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "650769052" ) - public final void method2612() { - this.field1433 = true; // L: 139 + public final void method807() { + this.field390 = true; // L: 139 } // L: 140 - @ObfuscatedName("ac") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-44" + garbageValue = "-1" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1433 = true; // L: 143 + this.field390 = true; // L: 143 try { this.discard(); // L: 145 } catch (Exception var2) { // L: 147 this.close(); // L: 148 - this.field1429 = Tiles.currentTimeMillis() + 2000L; // L: 149 + this.field397 = ObjectSound.currentTimeMillis() + 2000L; // L: 149 } } // L: 151 - @ObfuscatedName("aq") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "10262" + descriptor = "(I)V", + garbageValue = "1796301171" ) @Export("shutdown") public final synchronized void shutdown() { - if (soundSystem != null) { // L: 154 + if (class0.soundSystem != null) { // L: 154 boolean var1 = true; // L: 155 for (int var2 = 0; var2 < 2; ++var2) { // L: 156 - if (this == soundSystem.players[var2]) { - soundSystem.players[var2] = null; // L: 157 + if (this == class0.soundSystem.players[var2]) { // L: 157 + class0.soundSystem.players[var2] = null; } - if (soundSystem.players[var2] != null) { // L: 158 + if (class0.soundSystem.players[var2] != null) { // L: 158 var1 = false; } } if (var1) { // L: 160 - soundSystemExecutor.shutdownNow(); // L: 161 - soundSystemExecutor = null; // L: 162 - soundSystem = null; // L: 163 + class34.soundSystemExecutor.shutdownNow(); // L: 161 + class34.soundSystemExecutor = null; // L: 162 + class0.soundSystem = null; // L: 163 } } @@ -333,16 +321,16 @@ public class PcmPlayer { this.samples = null; // L: 167 } // L: 168 - @ObfuscatedName("at") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-108727695" + garbageValue = "-1654322502" ) @Export("skip") final void skip(int var1) { - this.field1417 -= var1; // L: 171 - if (this.field1417 < 0) { - this.field1417 = 0; // L: 172 + this.field403 -= var1; // L: 171 + if (this.field403 < 0) { + this.field403 = 0; // L: 172 } if (this.stream != null) { @@ -351,7 +339,7 @@ public class PcmPlayer { } // L: 174 - @ObfuscatedName("ak") + @ObfuscatedName("am") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; // L: 178 @@ -359,18 +347,18 @@ public class PcmPlayer { var3 = var2 << 1; } - class311.clearIntArray(var1, 0, var3); // L: 180 - this.field1417 -= var2; // L: 181 - if (this.stream != null && this.field1417 <= 0) { // L: 182 - this.field1417 += StructComposition.field3338 >> 4; // L: 183 - ReflectionCheck.PcmStream_disable(this.stream); // L: 184 - this.method2658(this.stream, this.stream.vmethod2880()); // L: 185 + class305.clearIntArray(var1, 0, var3); // L: 180 + this.field403 -= var2; // L: 181 + if (this.stream != null && this.field403 <= 0) { // L: 182 + this.field403 += field394 >> 4; // L: 183 + class238.PcmStream_disable(this.stream); // L: 184 + this.method812(this.stream, this.stream.vmethod1039()); // L: 185 int var4 = 0; // L: 186 int var5 = 255; // L: 187 int var6; PcmStream var10; - label109: + label108: for (var6 = 7; var5 != 0; --var6) { // L: 188 int var7; int var8; @@ -386,13 +374,13 @@ public class PcmPlayer { if ((var9 & 1) != 0) { // L: 204 var5 &= ~(1 << var7); // L: 207 var10 = null; // L: 208 - PcmStream var11 = this.field1437[var7]; // L: 209 + PcmStream var11 = this.field401[var7]; // L: 209 - label103: + label102: while (true) { while (true) { if (var11 == null) { // L: 210 - break label103; + break label102; } AbstractSound var12 = var11.sound; // L: 211 @@ -402,33 +390,33 @@ public class PcmPlayer { var11 = var11.after; // L: 215 } else { var11.active = true; // L: 218 - int var13 = var11.vmethod4099(); // L: 219 + int var13 = var11.vmethod4124(); // L: 219 var4 += var13; // L: 220 - if (var12 != null) { // L: 221 - var12.position += var13; + if (var12 != null) { + var12.position += var13; // L: 221 } - if (var4 >= this.field1424) { // L: 222 - break label109; + if (var4 >= this.field386) { // L: 222 + break label108; } PcmStream var14 = var11.firstSubStream(); // L: 223 if (var14 != null) { // L: 224 - for (int var15 = var11.field1511; var14 != null; var14 = var11.nextSubStream()) { // L: 225 226 228 - this.method2658(var14, var15 * var14.vmethod2880() >> 8); // L: 227 + for (int var15 = var11.field454; var14 != null; var14 = var11.nextSubStream()) { // L: 225 226 228 + this.method812(var14, var15 * var14.vmethod1039() >> 8); // L: 227 } } PcmStream var18 = var11.after; // L: 231 var11.after = null; // L: 232 if (var10 == null) { // L: 233 - this.field1437[var7] = var18; + this.field401[var7] = var18; } else { var10.after = var18; // L: 234 } if (var18 == null) { // L: 235 - this.field1438[var7] = var10; + this.field393[var7] = var10; } var11 = var18; // L: 236 @@ -443,9 +431,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { // L: 240 - PcmStream var16 = this.field1437[var6]; // L: 241 - PcmStream[] var17 = this.field1437; // L: 242 - this.field1438[var6] = null; // L: 244 + PcmStream var16 = this.field401[var6]; // L: 241 + PcmStream[] var17 = this.field401; // L: 242 + this.field393[var6] = null; // L: 244 for (var17[var6] = null; var16 != null; var16 = var10) { // L: 245 246 249 var10 = var16.after; // L: 247 @@ -454,149 +442,391 @@ public class PcmPlayer { } } - if (this.field1417 < 0) { // L: 253 - this.field1417 = 0; + if (this.field403 < 0) { // L: 253 + this.field403 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); // L: 254 } - this.timeMs = Tiles.currentTimeMillis(); // L: 255 + this.timeMs = ObjectSound.currentTimeMillis(); // L: 255 } // L: 256 - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Ldw;IB)V", - garbageValue = "-16" + descriptor = "(Lbt;IB)V", + garbageValue = "-48" ) - final void method2658(PcmStream var1, int var2) { + final void method812(PcmStream var1, int var2) { int var3 = var2 >> 5; // L: 265 - PcmStream var4 = this.field1438[var3]; // L: 266 + PcmStream var4 = this.field393[var3]; // L: 266 if (var4 == null) { // L: 267 - this.field1437[var3] = var1; + this.field401[var3] = var1; } else { var4.after = var1; // L: 268 } - this.field1438[var3] = var1; // L: 269 - var1.field1511 = var2; // L: 270 + this.field393[var3] = var1; // L: 269 + var1.field454 = var2; // L: 270 } // L: 271 - @ObfuscatedName("ho") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIZI)V", - garbageValue = "-392680019" + descriptor = "(Lnk;I)V", + garbageValue = "-618234199" ) - static final void method2661(int var0, int var1, boolean var2) { - if (!var2 || var0 != class3.field24 || class39.field284 != var1) { // L: 5067 - class3.field24 = var0; // L: 5070 - class39.field284 = var1; // L: 5071 - ItemContainer.updateGameState(25); // L: 5072 - WorldMapIcon_1.drawLoadingMessage("Loading - please wait.", true); // L: 5073 - int var3 = GrandExchangeOfferNameComparator.baseX; // L: 5074 - int var4 = NetCache.baseY; // L: 5075 - GrandExchangeOfferNameComparator.baseX = (var0 - 6) * 8; // L: 5076 - NetCache.baseY = (var1 - 6) * 8; // L: 5077 - int var5 = GrandExchangeOfferNameComparator.baseX - var3; // L: 5078 - int var6 = NetCache.baseY - var4; // L: 5079 - var3 = GrandExchangeOfferNameComparator.baseX; // L: 5080 - var4 = NetCache.baseY; // L: 5081 + static final void method857(PacketBuffer var0) { + for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { // L: 443 + int var2 = Players.Players_pendingUpdateIndices[var1]; // L: 444 + Player var3 = Client.players[var2]; // L: 445 + int var4 = var0.readUnsignedByte(); // L: 446 + if ((var4 & 4) != 0) { // L: 447 + var4 += var0.readUnsignedByte() << 8; + } + byte var5 = -1; // L: 449 + int var6; int var7; int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { // L: 5082 - NPC var19 = Client.npcs[var7]; // L: 5083 - if (var19 != null) { // L: 5084 - for (var9 = 0; var9 < 10; ++var9) { // L: 5085 - var10000 = var19.pathX; // L: 5086 - var10000[var9] -= var5; - var10000 = var19.pathY; // L: 5087 - var10000[var9] -= var6; - } - - var19.x -= var5 * 128; // L: 5089 - var19.y -= var6 * 128; // L: 5090 - } - } - - for (var7 = 0; var7 < 2048; ++var7) { // L: 5093 - Player var22 = Client.players[var7]; // L: 5094 - if (var22 != null) { // L: 5095 - for (var9 = 0; var9 < 10; ++var9) { // L: 5096 - var10000 = var22.pathX; // L: 5097 - var10000[var9] -= var5; - var10000 = var22.pathY; // L: 5098 - var10000[var9] -= var6; - } - - var22.x -= var5 * 128; // L: 5100 - var22.y -= var6 * 128; // L: 5101 - } - } - - byte var20 = 0; // L: 5104 - byte var8 = 104; // L: 5105 - byte var21 = 1; // L: 5106 - if (var5 < 0) { // L: 5107 - var20 = 103; // L: 5108 - var8 = -1; // L: 5109 - var21 = -1; // L: 5110 - } - - byte var10 = 0; // L: 5112 - byte var11 = 104; // L: 5113 - byte var12 = 1; // L: 5114 - if (var6 < 0) { // L: 5115 - var10 = 103; // L: 5116 - var11 = -1; // L: 5117 - var12 = -1; // L: 5118 - } - - int var14; - for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5120 - for (var14 = var10; var11 != var14; var14 += var12) { // L: 5121 - int var15 = var5 + var13; // L: 5122 - int var16 = var6 + var14; // L: 5123 - - for (int var17 = 0; var17 < 4; ++var17) { // L: 5124 - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5125 + int var10; + int var13; + if ((var4 & 16) != 0) { // L: 450 + var6 = var0.method6610(); // L: 451 + int var8; + int var11; + int var16; + if (var6 > 0) { // L: 452 + for (var7 = 0; var7 < var6; ++var7) { // L: 453 + var9 = -1; // L: 455 + var10 = -1; // L: 456 + var11 = -1; // L: 457 + var8 = var0.readUShortSmart(); // L: 458 + if (var8 == 32767) { // L: 459 + var8 = var0.readUShortSmart(); // L: 460 + var10 = var0.readUShortSmart(); // L: 461 + var9 = var0.readUShortSmart(); // L: 462 + var11 = var0.readUShortSmart(); // L: 463 + } else if (var8 != 32766) { // L: 465 + var10 = var0.readUShortSmart(); // L: 466 } else { - Client.groundItems[var17][var13][var14] = null; // L: 5126 + var8 = -1; // L: 468 + } + + var16 = var0.readUShortSmart(); // L: 469 + var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var16); // L: 470 + } + } + + var7 = var0.method6610(); // L: 473 + if (var7 > 0) { // L: 474 + for (var8 = 0; var8 < var7; ++var8) { // L: 475 + var9 = var0.readUShortSmart(); // L: 476 + var10 = var0.readUShortSmart(); // L: 477 + if (var10 != 32767) { // L: 478 + var11 = var0.readUShortSmart(); // L: 479 + var16 = var0.method6610(); // L: 480 + var13 = var10 > 0 ? var0.method6609() : var16; // L: 481 + var3.addHealthBar(var9, Client.cycle, var10, var11, var16, var13); // L: 482 + } else { + var3.removeHealthBar(var9); // L: 484 } } } } - for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5130 5131 5135 - var18.x -= var5; // L: 5132 - var18.y -= var6; // L: 5133 - if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5134 - var18.remove(); + if ((var4 & 2) != 0) { // L: 488 + var3.targetIndex = var0.method6617(); // L: 489 + if (var3.targetIndex == 65535) { // L: 490 + var3.targetIndex = -1; } } - if (Client.destinationX != 0) { // L: 5137 - Client.destinationX -= var5; // L: 5138 - Client.destinationY -= var6; // L: 5139 + if ((var4 & 8192) != 0) { // L: 492 + for (var6 = 0; var6 < 3; ++var6) { // L: 493 + var3.actions[var6] = var0.readStringCp1252NullTerminated(); + } } - Client.soundEffectCount = 0; // L: 5141 - Client.isCameraLocked = false; // L: 5142 - SecureRandomFuture.cameraX -= var5 << 7; // L: 5143 - ObjectSound.cameraZ -= var6 << 7; // L: 5144 - HealthBarUpdate.oculusOrbFocalPointX -= var5 << 7; // L: 5145 - ApproximateRouteStrategy.oculusOrbFocalPointY -= var6 << 7; // L: 5146 - Client.field889 = -1; // L: 5147 - Client.graphicsObjects.clear(); // L: 5148 - Client.projectiles.clear(); // L: 5149 - - for (var14 = 0; var14 < 4; ++var14) { // L: 5150 - Client.collisionMaps[var14].clear(); + if ((var4 & 8) != 0) { // L: 495 + var6 = var0.method6610(); // L: 496 + byte[] var14 = new byte[var6]; // L: 497 + Buffer var15 = new Buffer(var14); // L: 498 + var0.readBytes(var14, 0, var6); // L: 499 + Players.field1352[var2] = var15; // L: 500 + var3.read(var15); // L: 501 } + if ((var4 & 512) != 0) { // L: 503 + Players.field1351[var2] = var0.method6584(); // L: 504 + } + + if ((var4 & 64) != 0) { // L: 506 + var3.field1237 = var0.method6766(); // L: 507 + if (var3.pathLength == 0) { // L: 508 + var3.orientation = var3.field1237; // L: 509 + var3.field1237 = -1; // L: 510 + } + } + + if ((var4 & 256) != 0) { // L: 513 + var3.field1240 = var0.method6678(); // L: 514 + var3.field1253 = var0.method6612(); // L: 515 + var3.field1252 = var0.readByte(); // L: 516 + var3.field1239 = var0.method6612(); // L: 517 + var3.field1255 = var0.method6617() + Client.cycle; // L: 518 + var3.field1268 = var0.method6766() + Client.cycle; // L: 519 + var3.field1213 = var0.method6617(); // L: 520 + if (var3.field1189) { // L: 521 + var3.field1240 += var3.tileX; // L: 522 + var3.field1253 += var3.tileY; // L: 523 + var3.field1252 += var3.tileX; // L: 524 + var3.field1239 += var3.tileY; // L: 525 + var3.pathLength = 0; // L: 526 + } else { + var3.field1240 += var3.pathX[0]; // L: 529 + var3.field1253 += var3.pathY[0]; // L: 530 + var3.field1252 += var3.pathX[0]; // L: 531 + var3.field1239 += var3.pathY[0]; // L: 532 + var3.pathLength = 1; // L: 533 + } + + var3.field1224 = 0; // L: 535 + } + + if ((var4 & 128) != 0) { // L: 537 + var6 = var0.readUnsignedShort(); // L: 538 + PlayerType var20 = (PlayerType)UserComparator8.findEnumerated(WallDecoration.PlayerType_values(), var0.readUnsignedByte()); // L: 539 + boolean var18 = var0.method6610() == 1; // L: 540 + var9 = var0.method6609(); // L: 541 + var10 = var0.offset; // L: 542 + if (var3.username != null && var3.appearance != null) { // L: 543 + boolean var19 = false; // L: 544 + if (var20.isUser && class13.friendSystem.isIgnored(var3.username)) { // L: 545 546 + var19 = true; + } + + if (!var19 && Client.field716 == 0 && !var3.isHidden) { // L: 548 + Players.field1362.offset = 0; // L: 549 + var0.method6630(Players.field1362.array, 0, var9); // L: 550 + Players.field1362.offset = 0; // L: 551 + String var12 = AbstractFont.escapeBrackets(GrandExchangeOfferAgeComparator.method4607(class16.method258(Players.field1362))); // L: 552 + var3.overheadText = var12.trim(); // L: 553 + var3.overheadTextColor = var6 >> 8; // L: 554 + var3.overheadTextEffect = var6 & 255; // L: 555 + var3.overheadTextCyclesRemaining = 150; // L: 556 + var3.isAutoChatting = var18; // L: 557 + var3.field1208 = var3 != Varcs.localPlayer && var20.isUser && "" != Client.field824 && var12.toLowerCase().indexOf(Client.field824) == -1; // L: 558 + if (var20.isPrivileged) { // L: 560 + var13 = var18 ? 91 : 1; + } else { + var13 = var18 ? 90 : 2; // L: 561 + } + + if (var20.modIcon != -1) { // L: 562 + class69.addGameMessage(var13, class337.method5986(var20.modIcon) + var3.username.getName(), var12); + } else { + class69.addGameMessage(var13, var3.username.getName(), var12); // L: 563 + } + } + } + + var0.offset = var10 + var9; // L: 566 + } + + if ((var4 & 2048) != 0) { // L: 568 + var5 = var0.method6678(); // L: 569 + } + + if ((var4 & 1024) != 0) { // L: 571 + var3.spotAnimation = var0.method6617(); // L: 572 + var6 = var0.method6627(); // L: 573 + var3.field1238 = var6 >> 16; // L: 574 + var3.field1249 = (var6 & 65535) + Client.cycle; // L: 575 + var3.spotAnimationFrame = 0; // L: 576 + var3.spotAnimationFrameCycle = 0; // L: 577 + if (var3.field1249 > Client.cycle) { // L: 578 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 579 + var3.spotAnimation = -1; + } + } + + if ((var4 & 32) != 0) { // L: 581 + var6 = var0.method6617(); // L: 582 + if (var6 == 65535) { // L: 583 + var6 = -1; + } + + var7 = var0.method6623(); // L: 584 + class32.performPlayerAnimation(var3, var6, var7); // L: 585 + } + + if ((var4 & 1) != 0) { // L: 587 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 588 + if (var3.overheadText.charAt(0) == '~') { // L: 589 + var3.overheadText = var3.overheadText.substring(1); // L: 590 + class69.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 591 + } else if (var3 == Varcs.localPlayer) { // L: 593 + class69.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 594 + } + + var3.isAutoChatting = false; // L: 596 + var3.overheadTextColor = 0; // L: 597 + var3.overheadTextEffect = 0; // L: 598 + var3.overheadTextCyclesRemaining = 150; // L: 599 + } + + if (var3.field1189) { // L: 601 + if (var5 == 127) { // L: 602 + var3.resetPath(var3.tileX, var3.tileY); + } else { + byte var17; + if (var5 != -1) { // L: 605 + var17 = var5; + } else { + var17 = Players.field1351[var2]; // L: 606 + } + + var3.method2120(var3.tileX, var3.tileY, var17); // L: 607 + } + } } - } // L: 5068 5151 + + } // L: 613 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "276170039" + ) + static int method837(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3469 + class16.Interpreter_intStackSize -= 2; // L: 3470 + Client.field855 = (short)TileItem.method2266(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]); // L: 3471 + if (Client.field855 <= 0) { // L: 3472 + Client.field855 = 256; + } + + Client.field856 = (short)TileItem.method2266(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3473 + if (Client.field856 <= 0) { // L: 3474 + Client.field856 = 256; + } + + return 1; // L: 3475 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3477 + class16.Interpreter_intStackSize -= 2; // L: 3478 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3479 + if (Client.zoomHeight <= 0) { // L: 3480 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3481 + if (Client.zoomWidth <= 0) { // L: 3482 + Client.zoomWidth = 320; + } + + return 1; // L: 3483 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3485 + class16.Interpreter_intStackSize -= 4; // L: 3486 + Client.field859 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3487 + if (Client.field859 <= 0) { // L: 3488 + Client.field859 = 1; + } + + Client.field742 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3489 + if (Client.field742 <= 0) { // L: 3490 + Client.field742 = 32767; + } else if (Client.field742 < Client.field859) { // L: 3491 + Client.field742 = Client.field859; + } + + Client.field707 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 3492 + if (Client.field707 <= 0) { // L: 3493 + Client.field707 = 1; + } + + Client.field862 = (short)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 3494 + if (Client.field862 <= 0) { // L: 3495 + Client.field862 = 32767; + } else if (Client.field862 < Client.field707) { // L: 3496 + Client.field862 = Client.field707; + } + + return 1; // L: 3497 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3499 + if (Client.viewportWidget != null) { // L: 3500 + Bounds.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3501 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3502 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3503 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3506 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3507 + } + + return 1; // L: 3509 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3511 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3512 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3513 + return 1; // L: 3514 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3516 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ClientPreferences.method2221(Client.field855); // L: 3517 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ClientPreferences.method2221(Client.field856); // L: 3518 + return 1; // L: 3519 + } else if (var0 == 6220) { // L: 3521 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3522 + return 1; // L: 3523 + } else if (var0 == 6221) { // L: 3525 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3526 + return 1; // L: 3527 + } else if (var0 == 6222) { // L: 3529 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.canvasWidth; // L: 3530 + return 1; // L: 3531 + } else if (var0 == 6223) { // L: 3533 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameEngine.canvasHeight; // L: 3534 + return 1; // L: 3535 + } else { + return 2; // L: 3537 + } + } + + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "434222247" + ) + static boolean method855() { + return (Client.drawPlayerNames & 8) != 0; // L: 4062 + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + descriptor = "(Lhu;III)V", + garbageValue = "-2082124704" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10914 + if (var0 != null && class13.method220(var0) != null) { // L: 10915 + Client.clickedWidget = var0; // L: 10916 + Client.clickedWidgetParent = class13.method220(var0); // L: 10917 + Client.widgetClickX = var1; // L: 10918 + Client.widgetClickY = var2; // L: 10919 + class34.widgetDragDuration = 0; // L: 10920 + Client.isDraggingWidget = false; // L: 10921 + int var3 = Client.menuOptionsCount - 1; // L: 10924 + if (var3 != -1) { // L: 10927 + class25.tempMenuAction = new MenuAction(); // L: 10928 + class25.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 10929 + class25.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 10930 + class25.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 10931 + class25.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 10932 + class25.tempMenuAction.action = Client.menuActions[var3]; // L: 10933 + } + + } + } + } // L: 10935 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 316686ef61..f193c53b41 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,62 +3,62 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("bt") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("w") - @Export("active") - volatile boolean active; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Ldw;" + descriptor = "Lbt;" ) @Export("after") PcmStream after; - @ObfuscatedName("f") - int field1511; - @ObfuscatedName("g") + @ObfuscatedName("q") + int field454; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ldn;" + descriptor = "Lbc;" ) @Export("sound") AbstractSound sound; + @ObfuscatedName("v") + @Export("active") + volatile boolean active; protected PcmStream() { this.active = true; // L: 11 } // L: 13 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("e") - protected abstract int vmethod4099(); + @ObfuscatedName("g") + protected abstract int vmethod4124(); - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("bi") - int vmethod2880() { + @ObfuscatedName("af") + int vmethod1039() { return 255; // L: 16 } - @ObfuscatedName("em") + @ObfuscatedName("ef") @Export("update") final void update(int[] var1, int var2, int var3) { if (this.active) { // L: 24 diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 82ae6aae37..bf2bc5e7b7 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("ak") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) - NodeDeque field1353; - @ObfuscatedName("d") - int field1354; - @ObfuscatedName("c") - int field1355; + NodeDeque field363; + @ObfuscatedName("u") + int field362; + @ObfuscatedName("p") + int field364; public PcmStreamMixer() { this.subStreams = new NodeDeque(); // L: 9 - this.field1353 = new NodeDeque(); // L: 10 - this.field1354 = 0; // L: 11 - this.field1355 = -1; // L: 12 + this.field363 = new NodeDeque(); // L: 10 + this.field362 = 0; // L: 11 + this.field364 = -1; // L: 12 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ldw;)V" + descriptor = "(Lbt;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); // L: 15 } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ldw;)V" + descriptor = "(Lbt;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); // L: 19 } // L: 20 - @ObfuscatedName("d") - void method2456() { - if (this.field1354 > 0) { // L: 23 - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1353.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1353.previous()) { // L: 24 - var1.field1466 -= this.field1354; // L: 25 + @ObfuscatedName("u") + void method757() { + if (this.field362 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field363.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field363.previous()) { // L: 24 + var1.field501 -= this.field362; // L: 25 } - this.field1355 -= this.field1354; // L: 27 - this.field1354 = 0; // L: 28 + this.field364 -= this.field362; // L: 27 + this.field362 = 0; // L: 28 } } // L: 30 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lga;Ldr;)V" + descriptor = "(Lmh;Lbj;)V" ) - void method2458(Node var1, PcmStreamMixerListener var2) { - while (this.field1353.sentinel != var1 && ((PcmStreamMixerListener)var1).field1466 <= var2.field1466) { // L: 33 + void method731(Node var1, PcmStreamMixerListener var2) { + while (this.field363.sentinel != var1 && ((PcmStreamMixerListener)var1).field501 <= var2.field501) { // L: 33 var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 - this.field1355 = ((PcmStreamMixerListener)this.field1353.sentinel.previous).field1466; // L: 35 + this.field364 = ((PcmStreamMixerListener)this.field363.sentinel.previous).field501; // L: 35 } // L: 36 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ldr;)V" + descriptor = "(Lbj;)V" ) - void method2459(PcmStreamMixerListener var1) { + void method762(PcmStreamMixerListener var1) { var1.remove(); // L: 39 var1.remove2(); // L: 40 - Node var2 = this.field1353.sentinel.previous; // L: 41 - if (var2 == this.field1353.sentinel) { - this.field1355 = -1; // L: 42 + Node var2 = this.field363.sentinel.previous; // L: 41 + if (var2 == this.field363.sentinel) { + this.field364 = -1; // L: 42 } else { - this.field1355 = ((PcmStreamMixerListener)var2).field1466; // L: 43 + this.field364 = ((PcmStreamMixerListener)var2).field501; // L: 43 } } // L: 44 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); // L: 47 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); // L: 51 } - @ObfuscatedName("e") - protected int vmethod4099() { + @ObfuscatedName("g") + protected int vmethod4124() { return 0; // L: 55 } - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1355 < 0) { // L: 60 + if (this.field364 < 0) { // L: 60 this.updateSubStreams(var1, var2, var3); // L: 61 return; // L: 62 } - if (var3 + this.field1354 < this.field1355) { // L: 64 - this.field1354 += var3; // L: 65 + if (var3 + this.field362 < this.field364) { // L: 64 + this.field362 += var3; // L: 65 this.updateSubStreams(var1, var2, var3); // L: 66 return; // L: 67 } - int var4 = this.field1355 - this.field1354; // L: 69 + int var4 = this.field364 - this.field362; // L: 69 this.updateSubStreams(var1, var2, var4); // L: 70 var2 += var4; // L: 71 var3 -= var4; // L: 72 - this.field1354 += var4; // L: 73 - this.method2456(); // L: 74 - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1353.last(); // L: 75 + this.field362 += var4; // L: 73 + this.method757(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field363.last(); // L: 75 synchronized(var5) { // L: 76 int var7 = var5.update(); // L: 77 if (var7 < 0) { // L: 78 - var5.field1466 = 0; // L: 79 - this.method2459(var5); // L: 80 + var5.field501 = 0; // L: 79 + this.method762(var5); // L: 80 } else { - var5.field1466 = var7; // L: 83 - this.method2458(var5.previous, var5); // L: 84 + var5.field501 = var7; // L: 83 + this.method731(var5.previous, var5); // L: 84 } } } while(var3 != 0); // L: 87 } - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("updateSubStreams") void updateSubStreams(int[] var1, int var2, int var3) { for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 @@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream { } // L: 95 - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1355 < 0) { // L: 99 + if (this.field364 < 0) { // L: 99 this.skipSubStreams(var1); // L: 100 return; // L: 101 } - if (this.field1354 + var1 < this.field1355) { // L: 103 - this.field1354 += var1; // L: 104 + if (this.field362 + var1 < this.field364) { // L: 103 + this.field362 += var1; // L: 104 this.skipSubStreams(var1); // L: 105 return; // L: 106 } - int var2 = this.field1355 - this.field1354; // L: 108 + int var2 = this.field364 - this.field362; // L: 108 this.skipSubStreams(var2); // L: 109 var1 -= var2; // L: 110 - this.field1354 += var2; // L: 111 - this.method2456(); // L: 112 - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1353.last(); // L: 113 + this.field362 += var2; // L: 111 + this.method757(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field363.last(); // L: 113 synchronized(var3) { // L: 114 int var5 = var3.update(); // L: 115 if (var5 < 0) { // L: 116 - var3.field1466 = 0; // L: 117 - this.method2459(var3); // L: 118 + var3.field501 = 0; // L: 117 + this.method762(var3); // L: 118 } else { - var3.field1466 = var5; // L: 121 - this.method2458(var3.previous, var3); // L: 122 + var3.field501 = var5; // L: 121 + this.method731(var3.previous, var3); // L: 122 } } } while(var1 != 0); // L: 125 } - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index cb02a79209..a8a2d40b59 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("dr") +@ObfuscatedName("bj") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("n") - int field1466; + @ObfuscatedName("f") + int field501; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("remove2") abstract void remove2(); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ldi;)I" + descriptor = "(Lak;)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 d9cd867f39..db34b2908c 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -3,77 +3,82 @@ 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("bo") +@ObfuscatedName("cr") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("n") + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "[Lnx;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -67559491 + intValue = 1308718051 ) @Export("plane") int plane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1512914817 + intValue = 45701607 ) @Export("type") int type; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -333030369 + intValue = -155667971 ) @Export("x") int x; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1122963499 + intValue = 1448621267 ) @Export("y") int y; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1919980867 + intValue = -1001354287 ) @Export("objectId") int objectId; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1123556215 - ) - int field944; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1772002075 - ) - int field945; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2057325195 + intValue = 1329191507 + ) + int field1199; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -184031209 + ) + int field1203; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1951692743 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1376003913 + intValue = 850261387 ) @Export("orientation") int orientation; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1647401883 + ) + int field1196; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -251784439 - ) - int field948; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 6874789 + intValue = 2107117867 ) @Export("delay") int delay; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 738564505 + intValue = -317675493 ) @Export("hitpoints") int hitpoints; @@ -83,574 +88,12 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; // L: 17 } // L: 19 - @ObfuscatedName("y") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkd;IB)V", - garbageValue = "-61" + descriptor = "(CB)C", + garbageValue = "56" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; // L: 191 - if (var2) { // L: 192 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - int var3 = var0.readBits(2); // L: 193 - Player var4 = Client.players[var1]; // L: 194 - if (var3 == 0) { // L: 195 - if (var2) { // L: 196 - var4.field652 = false; // L: 197 - } else if (Client.localPlayerIndex == var1) { // L: 200 - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (GrandExchangeOfferNameComparator.baseX + var4.pathX[0] >> 13 << 14) + (NetCache.baseY + var4.pathY[0] >> 13); // L: 201 - if (var4.field981 != -1) { // L: 202 - Players.Players_orientations[var1] = var4.field981; - } else { - Players.Players_orientations[var1] = var4.orientation; // L: 203 - } - - Players.Players_targetIndices[var1] = var4.targetIndex; // L: 204 - Client.players[var1] = null; // L: 205 - if (var0.readBits(1) != 0) { // L: 206 - World.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { // L: 209 - var5 = var0.readBits(3); // L: 210 - var6 = var4.pathX[0]; // L: 211 - var7 = var4.pathY[0]; // L: 212 - if (var5 == 0) { // L: 213 - --var6; // L: 214 - --var7; // L: 215 - } else if (var5 == 1) { // L: 217 - --var7; - } else if (var5 == 2) { // L: 218 - ++var6; // L: 219 - --var7; // L: 220 - } else if (var5 == 3) { // L: 222 - --var6; - } else if (var5 == 4) { // L: 223 - ++var6; - } else if (var5 == 5) { // L: 224 - --var6; // L: 225 - ++var7; // L: 226 - } else if (var5 == 6) { // L: 228 - ++var7; - } else if (var5 == 7) { // L: 229 - ++var6; // L: 230 - ++var7; // L: 231 - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 233 - var4.resetPath(var6, var7); // L: 234 - var4.field652 = false; // L: 235 - } else if (var2) { // L: 237 - var4.field652 = true; // L: 238 - var4.tileX = var6; // L: 239 - var4.tileY = var7; // L: 240 - } else { - var4.field652 = false; // L: 243 - var4.method1327(var6, var7, Players.field1274[var1]); // L: 244 - } - - } else if (var3 == 2) { // L: 248 - var5 = var0.readBits(4); // L: 249 - var6 = var4.pathX[0]; // L: 250 - var7 = var4.pathY[0]; // L: 251 - if (var5 == 0) { // L: 252 - var6 -= 2; // L: 253 - var7 -= 2; // L: 254 - } else if (var5 == 1) { // L: 256 - --var6; // L: 257 - var7 -= 2; // L: 258 - } else if (var5 == 2) { // L: 260 - var7 -= 2; - } else if (var5 == 3) { // L: 261 - ++var6; // L: 262 - var7 -= 2; // L: 263 - } else if (var5 == 4) { // L: 265 - var6 += 2; // L: 266 - var7 -= 2; // L: 267 - } else if (var5 == 5) { // L: 269 - var6 -= 2; // L: 270 - --var7; // L: 271 - } else if (var5 == 6) { // L: 273 - var6 += 2; // L: 274 - --var7; // L: 275 - } else if (var5 == 7) { // L: 277 - var6 -= 2; - } else if (var5 == 8) { // L: 278 - var6 += 2; - } else if (var5 == 9) { // L: 279 - var6 -= 2; // L: 280 - ++var7; // L: 281 - } else if (var5 == 10) { // L: 283 - var6 += 2; // L: 284 - ++var7; // L: 285 - } else if (var5 == 11) { // L: 287 - var6 -= 2; // L: 288 - var7 += 2; // L: 289 - } else if (var5 == 12) { // L: 291 - --var6; // L: 292 - var7 += 2; // L: 293 - } else if (var5 == 13) { // L: 295 - var7 += 2; - } else if (var5 == 14) { // L: 296 - ++var6; // L: 297 - var7 += 2; // L: 298 - } else if (var5 == 15) { // L: 300 - var6 += 2; // L: 301 - var7 += 2; // L: 302 - } - - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 304 - if (var2) { // L: 308 - var4.field652 = true; // L: 309 - var4.tileX = var6; // L: 310 - var4.tileY = var7; // L: 311 - } else { - var4.field652 = false; // L: 314 - var4.method1327(var6, var7, Players.field1274[var1]); // L: 315 - } - } else { - var4.resetPath(var6, var7); // L: 305 - var4.field652 = false; // L: 306 - } - - } else { - var5 = var0.readBits(1); // L: 319 - int var8; - int var9; - int var10; - int var11; - if (var5 == 0) { // L: 320 - var6 = var0.readBits(12); // L: 321 - var7 = var6 >> 10; // L: 322 - var8 = var6 >> 5 & 31; // L: 323 - if (var8 > 15) { // L: 324 - var8 -= 32; - } - - var9 = var6 & 31; // L: 325 - if (var9 > 15) { // L: 326 - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; // L: 327 - var11 = var9 + var4.pathY[0]; // L: 328 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 329 - var4.resetPath(var10, var11); // L: 330 - var4.field652 = false; // L: 331 - } else if (var2) { // L: 333 - var4.field652 = true; // L: 334 - var4.tileX = var10; // L: 335 - var4.tileY = var11; // L: 336 - } else { - var4.field652 = false; // L: 339 - var4.method1327(var10, var11, Players.field1274[var1]); // L: 340 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 342 - if (Client.localPlayerIndex == var1) { // L: 343 - class90.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); // L: 346 - var7 = var6 >> 28; // L: 347 - var8 = var6 >> 14 & 16383; // L: 348 - var9 = var6 & 16383; // L: 349 - var10 = (var8 + GrandExchangeOfferNameComparator.baseX + var4.pathX[0] & 16383) - GrandExchangeOfferNameComparator.baseX; // L: 350 - var11 = (var9 + NetCache.baseY + var4.pathY[0] & 16383) - NetCache.baseY; // L: 351 - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 352 - var4.resetPath(var10, var11); // L: 353 - var4.field652 = false; // L: 354 - } else if (var2) { // L: 356 - var4.field652 = true; // L: 357 - var4.tileX = var10; // L: 358 - var4.tileY = var11; // L: 359 - } else { - var4.field652 = false; // L: 362 - var4.method1327(var10, var11, Players.field1274[var1]); // L: 363 - } - - var4.plane = (byte)(var7 + var4.plane & 3); // L: 365 - if (Client.localPlayerIndex == var1) { // L: 366 - class90.Client_plane = var4.plane; - } - - } - } - } - } // L: 198 207 246 317 344 367 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1139571995" - ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 - if (var1 == null) { // L: 76 - return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 77 78 - } + static char method2152(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 63 64 } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "54" - ) - static int method1845(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1107 - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1108 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1109 - return 1; // L: 1110 - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1112 - if (var3.itemId != -1) { // L: 1113 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1114 - } - - return 1; // L: 1115 - } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1117 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1118 - return 1; // L: 1119 - } else { - return 2; // L: 1121 - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-369076606" - ) - static int method1846(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 2894 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 2895 - return 1; // L: 2896 - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 2898 - Interpreter.Interpreter_intStackSize -= 3; // L: 2899 - Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2900 - ArchiveLoader.privateChatMode = UserComparator5.method3604(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 2901 - if (ArchiveLoader.privateChatMode == null) { // L: 2902 - ArchiveLoader.privateChatMode = PrivateChatMode.field3830; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2903 - PacketBufferNode var18 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); // L: 2905 - var18.packetBuffer.writeByte(Client.publicChatMode); // L: 2906 - var18.packetBuffer.writeByte(ArchiveLoader.privateChatMode.field3832); // L: 2907 - var18.packetBuffer.writeByte(Client.tradeChatMode); // L: 2908 - Client.packetWriter.addNode(var18); // L: 2909 - return 1; // L: 2910 - } else { - String var3; - int var11; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 2912 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2913 - Interpreter.Interpreter_intStackSize -= 2; // L: 2914 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2915 - int var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2916 - PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); // L: 2918 - var13.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var3) + 2); // L: 2919 - var13.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 2920 - var13.packetBuffer.writeByte(var11 - 1); // L: 2921 - var13.packetBuffer.writeByte(var12); // L: 2922 - Client.packetWriter.addNode(var13); // L: 2923 - return 1; // L: 2924 - } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 2926 - Interpreter.Interpreter_intStackSize -= 2; // L: 2927 - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2928 - var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2929 - Message var16 = class89.Messages_getByChannelAndID(var10, var11); // L: 2930 - if (var16 != null) { // L: 2931 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.count; // L: 2932 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle; // L: 2933 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; // L: 2934 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; // L: 2935 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; // L: 2936 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); // L: 2937 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 2940 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2941 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2942 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2943 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2944 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2945 - } - - return 1; // L: 2947 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 2949 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2950 - Message var14 = NPC.Messages_getMessage(var10); // L: 2951 - if (var14 != null) { // L: 2952 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.type; // L: 2953 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.cycle; // L: 2954 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14.sender != null ? var14.sender : ""; // L: 2955 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14.prefix != null ? var14.prefix : ""; // L: 2956 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14.text != null ? var14.text : ""; // L: 2957 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.isFromFriend() ? 1 : (var14.isFromIgnored() ? 2 : 0); // L: 2958 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 2961 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2962 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2963 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2964 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2965 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2966 - } - - return 1; // L: 2968 - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 2970 - if (ArchiveLoader.privateChatMode == null) { // L: 2971 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ArchiveLoader.privateChatMode.field3832; // L: 2972 - } - - return 1; // L: 2973 - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 2975 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2976 - var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2977 - String var15 = var3.toLowerCase(); // L: 2978 - byte var17 = 0; // L: 2979 - if (var15.startsWith("yellow:")) { // L: 2980 - var17 = 0; // L: 2981 - var3 = var3.substring("yellow:".length()); // L: 2982 - } else if (var15.startsWith("red:")) { // L: 2984 - var17 = 1; // L: 2985 - var3 = var3.substring("red:".length()); // L: 2986 - } else if (var15.startsWith("green:")) { // L: 2988 - var17 = 2; // L: 2989 - var3 = var3.substring("green:".length()); // L: 2990 - } else if (var15.startsWith("cyan:")) { // L: 2992 - var17 = 3; // L: 2993 - var3 = var3.substring("cyan:".length()); // L: 2994 - } else if (var15.startsWith("purple:")) { // L: 2996 - var17 = 4; // L: 2997 - var3 = var3.substring("purple:".length()); // L: 2998 - } else if (var15.startsWith("white:")) { // L: 3000 - var17 = 5; // L: 3001 - var3 = var3.substring("white:".length()); // L: 3002 - } else if (var15.startsWith("flash1:")) { // L: 3004 - var17 = 6; // L: 3005 - var3 = var3.substring("flash1:".length()); // L: 3006 - } else if (var15.startsWith("flash2:")) { // L: 3008 - var17 = 7; // L: 3009 - var3 = var3.substring("flash2:".length()); // L: 3010 - } else if (var15.startsWith("flash3:")) { // L: 3012 - var17 = 8; // L: 3013 - var3 = var3.substring("flash3:".length()); // L: 3014 - } else if (var15.startsWith("glow1:")) { // L: 3016 - var17 = 9; // L: 3017 - var3 = var3.substring("glow1:".length()); // L: 3018 - } else if (var15.startsWith("glow2:")) { // L: 3020 - var17 = 10; // L: 3021 - var3 = var3.substring("glow2:".length()); // L: 3022 - } else if (var15.startsWith("glow3:")) { // L: 3024 - var17 = 11; // L: 3025 - var3 = var3.substring("glow3:".length()); // L: 3026 - } else if (Language.Language_EN != NPCComposition.clientLanguage) { // L: 3028 - if (var15.startsWith("yellow:")) { // L: 3029 - var17 = 0; // L: 3030 - var3 = var3.substring("yellow:".length()); // L: 3031 - } else if (var15.startsWith("red:")) { // L: 3033 - var17 = 1; // L: 3034 - var3 = var3.substring("red:".length()); // L: 3035 - } else if (var15.startsWith("green:")) { // L: 3037 - var17 = 2; // L: 3038 - var3 = var3.substring("green:".length()); // L: 3039 - } else if (var15.startsWith("cyan:")) { // L: 3041 - var17 = 3; // L: 3042 - var3 = var3.substring("cyan:".length()); // L: 3043 - } else if (var15.startsWith("purple:")) { // L: 3045 - var17 = 4; // L: 3046 - var3 = var3.substring("purple:".length()); // L: 3047 - } else if (var15.startsWith("white:")) { // L: 3049 - var17 = 5; // L: 3050 - var3 = var3.substring("white:".length()); // L: 3051 - } else if (var15.startsWith("flash1:")) { // L: 3053 - var17 = 6; // L: 3054 - var3 = var3.substring("flash1:".length()); // L: 3055 - } else if (var15.startsWith("flash2:")) { // L: 3057 - var17 = 7; // L: 3058 - var3 = var3.substring("flash2:".length()); // L: 3059 - } else if (var15.startsWith("flash3:")) { // L: 3061 - var17 = 8; // L: 3062 - var3 = var3.substring("flash3:".length()); // L: 3063 - } else if (var15.startsWith("glow1:")) { // L: 3065 - var17 = 9; // L: 3066 - var3 = var3.substring("glow1:".length()); // L: 3067 - } else if (var15.startsWith("glow2:")) { // L: 3069 - var17 = 10; // L: 3070 - var3 = var3.substring("glow2:".length()); // L: 3071 - } else if (var15.startsWith("glow3:")) { // L: 3073 - var17 = 11; // L: 3074 - var3 = var3.substring("glow3:".length()); // L: 3075 - } - } - - var15 = var3.toLowerCase(); // L: 3078 - byte var7 = 0; // L: 3079 - if (var15.startsWith("wave:")) { // L: 3080 - var7 = 1; // L: 3081 - var3 = var3.substring("wave:".length()); // L: 3082 - } else if (var15.startsWith("wave2:")) { // L: 3084 - var7 = 2; // L: 3085 - var3 = var3.substring("wave2:".length()); // L: 3086 - } else if (var15.startsWith("shake:")) { // L: 3088 - var7 = 3; // L: 3089 - var3 = var3.substring("shake:".length()); // L: 3090 - } else if (var15.startsWith("scroll:")) { // L: 3092 - var7 = 4; // L: 3093 - var3 = var3.substring("scroll:".length()); // L: 3094 - } else if (var15.startsWith("slide:")) { // L: 3096 - var7 = 5; // L: 3097 - var3 = var3.substring("slide:".length()); // L: 3098 - } else if (NPCComposition.clientLanguage != Language.Language_EN) { // L: 3100 - if (var15.startsWith("wave:")) { // L: 3101 - var7 = 1; // L: 3102 - var3 = var3.substring("wave:".length()); // L: 3103 - } else if (var15.startsWith("wave2:")) { // L: 3105 - var7 = 2; // L: 3106 - var3 = var3.substring("wave2:".length()); // L: 3107 - } else if (var15.startsWith("shake:")) { // L: 3109 - var7 = 3; // L: 3110 - var3 = var3.substring("shake:".length()); // L: 3111 - } else if (var15.startsWith("scroll:")) { // L: 3113 - var7 = 4; // L: 3114 - var3 = var3.substring("scroll:".length()); // L: 3115 - } else if (var15.startsWith("slide:")) { // L: 3117 - var7 = 5; // L: 3118 - var3 = var3.substring("slide:".length()); // L: 3119 - } - } - - PacketBufferNode var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); // L: 3123 - var8.packetBuffer.writeByte(0); // L: 3124 - int var9 = var8.packetBuffer.offset; // L: 3125 - var8.packetBuffer.writeByte(var11); // L: 3126 - var8.packetBuffer.writeByte(var17); // L: 3127 - var8.packetBuffer.writeByte(var7); // L: 3128 - Clock.method3721(var8.packetBuffer, var3); // L: 3129 - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); // L: 3130 - Client.packetWriter.addNode(var8); // L: 3131 - return 1; // L: 3132 - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3134 - Interpreter.Interpreter_stringStackSize -= 2; // L: 3135 - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3136 - String var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3137 - PacketBufferNode var5 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); // L: 3139 - var5.packetBuffer.writeShort(0); // L: 3140 - int var6 = var5.packetBuffer.offset; // L: 3141 - var5.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 3142 - Clock.method3721(var5.packetBuffer, var4); // L: 3143 - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); // L: 3144 - Client.packetWriter.addNode(var5); // L: 3145 - return 1; // L: 3146 - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3148 - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3155 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3156 - return 1; // L: 3157 - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3159 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3160 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MilliClock.Messages_getHistorySize(var10); // L: 3161 - return 1; // L: 3162 - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3164 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3165 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Messages_getNextChatID(var10); // L: 3166 - return 1; // L: 3167 - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3169 - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3170 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBarUpdate.Messages_getLastChatID(var10); // L: 3171 - return 1; // L: 3172 - } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3174 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3175 - WorldMapSection0.doCheat(var3); // L: 3176 - return 1; // L: 3177 - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3179 - Client.field882 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3180 - return 1; // L: 3181 - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3183 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field882; // L: 3184 - return 1; // L: 3185 - } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3187 - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3188 - System.out.println(var3); // L: 3189 - return 1; // L: 3190 - } else { - return 2; // L: 3192 - } - } else { - if (UserComparator9.localPlayer != null && UserComparator9.localPlayer.username != null) { // L: 3150 - var3 = UserComparator9.localPlayer.username.getName(); - } else { - var3 = ""; // L: 3151 - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 3152 - return 1; // L: 3153 - } - } - } - } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "1774948144" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); // L: 11557 - short[] var2 = new short[16]; // L: 11558 - int var3 = 0; // L: 11559 - - for (int var4 = 0; var4 < class52.ItemDefinition_fileCount; ++var4) { // L: 11560 - ItemComposition var9 = class281.ItemDefinition_get(var4); // L: 11561 - if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11562 11563 11564 - if (var3 >= 250) { // L: 11565 - NPC.foundItemIdCount = -1; // L: 11566 - class52.foundItemIds = null; // L: 11567 - return; // L: 11568 - } - - if (var3 >= var2.length) { // L: 11570 - short[] var6 = new short[var2.length * 2]; // L: 11571 - - for (int var7 = 0; var7 < var3; ++var7) { // L: 11572 - var6[var7] = var2[var7]; - } - - var2 = var6; // L: 11573 - } - - var2[var3++] = (short)var4; // L: 11575 - } - } - - class52.foundItemIds = var2; // L: 11577 - WorldMapLabelSize.foundItemIndex = 0; // L: 11578 - NPC.foundItemIdCount = var3; // L: 11579 - String[] var8 = new String[NPC.foundItemIdCount]; // L: 11580 - - for (int var5 = 0; var5 < NPC.foundItemIdCount; ++var5) { // L: 11581 - var8[var5] = class281.ItemDefinition_get(var2[var5]).name; - } - - HealthBarUpdate.method1873(var8, class52.foundItemIds); // L: 11582 - } // L: 11583 } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index ec589c3046..e86515bbe7 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,213 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mo") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 815275653 - ) - int field3945; - @ObfuscatedName("ak") - boolean field3951; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -1145818319 - ) - int field3952; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1017850713 - ) - int field3953; - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 1420360389 - ) - int field3956; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = 522167755 - ) - int field3955; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = 1444442479 - ) - int field3967; - @ObfuscatedName("aw") - boolean field3957; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = -881839919 - ) - int field3958; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = 1492819171 - ) - int field3959; @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -612286533 + intValue = -1020471777 + ) + int field3978; + @ObfuscatedName("aw") + boolean field3974; + @ObfuscatedName("ap") + @ObfuscatedGetter( + intValue = -1427969131 ) int field3960; - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 445372909 + intValue = -257458079 ) - int field3962; - @ObfuscatedName("ai") - String field3972; - @ObfuscatedName("ab") - String field3963; - @ObfuscatedName("au") - String field3964; + int field3969; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1624069527 + ) + int field3961; @ObfuscatedName("ad") - String field3942; + @ObfuscatedGetter( + intValue = -1468711737 + ) + int field3963; @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -543314391 + intValue = -527267229 + ) + int field3964; + @ObfuscatedName("ao") + boolean field3965; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = -1760079217 ) int field3966; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -1469678885 + intValue = -623871219 ) - int field3950; - @ObfuscatedName("ao") + int field3971; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -771005193 + intValue = -1977981671 ) int field3968; - @ObfuscatedName("bj") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 2032975169 + intValue = -1215936229 ) - int field3961; - @ObfuscatedName("bn") - String field3970; - @ObfuscatedName("bi") - String field3971; - @ObfuscatedName("bp") - int[] field3948; + int field3982; + @ObfuscatedName("aa") + String field3977; + @ObfuscatedName("al") + String field3967; + @ObfuscatedName("ar") + String field3972; + @ObfuscatedName("ak") + String field3973; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 1699686401 + ) + int field3970; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = 1455599319 + ) + int field3975; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = 1261873211 + ) + int field3976; + @ObfuscatedName("bh") + @ObfuscatedGetter( + intValue = 321508639 + ) + int field3956; @ObfuscatedName("br") + String field3950; + @ObfuscatedName("bn") + String field3979; + @ObfuscatedName("bi") + int[] field3980; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 988785623 + intValue = -1522227319 ) - int field3973; - @ObfuscatedName("bq") - String field3974; + int field3981; + @ObfuscatedName("bk") + String field3952; 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.field3948 = new int[3]; // L: 62 - this.field3945 = var1; // L: 67 - this.field3951 = var2; // L: 68 - this.field3952 = var3; // L: 69 - this.field3953 = var4; // L: 70 - this.field3956 = var5; // L: 71 - this.field3955 = var6; // L: 72 - this.field3967 = var7; // L: 73 - this.field3957 = var8; // L: 74 - this.field3958 = var9; // L: 75 - this.field3959 = var10; // L: 76 - this.field3960 = var11; // L: 77 - this.field3962 = var12; // L: 78 - this.field3972 = var13; // L: 79 - this.field3963 = var14; // L: 80 - this.field3964 = var15; // L: 81 - this.field3942 = var16; // L: 82 - this.field3966 = var17; // L: 83 - this.field3950 = var18; // L: 84 - this.field3968 = var19; // L: 85 - this.field3961 = var20; // L: 86 - this.field3970 = var21; // L: 87 - this.field3971 = var22; // L: 88 - this.field3948 = var23; // L: 89 - this.field3973 = var24; // L: 90 - this.field3974 = var25; // L: 91 + this.field3980 = new int[3]; // L: 62 + this.field3978 = var1; // L: 67 + this.field3974 = var2; // L: 68 + this.field3960 = var3; // L: 69 + this.field3969 = var4; // L: 70 + this.field3961 = var5; // L: 71 + this.field3963 = var6; // L: 72 + this.field3964 = var7; // L: 73 + this.field3965 = var8; // L: 74 + this.field3966 = var9; // L: 75 + this.field3971 = var10; // L: 76 + this.field3968 = var11; // L: 77 + this.field3982 = var12; // L: 78 + this.field3977 = var13; // L: 79 + this.field3967 = var14; // L: 80 + this.field3972 = var15; // L: 81 + this.field3973 = var16; // L: 82 + this.field3970 = var17; // L: 83 + this.field3975 = var18; // L: 84 + this.field3976 = var19; // L: 85 + this.field3956 = var20; // L: 86 + this.field3950 = var21; // L: 87 + this.field3979 = var22; // L: 88 + this.field3980 = var23; // L: 89 + this.field3981 = var24; // L: 90 + this.field3952 = var25; // L: 91 } // L: 92 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1387696137" + descriptor = "(Lnu;I)V", + garbageValue = "506631790" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); // L: 95 - var1.writeByte(this.field3945); // L: 96 - var1.writeByte(this.field3951 ? 1 : 0); // L: 97 - var1.writeShort(this.field3952); // L: 98 - var1.writeByte(this.field3953); // L: 99 - var1.writeByte(this.field3956); // L: 100 - var1.writeByte(this.field3955); // L: 101 - var1.writeByte(this.field3967); // L: 102 - var1.writeByte(this.field3957 ? 1 : 0); // L: 103 - var1.writeShort(this.field3958); // L: 104 - var1.writeByte(this.field3959); // L: 105 - var1.writeMedium(this.field3960); // L: 106 - var1.writeShort(this.field3962); // L: 107 - var1.writeStringCp1252NullCircumfixed(this.field3972); // L: 108 - var1.writeStringCp1252NullCircumfixed(this.field3963); // L: 109 - var1.writeStringCp1252NullCircumfixed(this.field3964); // L: 110 - var1.writeStringCp1252NullCircumfixed(this.field3942); // L: 111 - var1.writeByte(this.field3950); // L: 112 - var1.writeShort(this.field3966); // L: 113 - var1.writeStringCp1252NullCircumfixed(this.field3970); // L: 114 - var1.writeStringCp1252NullCircumfixed(this.field3971); // L: 115 - var1.writeByte(this.field3968); // L: 116 - var1.writeByte(this.field3961); // L: 117 + var1.writeByte(this.field3978); // L: 96 + var1.writeByte(this.field3974 ? 1 : 0); // L: 97 + var1.writeShort(this.field3960); // L: 98 + var1.writeByte(this.field3969); // L: 99 + var1.writeByte(this.field3961); // L: 100 + var1.writeByte(this.field3963); // L: 101 + var1.writeByte(this.field3964); // L: 102 + var1.writeByte(this.field3965 ? 1 : 0); // L: 103 + var1.writeShort(this.field3966); // L: 104 + var1.writeByte(this.field3971); // L: 105 + var1.writeMedium(this.field3968); // L: 106 + var1.writeShort(this.field3982); // L: 107 + var1.writeStringCp1252NullCircumfixed(this.field3977); // L: 108 + var1.writeStringCp1252NullCircumfixed(this.field3967); // L: 109 + var1.writeStringCp1252NullCircumfixed(this.field3972); // L: 110 + var1.writeStringCp1252NullCircumfixed(this.field3973); // L: 111 + var1.writeByte(this.field3975); // L: 112 + var1.writeShort(this.field3970); // L: 113 + var1.writeStringCp1252NullCircumfixed(this.field3950); // L: 114 + var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 115 + var1.writeByte(this.field3976); // L: 116 + var1.writeByte(this.field3956); // L: 117 - for (int var2 = 0; var2 < this.field3948.length; ++var2) { // L: 118 - var1.writeInt(this.field3948[var2]); + for (int var2 = 0; var2 < this.field3980.length; ++var2) { // L: 118 + var1.writeInt(this.field3980[var2]); } - var1.writeInt(this.field3973); // L: 119 - var1.writeStringCp1252NullCircumfixed(this.field3974); // L: 120 + var1.writeInt(this.field3981); // L: 119 + var1.writeStringCp1252NullCircumfixed(this.field3952); // L: 120 } // L: 121 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-90" + descriptor = "(I)I", + garbageValue = "2100625862" ) @Export("size") public int size() { byte var1 = 39; // L: 124 - int var11 = var1 + ApproximateRouteStrategy.method1314(this.field3972); // L: 125 - var11 += ApproximateRouteStrategy.method1314(this.field3963); // L: 126 - var11 += ApproximateRouteStrategy.method1314(this.field3964); // L: 127 - var11 += ApproximateRouteStrategy.method1314(this.field3942); // L: 128 - String var4 = this.field3970; // L: 131 - int var3 = var4.length() + 2; // L: 133 - var11 += var3; // L: 135 - String var7 = this.field3971; // L: 138 - int var6 = var7.length() + 2; // L: 140 - var11 += var6; // L: 142 - String var10 = this.field3974; // L: 145 - int var9 = var10.length() + 2; // L: 147 - var11 += var9; // L: 149 - return var11; // L: 150 + int var2 = var1 + UrlRequester.method2388(this.field3977); // L: 125 + var2 += UrlRequester.method2388(this.field3967); // L: 126 + var2 += UrlRequester.method2388(this.field3972); // L: 127 + var2 += UrlRequester.method2388(this.field3973); // L: 128 + var2 += UrlRequester.method2388(this.field3950); // L: 129 + var2 += UrlRequester.method2388(this.field3979); // L: 130 + var2 += UrlRequester.method2388(this.field3952); // L: 131 + return var2; // L: 132 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "-1" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 - if (var4 == null) { // L: 24 - var4 = new ChatChannel(); // L: 25 - Messages.Messages_channels.put(var0, var4); // L: 26 - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 - Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 - Messages.Messages_queue.add(var5); // L: 30 - Client.chatCycle = Client.cycleCntr; // L: 31 - } // L: 32 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 230d33ca7f..3ab917c039 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("md") +@ObfuscatedName("mi") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Lmn;", - garbageValue = "583399336" + descriptor = "(I)Lmo;", + garbageValue = "-740064176" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index a5d1ccffd5..eeea46f44b 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,160 +3,172 @@ 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("cs") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lkk;" + @ObfuscatedName("lv") + @ObfuscatedGetter( + intValue = 1743715259 ) - @Export("username") - Username username; - @ObfuscatedName("v") + @Export("menuWidth") + static int menuWidth; + @ObfuscatedName("lr") @ObfuscatedSignature( descriptor = "Lhu;" ) + static Widget field1192; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llw;" + ) + @Export("username") + Username username; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lht;" + ) @Export("appearance") PlayerComposition appearance; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -542532009 + intValue = -977719887 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2086179455 + intValue = -408127355 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("actions") String[] actions; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1032185691 + intValue = 1388157533 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -844211389 + intValue = -1578238861 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2099878383 + intValue = 1337282737 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1111564727 + intValue = 1410786421 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1006983921 + intValue = 1885617879 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2021402629 + intValue = -269548317 ) - int field637; - @ObfuscatedName("a") + int field1175; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -141826323 + intValue = -1894921585 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2121626467 + intValue = -1189884347 ) - int field639; - @ObfuscatedName("k") + int field1177; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Lgv;" ) @Export("model0") Model model0; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 123594343 + intValue = 233121641 ) @Export("minX") int minX; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2053334325 + intValue = -14411627 ) @Export("minY") int minY; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1294199975 + intValue = -875595153 ) @Export("maxX") int maxX; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1259880177 + intValue = 602004441 ) @Export("maxY") int maxY; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1563525681 + intValue = 1987166721 ) @Export("team") int team; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("isHidden") boolean isHidden; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1722408107 + intValue = -500648257 ) @Export("plane") int plane; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1541347041 + intValue = 797660319 ) @Export("index") int index; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("isInClanChat") TriBool isInClanChat; + @ObfuscatedName("ac") + boolean field1189; @ObfuscatedName("ay") - boolean field652; - @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1937405249 + intValue = 1160349387 ) @Export("tileX") int tileX; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1915597601 + intValue = -2033773215 ) @Export("tileY") int tileY; @@ -177,15 +189,15 @@ public final class Player extends Actor { this.isUnanimated = false; // L: 40 this.team = 0; // L: 41 this.isHidden = false; // L: 42 - this.isFriendTriBool = TriBool.TriBool_unknown; - this.isInClanChat = TriBool.TriBool_unknown; - this.field652 = false; + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 45 + this.isInClanChat = TriBool.TriBool_unknown; // L: 46 + this.field1189 = false; // L: 47 } // L: 51 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "937296924" + descriptor = "(Lnu;B)V", + garbageValue = "20" ) @Export("read") final void read(Buffer var1) { @@ -212,7 +224,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { // L: 73 - int var8 = class281.ItemDefinition_get(var4[var5] - 512).team; // L: 74 + int var8 = class23.ItemDefinition_get(var4[var5] - 512).team; // L: 74 if (var8 != 0) { // L: 75 this.team = var8; } @@ -224,7 +236,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { // L: 79 var7 = var1.readUnsignedByte(); // L: 80 - if (var7 < 0 || var7 >= class105.field1339[var6].length) { // L: 81 + if (var7 < 0 || var7 >= ChatChannel.field1086[var6].length) { // L: 81 var7 = 0; } @@ -267,11 +279,11 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), Message.loginType); // L: 99 + this.username = new Username(var1.readStringCp1252NullTerminated(), AbstractUserComparator.loginType); // L: 99 this.clearIsFriend(); // L: 100 this.clearIsInClanChat(); // L: 101 - if (this == UserComparator9.localPlayer) { // L: 102 - class1.localPlayerName = this.username.getName(); + if (this == Varcs.localPlayer) { // L: 102 + RunException.localPlayerName = this.username.getName(); } this.combatLevel = var1.readUnsignedByte(); // L: 103 @@ -288,96 +300,18 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); // L: 108 } // L: 109 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "644215303" - ) - @Export("isFriend") - boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 112 - this.checkIsFriend(); // L: 113 - } - - return this.isFriendTriBool == TriBool.TriBool_true; // L: 115 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "511487286" - ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; // L: 119 - } // L: 120 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "667815611" - ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = InterfaceParent.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 - } // L: 124 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "34388997" - ) - @Export("isClanMember") - boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 127 - this.updateIsInClanChat(); // L: 128 - } - - return this.isInClanChat == TriBool.TriBool_true; // L: 130 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-54" - ) - @Export("clearIsInClanChat") - void clearIsInClanChat() { - this.isInClanChat = TriBool.TriBool_unknown; // L: 134 - } // L: 135 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "3" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - this.isInClanChat = WorldMapID.clanChat != null && WorldMapID.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 - } // L: 139 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1075941627" - ) - @Export("transformedSize") - int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class90.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" + descriptor = "(I)Lgv;", + garbageValue = "1835906978" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { // L: 149 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? InterfaceParent.SequenceDefinition_get(super.sequence) : null; // L: 150 - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : InterfaceParent.SequenceDefinition_get(super.movementSequence); // L: 151 + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class225.SequenceDefinition_get(super.sequence) : null; // L: 150 + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : class225.SequenceDefinition_get(super.movementSequence); // L: 151 Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 152 if (var3 == null) { // L: 153 return null; @@ -387,9 +321,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 156 - var4 = AbstractUserComparator.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 157 + var4 = Varps.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 157 if (var4 != null) { // L: 158 - var4.offsetBy(0, -super.field994, 0); // L: 159 + var4.offsetBy(0, -super.field1238, 0); // L: 159 var5 = new Model[]{var3, var4}; // L: 160 var3 = new Model(var5, 2); // L: 161 } @@ -402,7 +336,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 166 var4 = this.model0; // L: 167 - var4.offsetBy(this.field637 - super.x, this.tileHeight2 - this.tileHeight, this.field639 - super.y); // L: 168 + var4.offsetBy(this.field1175 - super.x, this.tileHeight2 - this.tileHeight, this.field1177 - super.y); // L: 168 if (super.orientation == 512) { // L: 169 var4.rotateY90Ccw(); // L: 170 var4.rotateY90Ccw(); // L: 171 @@ -427,7 +361,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); // L: 189 } - var4.offsetBy(super.x - this.field637, this.tileHeight - this.tileHeight2, super.y - this.field639); // L: 191 + var4.offsetBy(super.x - this.field1175, this.tileHeight - this.tileHeight2, super.y - this.field1177); // L: 191 } } @@ -437,384 +371,102 @@ public final class Player extends Actor { } } + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "-13206" + ) + @Export("isFriend") + boolean isFriend() { + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 112 + this.checkIsFriend(); // L: 113 + } + + return this.isFriendTriBool == TriBool.TriBool_true; // L: 115 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-799905621" + ) + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 119 + } // L: 120 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2126620163" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = class13.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 + } // L: 124 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "1666089616" + ) + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 127 + this.updateIsInClanChat(); // L: 128 + } + + return this.isInClanChat == TriBool.TriBool_true; // L: 130 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1597100975" + ) + @Export("clearIsInClanChat") + void clearIsInClanChat() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 134 + } // L: 135 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-790736304" + ) + @Export("updateIsInClanChat") + void updateIsInClanChat() { + this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 + } // L: 139 + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIBI)V", - garbageValue = "1833516243" + descriptor = "(I)I", + garbageValue = "1864035459" ) - final void method1327(int var1, int var2, byte var3) { - if (super.sequence != -1 && InterfaceParent.SequenceDefinition_get(super.sequence).field3565 == 1) { // L: 199 + @Export("transformedSize") + int transformedSize() { + return this.appearance != null && this.appearance.npcTransformId != -1 ? GraphicsObject.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IIBI)V", + garbageValue = "1419129901" + ) + final void method2120(int var1, int var2, byte var3) { + if (super.sequence != -1 && class225.SequenceDefinition_get(super.sequence).field3723 == 1) { // L: 199 super.sequence = -1; } - super.field981 = -1; // L: 200 + super.field1237 = -1; // L: 200 if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 201 if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 202 - if (var3 == 2) { // L: 204 - Player var4 = this; // L: 205 - int var5 = super.pathX[0]; // L: 207 - int var6 = super.pathY[0]; // L: 208 - int var7 = this.transformedSize(); // L: 209 - if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 210 211 - int var9 = this.transformedSize(); // L: 213 - RouteStrategy var10 = GrandExchangeOfferAgeComparator.method214(var1, var2); // L: 214 - CollisionMap var11 = Client.collisionMaps[this.plane]; // L: 215 - int[] var12 = Client.field708; // L: 216 - int[] var13 = Client.field859; // L: 217 - int var14 = 0; - - label550: - while (true) { - int var15; - if (var14 >= 128) { - int var16; - int var17; - byte var19; - int var20; - int var21; - int var23; - int var25; - int var26; - int var27; - int var28; - boolean var34; - int var36; - int var37; - int var39; - if (var9 == 1) { // L: 226 - var34 = MusicPatchPcmStream.method4098(var5, var6, var10, var11); - } else if (var9 == 2) { // L: 227 - var34 = WorldMapElement.method4591(var5, var6, var10, var11); - } else { - var16 = var5; // L: 231 - var17 = var6; // L: 232 - byte var18 = 64; // L: 233 - var19 = 64; // L: 234 - var20 = var5 - var18; // L: 235 - var21 = var6 - var19; // L: 236 - class182.directions[var18][var19] = 99; // L: 237 - class182.distances[var18][var19] = 0; // L: 238 - byte var22 = 0; // L: 239 - var23 = 0; // L: 240 - class182.bufferX[var22] = var5; // L: 241 - var39 = var22 + 1; - class182.bufferY[var22] = var6; - int[][] var24 = var11.flags; - - boolean var35; - label536: - while (true) { - label534: - while (true) { - do { - do { - do { - label511: - do { - if (var23 == var39) { // L: 244 - class182.field2118 = var16; // L: 364 - class182.field2124 = var17; // L: 365 - var35 = false; // L: 366 - break label536; - } - - var16 = class182.bufferX[var23]; // L: 245 - var17 = class182.bufferY[var23]; // L: 246 - var23 = var23 + 1 & 4095; // L: 247 - var36 = var16 - var20; // L: 248 - var37 = var17 - var21; // L: 249 - var25 = var16 - var11.xInset; // L: 250 - var26 = var17 - var11.yInset; // L: 251 - if (var10.hasArrived(var9, var16, var17, var11)) { // L: 252 - class182.field2118 = var16; // L: 253 - class182.field2124 = var17; // L: 254 - var35 = true; // L: 255 - break label536; - } - - var27 = class182.distances[var36][var37] + 1; // L: 258 - if (var36 > 0 && class182.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136782) == 0 && (var24[var25 - 1][var9 + var26 - 1] & 19136824) == 0) { // L: 259 260 261 262 - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class182.bufferX[var39] = var16 - 1; // L: 266 - class182.bufferY[var39] = var17; // L: 267 - var39 = var39 + 1 & 4095; // L: 268 - class182.directions[var36 - 1][var37] = 2; // L: 269 - class182.distances[var36 - 1][var37] = var27; // L: 270 - break; - } - - if ((var24[var25 - 1][var28 + var26] & 19136830) != 0) { // L: 264 - break; - } - - ++var28; // L: 263 - } - } - - if (var36 < 128 - var9 && class182.directions[var36 + 1][var37] == 0 && (var24[var9 + var25][var26] & 19136899) == 0 && (var24[var25 + var9][var26 + var9 - 1] & 19136992) == 0) { // L: 272 273 274 275 - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class182.bufferX[var39] = var16 + 1; // L: 279 - class182.bufferY[var39] = var17; // L: 280 - var39 = var39 + 1 & 4095; // L: 281 - class182.directions[var36 + 1][var37] = 8; // L: 282 - class182.distances[var36 + 1][var37] = var27; // L: 283 - break; - } - - if ((var24[var25 + var9][var28 + var26] & 19136995) != 0) { // L: 277 - break; - } - - ++var28; // L: 276 - } - } - - if (var37 > 0 && class182.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136782) == 0 && (var24[var25 + var9 - 1][var26 - 1] & 19136899) == 0) { // L: 285 286 287 288 - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class182.bufferX[var39] = var16; // L: 292 - class182.bufferY[var39] = var17 - 1; // L: 293 - var39 = var39 + 1 & 4095; // L: 294 - class182.directions[var36][var37 - 1] = 1; // L: 295 - class182.distances[var36][var37 - 1] = var27; // L: 296 - break; - } - - if ((var24[var28 + var25][var26 - 1] & 19136911) != 0) { // L: 290 - break; - } - - ++var28; // L: 289 - } - } - - if (var37 < 128 - var9 && class182.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + var9] & 19136824) == 0 && (var24[var25 + var9 - 1][var9 + var26] & 19136992) == 0) { // L: 298 299 300 301 - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class182.bufferX[var39] = var16; // L: 305 - class182.bufferY[var39] = var17 + 1; // L: 306 - var39 = var39 + 1 & 4095; // L: 307 - class182.directions[var36][var37 + 1] = 4; // L: 308 - class182.distances[var36][var37 + 1] = var27; // L: 309 - break; - } - - if ((var24[var28 + var25][var26 + var9] & 19137016) != 0) { // L: 303 - break; - } - - ++var28; // L: 302 - } - } - - if (var36 > 0 && var37 > 0 && class182.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0) { // L: 311 312 313 - var28 = 1; - - while (true) { - if (var28 >= var9) { - class182.bufferX[var39] = var16 - 1; // L: 318 - class182.bufferY[var39] = var17 - 1; // L: 319 - var39 = var39 + 1 & 4095; // L: 320 - class182.directions[var36 - 1][var37 - 1] = 3; // L: 321 - class182.distances[var36 - 1][var37 - 1] = var27; // L: 322 - break; - } - - if ((var24[var25 - 1][var28 + (var26 - 1)] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 - 1] & 19136911) != 0) { // L: 315 316 - break; - } - - ++var28; // L: 314 - } - } - - if (var36 < 128 - var9 && var37 > 0 && class182.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + var9][var26 - 1] & 19136899) == 0) { // L: 324 325 326 - var28 = 1; - - while (true) { - if (var28 >= var9) { - class182.bufferX[var39] = var16 + 1; // L: 331 - class182.bufferY[var39] = var17 - 1; // L: 332 - var39 = var39 + 1 & 4095; // L: 333 - class182.directions[var36 + 1][var37 - 1] = 9; // L: 334 - class182.distances[var36 + 1][var37 - 1] = var27; // L: 335 - break; - } - - if ((var24[var9 + var25][var28 + (var26 - 1)] & 19136995) != 0 || (var24[var25 + var28][var26 - 1] & 19136911) != 0) { // L: 328 329 - break; - } - - ++var28; // L: 327 - } - } - - if (var36 > 0 && var37 < 128 - var9 && class182.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + var9] & 19136824) == 0) { // L: 337 338 339 - for (var28 = 1; var28 < var9; ++var28) { // L: 340 - if ((var24[var25 - 1][var26 + var28] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var9 + var26] & 19137016) != 0) { // L: 341 342 - continue label511; - } - } - - class182.bufferX[var39] = var16 - 1; // L: 344 - class182.bufferY[var39] = var17 + 1; // L: 345 - var39 = var39 + 1 & 4095; // L: 346 - class182.directions[var36 - 1][var37 + 1] = 6; // L: 347 - class182.distances[var36 - 1][var37 + 1] = var27; // L: 348 - } - } while(var36 >= 128 - var9); // L: 350 - } while(var37 >= 128 - var9); - } while(class182.directions[var36 + 1][var37 + 1] != 0); // L: 351 - } while((var24[var25 + var9][var9 + var26] & 19136992) != 0); // L: 352 - - for (var28 = 1; var28 < var9; ++var28) { // L: 353 - if ((var24[var25 + var28][var26 + var9] & 19137016) != 0 || (var24[var9 + var25][var26 + var28] & 19136995) != 0) { // L: 354 355 - continue label534; - } - } - - class182.bufferX[var39] = var16 + 1; // L: 357 - class182.bufferY[var39] = var17 + 1; // L: 358 - var39 = var39 + 1 & 4095; // L: 359 - class182.directions[var36 + 1][var37 + 1] = 12; // L: 360 - class182.distances[var36 + 1][var37 + 1] = var27; // L: 361 - } - } - - var34 = var35; // L: 368 - } - - int var8; - label589: { - var15 = var5 - 64; // L: 370 - var16 = var6 - 64; // L: 371 - var17 = class182.field2118; // L: 372 - var36 = class182.field2124; // L: 373 - if (!var34) { // L: 374 - var37 = Integer.MAX_VALUE; // L: 376 - var20 = Integer.MAX_VALUE; // L: 377 - byte var38 = 10; // L: 378 - var39 = var10.approxDestinationX; // L: 379 - var23 = var10.approxDestinationY; // L: 380 - int var33 = var10.approxDestinationSizeX; // L: 381 - var25 = var10.approxDestinationSizeY; // L: 382 - - for (var26 = var39 - var38; var26 <= var39 + var38; ++var26) { // L: 383 - for (var27 = var23 - var38; var27 <= var38 + var23; ++var27) { // L: 384 - var28 = var26 - var15; // L: 385 - int var29 = var27 - var16; // L: 386 - if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class182.distances[var28][var29] < 100) { // L: 387 388 - int var30 = 0; // L: 389 - if (var26 < var39) { // L: 390 - var30 = var39 - var26; - } else if (var26 > var33 + var39 - 1) { // L: 391 - var30 = var26 - (var39 + var33 - 1); - } - - int var31 = 0; // L: 392 - if (var27 < var23) { // L: 393 - var31 = var23 - var27; - } else if (var27 > var25 + var23 - 1) { // L: 394 - var31 = var27 - (var23 + var25 - 1); - } - - int var32 = var31 * var31 + var30 * var30; // L: 395 - if (var32 < var37 || var37 == var32 && class182.distances[var28][var29] < var20) { // L: 396 - var37 = var32; // L: 397 - var20 = class182.distances[var28][var29]; // L: 398 - var17 = var26; // L: 399 - var36 = var27; // L: 400 - } - } - } - } - - if (var37 == Integer.MAX_VALUE) { // L: 406 - var8 = -1; // L: 407 - break label589; - } - } - - if (var5 == var17 && var6 == var36) { // L: 416 - var8 = 0; // L: 417 - } else { - var19 = 0; // L: 420 - class182.bufferX[var19] = var17; // L: 423 - var37 = var19 + 1; - class182.bufferY[var19] = var36; // L: 424 - - for (var20 = var21 = class182.directions[var17 - var15][var36 - var16]; var17 != var5 || var6 != var36; var20 = class182.directions[var17 - var15][var36 - var16]) { // L: 425 426 436 - if (var20 != var21) { // L: 427 - var21 = var20; // L: 428 - class182.bufferX[var37] = var17; // L: 429 - class182.bufferY[var37++] = var36; // L: 430 - } - - if ((var20 & 2) != 0) { // L: 432 - ++var17; - } else if ((var20 & 8) != 0) { // L: 433 - --var17; - } - - if ((var20 & 1) != 0) { // L: 434 - ++var36; - } else if ((var20 & 4) != 0) { // L: 435 - --var36; - } - } - - var39 = 0; // L: 438 - - while (var37-- > 0) { // L: 439 - var12[var39] = class182.bufferX[var37]; // L: 440 - var13[var39++] = class182.bufferY[var37]; // L: 441 - if (var39 >= var12.length) { // L: 442 - break; - } - } - - var8 = var39; // L: 444 - } - } - - var14 = var8; // L: 446 - if (var8 < 1) { // L: 447 - break; - } - - var15 = 0; // L: 448 - - while (true) { - if (var15 >= var14 - 1) { - break label550; - } - - var4.method1329(Client.field708[var15], Client.field859[var15], (byte)2); - ++var15; - } - } - - for (var15 = 0; var15 < 128; ++var15) { // L: 220 - class182.directions[var14][var15] = 0; // L: 221 - class182.distances[var14][var15] = 99999999; // L: 222 - } - - ++var14; // L: 219 - } - } + if (var3 == 2) { + DevicePcmPlayerProvider.method470(this, var1, var2, (byte)2); // L: 204 } - this.method1329(var1, var2, var3); // L: 451 + this.method2142(var1, var2, var3); // L: 205 } else { this.resetPath(var1, var2); } @@ -822,109 +474,162 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } // L: 453 + } // L: 207 - @ObfuscatedName("s") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-101" + descriptor = "(III)V", + garbageValue = "-1191185889" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; // L: 456 - super.field1012 = 0; // L: 457 - super.field989 = 0; // L: 458 - super.pathX[0] = var1; // L: 459 - super.pathY[0] = var2; // L: 460 - int var3 = this.transformedSize(); // L: 461 - super.x = var3 * 64 + super.pathX[0] * 128; // L: 462 - super.y = var3 * 64 + super.pathY[0] * 128; // L: 463 - } // L: 464 + super.pathLength = 0; // L: 210 + super.field1224 = 0; // L: 211 + super.field1267 = 0; // L: 212 + super.pathX[0] = var1; // L: 213 + super.pathY[0] = var2; // L: 214 + int var3 = this.transformedSize(); // L: 215 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 216 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 217 + } // L: 218 - @ObfuscatedName("b") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "-498567231" + garbageValue = "1951772159" ) - final void method1329(int var1, int var2, byte var3) { - if (super.pathLength < 9) { // L: 467 + final void method2142(int var1, int var2, byte var3) { + if (super.pathLength < 9) { // L: 221 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 468 - super.pathX[var4] = super.pathX[var4 - 1]; // L: 469 - super.pathY[var4] = super.pathY[var4 - 1]; // L: 470 - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 471 + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 222 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 223 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 224 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 225 } - super.pathX[0] = var1; // L: 473 - super.pathY[0] = var2; // L: 474 - super.pathTraversed[0] = var3; // L: 475 - } // L: 476 + super.pathX[0] = var1; // L: 227 + super.pathY[0] = var2; // L: 228 + super.pathTraversed[0] = var3; // L: 229 + } // L: 230 - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-251916247" + descriptor = "(B)Z", + garbageValue = "-3" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; // L: 479 + return this.appearance != null; // L: 233 } - @ObfuscatedName("q") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(B)Lcq;", - garbageValue = "1" + descriptor = "(ILcc;ZI)I", + garbageValue = "-726167195" ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 - } + static int method2140(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1189 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1190 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var3)); // L: 1191 + return 1; // L: 1192 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1194 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1201 + if (var3.dataText == null) { // L: 1202 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1203 + } - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "4" - ) - public static int method1317(byte[] var0, int var1, int var2) { - int var3 = -1; // L: 45 - - for (int var4 = var1; var4 < var2; ++var4) { // L: 46 - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47 - } - - var3 = ~var3; // L: 49 - return var3; // L: 50 - } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1132112001" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; // L: 7815 - Client.isMenuOpen = false; // L: 7816 - Client.menuActions[0] = "Cancel"; // L: 7818 - Client.menuTargets[0] = ""; // L: 7819 - Client.menuOpcodes[0] = 1006; // L: 7820 - Client.menuShiftClick[0] = false; // L: 7821 - Client.menuOptionsCount = 1; // L: 7822 - } // L: 7823 - - @ObfuscatedName("ki") - @ObfuscatedSignature( - descriptor = "(Lhz;B)Ljava/lang/String;", - garbageValue = "101" - ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (MusicPatch.Widget_unpackTargetMask(class60.getWidgetFlags(var0)) == 0) { // L: 11507 - return null; + return 1; // L: 1204 + } else { + return 2; // L: 1206 + } } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11508 11509 11511 + int var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1195 + --var4; // L: 1196 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1197 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1198 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1199 } } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1281921833" + ) + static final int method2148(int var0, int var1) { + if (var0 == -2) { // L: 999 + return 12345678; + } else if (var0 == -1) { // L: 1000 + if (var1 < 2) { // L: 1001 + var1 = 2; + } else if (var1 > 126) { // L: 1002 + var1 = 126; + } + + return var1; // L: 1003 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 1005 + if (var1 < 2) { // L: 1006 + var1 = 2; + } else if (var1 > 126) { // L: 1007 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 1008 + } + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-73" + ) + static final boolean method2150(int var0) { + if (var0 < 0) { // L: 7968 + return false; + } else { + int var1 = Client.menuOpcodes[var0]; // L: 7969 + if (var1 >= 2000) { // L: 7970 + var1 -= 2000; + } + + return var1 == 1007; // L: 7971 + } + } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(IIIB)Lcv;", + garbageValue = "55" + ) + static final InterfaceParent method2151(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 11301 + var3.group = var1; // L: 11302 + var3.type = var2; // L: 11303 + Client.interfaceParents.put(var3, (long)var0); // L: 11304 + PlayerComposition.Widget_resetModelFrames(var1); // L: 11305 + Widget var4 = class139.getWidget(var0); // L: 11306 + class29.invalidateWidget(var4); // L: 11307 + if (Client.meslayerContinueWidget != null) { // L: 11308 + class29.invalidateWidget(Client.meslayerContinueWidget); // L: 11309 + Client.meslayerContinueWidget = null; // L: 11310 + } + + AbstractWorldMapIcon.method3186(); // L: 11312 + UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11313 + AbstractSocket.runWidgetOnLoadListener(var1); // L: 11314 + if (Client.rootInterface != -1) { // L: 11315 + class379.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 11316 + } } diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java index 53b5a9098e..b759e537fb 100644 --- a/runescape-client/src/main/java/PlayerComposition.java +++ b/runescape-client/src/main/java/PlayerComposition.java @@ -4,68 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("ht") @Implements("PlayerComposition") public class PlayerComposition { - @ObfuscatedName("nn") - @ObfuscatedGetter( - intValue = 458719567 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("z") - public static short[] field2565; - @ObfuscatedName("s") + @ObfuscatedName("k") + public static short[] field2601; + @ObfuscatedName("n") + public static short[][] field2596; + @ObfuscatedName("l") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("equipment") int[] equipment; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -690765261 + intValue = 1124941233 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = -999355041191352595L + longValue = -9046432818636348341L ) @Export("hash") long hash; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - longValue = -9216110116012845385L + longValue = -3040880622035732721L ) - long field2567; + long field2600; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 23 PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); // L: 24 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "([I[IZII)V", - garbageValue = "201187402" + garbageValue = "-1757144268" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -74,8 +64,8 @@ public class PlayerComposition { for (int var5 = 0; var5 < 7; ++var5) { // L: 29 for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 30 - KitDefinition var7 = Client.KitDefinition_get(var6); // L: 31 - if (var7 != null && !var7.nonSelectable && var5 + (var3 ? 7 : 0) == var7.bodypartID) { // L: 32 + KitDefinition var7 = SpriteMask.KitDefinition_get(var6); // L: 31 + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { // L: 32 var1[equipmentIndices[var5]] = var6 + 256; // L: 33 break; // L: 34 } @@ -90,10 +80,10 @@ public class PlayerComposition { this.setHash(); // L: 43 } // L: 44 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IZB)V", - garbageValue = "2" + garbageValue = "-86" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -111,13 +101,13 @@ public class PlayerComposition { } } else { ++var3; // L: 57 - if (var3 >= KitDefinition.KitDefinition_fileCount) { - var3 = 0; // L: 58 + if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 58 + var3 = 0; } } - var4 = Client.KitDefinition_get(var3); // L: 60 - } while(var4 == null || var4.nonSelectable || var4.bodypartID != var1 + (this.isFemale ? 7 : 0)); // L: 61 + var4 = SpriteMask.KitDefinition_get(var3); // L: 60 + } while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 61 this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 63 this.setHash(); // L: 64 @@ -125,315 +115,323 @@ public class PlayerComposition { } } // L: 65 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "1851941979" + garbageValue = "108911198" ) - public void method4206(int var1, boolean var2) { + public void method4205(int var1, boolean var2) { int var3 = this.bodyColors[var1]; // L: 68 - boolean var4; if (!var2) { // L: 69 do { --var3; // L: 71 if (var3 < 0) { // L: 72 - var3 = class105.field1339[var1].length - 1; // L: 73 + var3 = ChatChannel.field1086[var1].length - 1; // L: 73 } - - if (var1 == 4 && var3 >= 8) { // L: 77 - var4 = false; // L: 78 - } else { - var4 = true; // L: 81 - } - } while(!var4); // L: 83 + } while(!TriBool.method5817(var1, var3)); // L: 75 } else { do { - ++var3; // L: 88 - if (var3 >= class105.field1339[var1].length) { // L: 89 + ++var3; // L: 80 + if (var3 >= ChatChannel.field1086[var1].length) { // L: 81 var3 = 0; } - - if (var1 == 4 && var3 >= 8) { // L: 92 - var4 = false; // L: 93 - } else { - var4 = true; // L: 96 - } - } while(!var4); // L: 98 + } while(!TriBool.method5817(var1, var3)); // L: 82 } - this.bodyColors[var1] = var3; // L: 101 - this.setHash(); // L: 102 - } // L: 103 + this.bodyColors[var1] = var3; // L: 85 + this.setHash(); // L: 86 + } // L: 87 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "50" + descriptor = "(ZI)V", + garbageValue = "280516890" ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { // L: 106 - this.update((int[])null, this.bodyColors, var1, -1); // L: 107 + if (this.isFemale != var1) { // L: 90 + this.update((int[])null, this.bodyColors, var1, -1); // L: 91 } - } // L: 108 + } // L: 92 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "1010099742" + descriptor = "(Lnu;I)V", + garbageValue = "1914698329" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); // L: 111 + var1.writeByte(this.isFemale ? 1 : 0); // L: 95 int var2; - for (var2 = 0; var2 < 7; ++var2) { // L: 112 - int var3 = this.equipment[equipmentIndices[var2]]; // L: 113 - if (var3 == 0) { // L: 114 + for (var2 = 0; var2 < 7; ++var2) { // L: 96 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 97 + if (var3 == 0) { // L: 98 var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); // L: 115 + var1.writeByte(var3 - 256); // L: 99 } } - for (var2 = 0; var2 < 5; ++var2) { // L: 117 + for (var2 = 0; var2 < 5; ++var2) { // L: 101 var1.writeByte(this.bodyColors[var2]); } - } // L: 118 + } // L: 102 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "90" + descriptor = "(I)V", + garbageValue = "-2039912675" ) @Export("setHash") void setHash() { - long var1 = this.hash; // L: 121 - int var3 = this.equipment[5]; // L: 122 - int var4 = this.equipment[9]; // L: 123 - this.equipment[5] = var4; // L: 124 - this.equipment[9] = var3; // L: 125 - this.hash = 0L; // L: 126 + long var1 = this.hash; // L: 105 + int var3 = this.equipment[5]; // L: 106 + int var4 = this.equipment[9]; // L: 107 + this.equipment[5] = var4; // L: 108 + this.equipment[9] = var3; // L: 109 + this.hash = 0L; // L: 110 int var5; - for (var5 = 0; var5 < 12; ++var5) { // L: 127 - this.hash <<= 4; // L: 128 - if (this.equipment[var5] >= 256) { // L: 129 + for (var5 = 0; var5 < 12; ++var5) { // L: 111 + this.hash <<= 4; // L: 112 + if (this.equipment[var5] >= 256) { // L: 113 this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { // L: 131 + if (this.equipment[0] >= 256) { // L: 115 this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { // L: 132 + if (this.equipment[1] >= 256) { // L: 116 this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { // L: 133 - this.hash <<= 3; // L: 134 - this.hash += (long)this.bodyColors[var5]; // L: 135 + for (var5 = 0; var5 < 5; ++var5) { // L: 117 + this.hash <<= 3; // L: 118 + this.hash += (long)this.bodyColors[var5]; // L: 119 } - this.hash <<= 1; // L: 137 - this.hash += (long)(this.isFemale ? 1 : 0); // L: 138 - this.equipment[5] = var3; // L: 139 - this.equipment[9] = var4; // L: 140 - if (0L != var1 && var1 != this.hash) { // L: 141 + this.hash <<= 1; // L: 121 + this.hash += (long)(this.isFemale ? 1 : 0); // L: 122 + this.equipment[5] = var3; // L: 123 + this.equipment[9] = var4; // L: 124 + if (var1 != 0L && var1 != this.hash) { // L: 125 PlayerAppearance_cachedModels.remove(var1); } - } // L: 142 + } // L: 126 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljs;ILjs;IB)Lef;", - garbageValue = "-34" + descriptor = "(Lkw;ILkw;II)Lgv;", + garbageValue = "2136869602" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { // L: 145 - return class90.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 146 + if (this.npcTransformId != -1) { // L: 129 + return GraphicsObject.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 130 } else { - long var5 = this.hash; // L: 148 - int[] var7 = this.equipment; // L: 149 - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 150 - var7 = new int[12]; // L: 151 + long var5 = this.hash; // L: 132 + int[] var7 = this.equipment; // L: 133 + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 134 + var7 = new int[12]; // L: 135 - for (int var8 = 0; var8 < 12; ++var8) { // L: 152 + for (int var8 = 0; var8 < 12; ++var8) { // L: 136 var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { // L: 153 - var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 154 - var7[5] = var1.shield; // L: 155 + if (var1.shield >= 0) { // L: 137 + var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 138 + var7[5] = var1.shield; // L: 139 } - if (var1.weapon >= 0) { // L: 157 - var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 158 - var7[3] = var1.weapon; // L: 159 + if (var1.weapon >= 0) { // L: 141 + var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 142 + var7[3] = var1.weapon; // L: 143 } } - Model var15 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 162 - if (var15 == null) { // L: 163 - boolean var9 = false; // L: 164 + Model var15 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 146 + if (var15 == null) { // L: 147 + boolean var9 = false; // L: 148 int var11; - for (int var10 = 0; var10 < 12; ++var10) { // L: 165 - var11 = var7[var10]; // L: 166 - if (var11 >= 256 && var11 < 512 && !Client.KitDefinition_get(var11 - 256).ready()) { // L: 167 168 + for (int var10 = 0; var10 < 12; ++var10) { // L: 149 + var11 = var7[var10]; // L: 150 + if (var11 >= 256 && var11 < 512 && !SpriteMask.KitDefinition_get(var11 - 256).ready()) { // L: 151 152 var9 = true; } - if (var11 >= 512 && !class281.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 170 171 + if (var11 >= 512 && !class23.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 154 155 var9 = true; } } - if (var9) { // L: 174 - if (-1L != this.field2567) { // L: 175 - var15 = (Model)PlayerAppearance_cachedModels.get(this.field2567); + if (var9) { // L: 158 + if (this.field2600 != -1L) { // L: 159 + var15 = (Model)PlayerAppearance_cachedModels.get(this.field2600); } - if (var15 == null) { // L: 176 + if (var15 == null) { // L: 160 return null; } } - if (var15 == null) { // L: 178 - ModelData[] var16 = new ModelData[12]; // L: 179 - var11 = 0; // L: 180 + if (var15 == null) { // L: 162 + ModelData[] var16 = new ModelData[12]; // L: 163 + var11 = 0; // L: 164 int var13; - for (int var12 = 0; var12 < 12; ++var12) { // L: 181 - var13 = var7[var12]; // L: 182 + for (int var12 = 0; var12 < 12; ++var12) { // L: 165 + var13 = var7[var12]; // L: 166 ModelData var14; - if (var13 >= 256 && var13 < 512) { // L: 183 - var14 = Client.KitDefinition_get(var13 - 256).getModelData(); // L: 184 - if (var14 != null) { // L: 185 + if (var13 >= 256 && var13 < 512) { // L: 167 + var14 = SpriteMask.KitDefinition_get(var13 - 256).getModelData(); // L: 168 + if (var14 != null) { // L: 169 var16[var11++] = var14; } } - if (var13 >= 512) { // L: 187 - var14 = class281.ItemDefinition_get(var13 - 512).method4866(this.isFemale); // L: 188 - if (var14 != null) { // L: 189 + if (var13 >= 512) { // L: 171 + var14 = class23.ItemDefinition_get(var13 - 512).method5280(this.isFemale); // L: 172 + if (var14 != null) { // L: 173 var16[var11++] = var14; } } } - ModelData var17 = new ModelData(var16, var11); // L: 192 + ModelData var17 = new ModelData(var16, var11); // L: 176 - for (var13 = 0; var13 < 5; ++var13) { // L: 193 - if (this.bodyColors[var13] < class105.field1339[var13].length) { // L: 194 - var17.recolor(field2565[var13], class105.field1339[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { // L: 177 + if (this.bodyColors[var13] < ChatChannel.field1086[var13].length) { // L: 178 + var17.recolor(field2601[var13], ChatChannel.field1086[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < WorldMapSprite.field259[var13].length) { // L: 195 - var17.recolor(HealthBar.field1143[var13], WorldMapSprite.field259[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2596[var13].length) { // L: 179 + var17.recolor(WorldMapSection1.field1753[var13], field2596[var13][this.bodyColors[var13]]); } } - var15 = var17.toModel(64, 850, -30, -50, -30); // L: 197 - PlayerAppearance_cachedModels.put(var15, var5); // L: 198 - this.field2567 = var5; // L: 199 + var15 = var17.toModel(64, 850, -30, -50, -30); // L: 181 + PlayerAppearance_cachedModels.put(var15, var5); // L: 182 + this.field2600 = var5; // L: 183 } } - if (var1 == null && var3 == null) { // L: 203 + if (var1 == null && var3 == null) { // L: 187 return var15; } else { Model var18; - if (var1 != null && var3 != null) { // L: 204 + if (var1 != null && var3 != null) { // L: 188 var18 = var1.applyTransformations(var15, var2, var3, var4); - } else if (var1 != null) { // L: 205 + } else if (var1 != null) { // L: 189 var18 = var1.transformActorModel(var15, var2); } else { - var18 = var3.transformActorModel(var15, var4); // L: 206 + var18 = var3.transformActorModel(var15, var4); // L: 190 } - return var18; // L: 207 + return var18; // L: 191 } } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lek;", - garbageValue = "1513420182" + descriptor = "(I)Lfs;", + garbageValue = "-2099433668" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { // L: 211 - return class90.getNpcDefinition(this.npcTransformId).getModelData(); // L: 212 + if (this.npcTransformId != -1) { // L: 195 + return GraphicsObject.getNpcDefinition(this.npcTransformId).getModelData(); // L: 196 } else { - boolean var1 = false; // L: 214 + boolean var1 = false; // L: 198 int var3; - for (int var2 = 0; var2 < 12; ++var2) { // L: 215 - var3 = this.equipment[var2]; // L: 216 - if (var3 >= 256 && var3 < 512 && !Client.KitDefinition_get(var3 - 256).method4640()) { // L: 217 218 + for (int var2 = 0; var2 < 12; ++var2) { // L: 199 + var3 = this.equipment[var2]; // L: 200 + if (var3 >= 256 && var3 < 512 && !SpriteMask.KitDefinition_get(var3 - 256).method4950()) { // L: 201 202 var1 = true; } - if (var3 >= 512 && !class281.ItemDefinition_get(var3 - 512).method4879(this.isFemale)) { // L: 220 221 + if (var3 >= 512 && !class23.ItemDefinition_get(var3 - 512).method5237(this.isFemale)) { // L: 204 205 var1 = true; } } - if (var1) { // L: 224 + if (var1) { // L: 208 return null; } else { - ModelData[] var7 = new ModelData[12]; // L: 225 - var3 = 0; // L: 226 + ModelData[] var7 = new ModelData[12]; // L: 209 + var3 = 0; // L: 210 int var5; - for (int var4 = 0; var4 < 12; ++var4) { // L: 227 - var5 = this.equipment[var4]; // L: 228 + for (int var4 = 0; var4 < 12; ++var4) { // L: 211 + var5 = this.equipment[var4]; // L: 212 ModelData var6; - if (var5 >= 256 && var5 < 512) { // L: 229 - var6 = Client.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 230 - if (var6 != null) { // L: 231 + if (var5 >= 256 && var5 < 512) { // L: 213 + var6 = SpriteMask.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 214 + if (var6 != null) { // L: 215 var7[var3++] = var6; } } - if (var5 >= 512) { // L: 233 - var6 = class281.ItemDefinition_get(var5 - 512).method4880(this.isFemale); // L: 234 - if (var6 != null) { // L: 235 + if (var5 >= 512) { // L: 217 + var6 = class23.ItemDefinition_get(var5 - 512).method5238(this.isFemale); // L: 218 + if (var6 != null) { // L: 219 var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); // L: 238 + ModelData var8 = new ModelData(var7, var3); // L: 222 - for (var5 = 0; var5 < 5; ++var5) { // L: 239 - if (this.bodyColors[var5] < class105.field1339[var5].length) { // L: 240 - var8.recolor(field2565[var5], class105.field1339[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { // L: 223 + if (this.bodyColors[var5] < ChatChannel.field1086[var5].length) { // L: 224 + var8.recolor(field2601[var5], ChatChannel.field1086[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < WorldMapSprite.field259[var5].length) { // L: 241 - var8.recolor(HealthBar.field1143[var5], WorldMapSprite.field259[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2596[var5].length) { // L: 225 + var8.recolor(WorldMapSection1.field1753[var5], field2596[var5][this.bodyColors[var5]]); } } - return var8; // L: 243 + return var8; // L: 227 } } } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1390124562" + descriptor = "(B)I", + garbageValue = "1" ) @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 + class90.getNpcDefinition(this.npcTransformId).id; // L: 247 248 + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + GraphicsObject.getNpcDefinition(this.npcTransformId).id; // L: 231 232 } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1122535637" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (class15.loadInterface(var0)) { // L: 11085 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 11086 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11087 + Widget var3 = var1[var2]; // L: 11088 + if (var3 != null) { // L: 11089 + var3.modelFrame = 0; // L: 11090 + var3.modelFrameCycle = 0; // L: 11091 + } + } + + } + } // L: 11093 } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 45588f9c8f..49423e2d46 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("be") @Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(S)Ldh;", - garbageValue = "-25384" + descriptor = "(B)Lbh;", + garbageValue = "87" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 5993cb6c25..6087d9c824 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -1,80 +1,70 @@ -import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iv") +@ObfuscatedName("it") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true), - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Liv;" + descriptor = "Lit;" ) - field3132(6, 22, false, false, true); + field3226(6, 22, false, false, true); - @ObfuscatedName("oa") - @ObfuscatedSignature( - descriptor = "Lfo;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("a") - public static boolean field3137; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -765581079 + intValue = 1018159087 ) @Export("id") final int id; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1093542945 + intValue = 210736671 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("isUser") public final boolean isUser; @@ -85,81 +75,73 @@ public enum PlayerType implements Enumerated { this.isUser = var7; // L: 27 } // L: 28 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 31 } - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "2124061265" + descriptor = "(B)V", + garbageValue = "58" ) - static void method4345(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 119 - var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 120 - KeyHandler.field417 = -1; // L: 121 - } // L: 122 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "373518150" - ) - static int method4346(int var0, Script var1, boolean var2) { - Widget var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1216 - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1217 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1218 - return 1; // L: 1219 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1221 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1222 - return 1; // L: 1223 - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1225 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1226 - return 1; // L: 1227 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1229 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1230 - return 1; // L: 1231 - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1233 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1234 - return 1; // L: 1235 - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1237 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1238 - return 1; // L: 1239 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1241 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1242 - return 1; // L: 1243 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1245 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1246 - return 1; // L: 1247 - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1249 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1250 - return 1; // L: 1251 - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1253 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1254 - return 1; // L: 1255 - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1257 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1258 - return 1; // L: 1259 - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1261 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1262 - return 1; // L: 1263 - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1265 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1266 - return 1; // L: 1267 - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1269 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1270 - return 1; // L: 1271 - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1273 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1274 - return 1; // L: 1275 - } else { - return 2; // L: 1277 + public static void method4414() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 58 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 59 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 60 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 61 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 62 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 63 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 64 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 65 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 66 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 67 } - } + } // L: 69 + + @ObfuscatedName("hm") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-96" + ) + static final void method4410() { + boolean var0 = false; // L: 8967 + + while (!var0) { // L: 8968 + var0 = true; // L: 8969 + + for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8970 + if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 8971 + String var2 = Client.menuTargets[var1]; // L: 8972 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8973 + Client.menuTargets[var1 + 1] = var2; // L: 8974 + String var3 = Client.menuActions[var1]; // L: 8975 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8976 + Client.menuActions[var1 + 1] = var3; // L: 8977 + int var4 = Client.menuOpcodes[var1]; // L: 8978 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8979 + Client.menuOpcodes[var1 + 1] = var4; // L: 8980 + var4 = Client.menuArguments1[var1]; // L: 8981 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8982 + Client.menuArguments1[var1 + 1] = var4; // L: 8983 + var4 = Client.menuArguments2[var1]; // L: 8984 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8985 + Client.menuArguments2[var1 + 1] = var4; // L: 8986 + var4 = Client.menuIdentifiers[var1]; // L: 8987 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8988 + Client.menuIdentifiers[var1 + 1] = var4; // L: 8989 + boolean var5 = Client.menuShiftClick[var1]; // L: 8990 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8991 + Client.menuShiftClick[var1 + 1] = var5; // L: 8992 + var0 = false; // L: 8993 + } + } + } + + } // L: 8997 } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 9144b817d3..e1acf15e15 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,64 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("dq") @Implements("Players") public class Players { - @ObfuscatedName("d") - static byte[] field1275; - @ObfuscatedName("c") - static byte[] field1274; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "[Lkx;" - ) - static Buffer[] field1269; - @ObfuscatedName("h") + @ObfuscatedName("ri") @ObfuscatedGetter( - intValue = 286612825 + intValue = -579575011 + ) + static int field1363; + @ObfuscatedName("u") + static byte[] field1350; + @ObfuscatedName("p") + static byte[] field1351; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "[Lnu;" + ) + static Buffer[] field1352; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1868594255 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1913130791 + intValue = -1778639293 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 8929153 + intValue = -1410622735 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lkx;" + descriptor = "Lnu;" ) - static Buffer field1279; + static Buffer field1362; + @ObfuscatedName("il") + @ObfuscatedGetter( + intValue = 1389932207 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; static { - field1275 = new byte[2048]; // L: 18 - field1274 = new byte[2048]; // L: 19 - field1269 = new Buffer[2048]; // L: 20 + field1350 = new byte[2048]; // L: 18 + field1351 = new byte[2048]; // L: 19 + field1352 = new Buffer[2048]; // L: 20 Players_count = 0; // L: 21 Players_indices = new int[2048]; // L: 22 Players_emptyIdxCount = 0; // L: 23 @@ -71,103 +82,222 @@ public class Players { Players_targetIndices = new int[2048]; // L: 27 Players_pendingUpdateCount = 0; // L: 28 Players_pendingUpdateIndices = new int[2048]; // L: 29 - field1279 = new Buffer(new byte[5000]); // L: 30 + field1362 = new Buffer(new byte[5000]); // L: 30 } - @ObfuscatedName("fe") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lcv;I)V", - garbageValue = "-202535471" + descriptor = "(III)I", + garbageValue = "-1145960243" ) - static final void method2286(Actor var0) { - var0.isWalking = false; // L: 3706 - SequenceDefinition var1; - if (var0.movementSequence != -1) { // L: 3707 - var1 = InterfaceParent.SequenceDefinition_get(var0.movementSequence); // L: 3708 - if (var1 != null && var1.frameIds != null) { // L: 3709 - ++var0.movementFrameCycle; // L: 3710 - if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 3711 - var0.movementFrameCycle = 1; // L: 3712 - ++var0.movementFrame; // L: 3713 - class169.method3637(var1, var0.movementFrame, var0.x, var0.y); // L: 3714 - } - - if (var0.movementFrame >= var1.frameIds.length) { // L: 3716 - var0.movementFrameCycle = 0; // L: 3717 - var0.movementFrame = 0; // L: 3718 - class169.method3637(var1, var0.movementFrame, var0.x, var0.y); // L: 3719 - } - } else { - var0.movementSequence = -1; // L: 3722 + static int method2285(int var0, int var1) { + if (var0 == -2) { // L: 37 + return 12345678; + } else if (var0 == -1) { // L: 38 + if (var1 < 0) { // L: 39 + var1 = 0; // L: 40 + } else if (var1 > 127) { // L: 42 + var1 = 127; // L: 43 } + + var1 = 127 - var1; + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 51 } + } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field993) { // L: 3724 - if (var0.spotAnimationFrame < 0) { // L: 3725 - var0.spotAnimationFrame = 0; - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "1829024921" + ) + public static boolean method2287(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 45 + return true; + } else { + if (var0 != 0) { // L: 46 + char[] var1 = class300.cp1252AsciiExtension; // L: 48 - int var3 = AbstractUserComparator.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3726 - if (var3 != -1) { // L: 3727 - SequenceDefinition var2 = InterfaceParent.SequenceDefinition_get(var3); // L: 3728 - if (var2 != null && var2.frameIds != null) { // L: 3729 - ++var0.spotAnimationFrameCycle; // L: 3730 - if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 3731 - var0.spotAnimationFrameCycle = 1; // L: 3732 - ++var0.spotAnimationFrame; // L: 3733 - class169.method3637(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 3734 - } - - if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 3736 3737 - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; // L: 3740 - } - } else { - var0.spotAnimation = -1; // L: 3742 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3744 - var1 = InterfaceParent.SequenceDefinition_get(var0.sequence); // L: 3745 - if (var1.field3564 == 1 && var0.field1012 > 0 && var0.field999 <= Client.cycle && var0.field1000 < Client.cycle) { // L: 3746 3747 - var0.sequenceDelay = 1; // L: 3748 - return; // L: 3749 - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3753 - var1 = InterfaceParent.SequenceDefinition_get(var0.sequence); // L: 3754 - if (var1 != null && var1.frameIds != null) { // L: 3755 - ++var0.sequenceFrameCycle; // L: 3756 - if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 3757 - var0.sequenceFrameCycle = 1; // L: 3758 - ++var0.sequenceFrame; // L: 3759 - class169.method3637(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3760 - } - - if (var0.sequenceFrame >= var1.frameIds.length) { // L: 3762 - var0.sequenceFrame -= var1.frameCount; // L: 3763 - ++var0.field973; // L: 3764 - if (var0.field973 >= var1.field3563) { // L: 3765 - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 3766 - class169.method3637(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3767 - } else { - var0.sequence = -1; + 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 } } - - var0.isWalking = var1.field3559; // L: 3769 - } else { - var0.sequence = -1; // L: 3771 } + + return false; // L: 59 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-499281641" + ) + static String method2283() { + String var0; + if (Login.clientPreferences.hideUsername) { // L: 188 + String var2 = Login.Login_username; // L: 190 + int var4 = var2.length(); // L: 193 + char[] var5 = new char[var4]; // L: 195 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 196 + var5[var6] = '*'; + } + + String var3 = new String(var5); // L: 197 + var0 = var3; // L: 201 + } else { + var0 = Login.Login_username; // L: 203 } - if (var0.sequenceDelay > 0) { // L: 3773 - --var0.sequenceDelay; + return var0; // L: 204 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Lir;Ljava/lang/String;Ljava/lang/String;I)[Low;", + garbageValue = "-210921559" + ) + public static IndexedSprite[] method2284(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 146 + int var4 = var0.getFileId(var3, var2); // L: 147 + return class309.method5603(var0, var3, var4); // L: 148 + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + descriptor = "(ZLnk;B)V", + garbageValue = "-121" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 4695 + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 4696 + int var2 = var1.method6766(); // L: 4697 + var3 = var1.method6617(); // L: 4698 + var4 = var1.readUnsignedShort(); // L: 4699 + NPC.xteaKeys = new int[var4][4]; // L: 4700 + + for (var5 = 0; var5 < var4; ++var5) { // L: 4701 + for (var6 = 0; var6 < 4; ++var6) { // L: 4702 + NPC.xteaKeys[var5][var6] = var1.readInt(); // L: 4703 + } + } + + class11.regions = new int[var4]; // L: 4706 + WorldMapData_0.regionMapArchiveIds = new int[var4]; // L: 4707 + class18.regionLandArchiveIds = new int[var4]; // L: 4708 + class15.regionLandArchives = new byte[var4][]; // L: 4709 + MouseHandler.regionMapArchives = new byte[var4][]; // L: 4710 + boolean var16 = false; // L: 4711 + if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 4712 + var16 = true; + } + + if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 4713 + var16 = true; + } + + var4 = 0; // L: 4714 + + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 4715 + for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 4716 + var8 = var7 + (var6 << 8); // L: 4717 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 4718 + class11.regions[var4] = var8; // L: 4719 + WorldMapData_0.regionMapArchiveIds[var4] = class157.archive5.getGroupId("m" + var6 + "_" + var7); // L: 4720 + class18.regionLandArchiveIds[var4] = class157.archive5.getGroupId("l" + var6 + "_" + var7); // L: 4721 + ++var4; // L: 4722 + } + } + } + + LoginScreenAnimation.method2185(var2, var3, true); // L: 4725 + } else { + boolean var15 = var1.method6623() == 1; // L: 4728 + var3 = var1.method6766(); // L: 4729 + var4 = var1.method6766(); // L: 4730 + var5 = var1.readUnsignedShort(); // L: 4731 + var1.importIndex(); // L: 4732 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 4733 + for (var7 = 0; var7 < 13; ++var7) { // L: 4734 + for (var8 = 0; var8 < 13; ++var8) { // L: 4735 + var9 = var1.readBits(1); // L: 4736 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 4737 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 4738 + } + } + } + } + + var1.exportIndex(); // L: 4742 + NPC.xteaKeys = new int[var5][4]; // L: 4743 + + for (var6 = 0; var6 < var5; ++var6) { // L: 4744 + for (var7 = 0; var7 < 4; ++var7) { // L: 4745 + NPC.xteaKeys[var6][var7] = var1.readInt(); // L: 4746 + } + } + + class11.regions = new int[var5]; // L: 4749 + WorldMapData_0.regionMapArchiveIds = new int[var5]; // L: 4750 + class18.regionLandArchiveIds = new int[var5]; // L: 4751 + class15.regionLandArchives = new byte[var5][]; // L: 4752 + MouseHandler.regionMapArchives = new byte[var5][]; // L: 4753 + var5 = 0; // L: 4754 + + for (var6 = 0; var6 < 4; ++var6) { // L: 4755 + for (var7 = 0; var7 < 13; ++var7) { // L: 4756 + for (var8 = 0; var8 < 13; ++var8) { // L: 4757 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 4758 + if (var9 != -1) { // L: 4759 + int var10 = var9 >> 14 & 1023; // L: 4760 + int var11 = var9 >> 3 & 2047; // L: 4761 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 4762 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 4763 + if (class11.regions[var13] == var12) { + var12 = -1; // L: 4764 + break; // L: 4765 + } + } + + if (var12 != -1) { // L: 4767 + class11.regions[var5] = var12; // L: 4768 + var13 = var12 >> 8 & 255; // L: 4769 + int var14 = var12 & 255; // L: 4770 + WorldMapData_0.regionMapArchiveIds[var5] = class157.archive5.getGroupId("m" + var13 + "_" + var14); // L: 4771 + class18.regionLandArchiveIds[var5] = class157.archive5.getGroupId("l" + var13 + "_" + var14); // L: 4772 + ++var5; // L: 4773 + } + } + } + } + } + + LoginScreenAnimation.method2185(var3, var4, !var15); // L: 4779 } - } // L: 3774 + } // L: 4781 } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 64c683a00a..e5ea627a02 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,96 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("ln") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lln;" ) - static final PrivateChatMode field3829; - @ObfuscatedName("v") + static final PrivateChatMode field3892; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lln;" ) - public static final PrivateChatMode field3830; - @ObfuscatedName("d") + public static final PrivateChatMode field3891; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lld;" + descriptor = "Lln;" ) - static final PrivateChatMode field3831; - @ObfuscatedName("c") + static final PrivateChatMode field3893; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -441716017 + intValue = 1451320191 ) - public final int field3832; + public final int field3890; static { - field3829 = new PrivateChatMode(0); // L: 5 - field3830 = new PrivateChatMode(1); // L: 6 - field3831 = new PrivateChatMode(2); + field3892 = new PrivateChatMode(0); // L: 5 + field3891 = new PrivateChatMode(1); // L: 6 + field3893 = new PrivateChatMode(2); } // L: 7 PrivateChatMode(int var1) { - this.field3832 = var1; // L: 11 + this.field3890 = var1; // L: 11 } // L: 12 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1722143108" - ) - public static int method6104(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 35 - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 36 - var0 = var0 + (var0 >>> 4) & 252645135; // L: 37 - var0 += var0 >>> 8; // L: 38 - var0 += var0 >>> 16; // L: 39 - return var0 & 255; // L: 40 - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "(Lhz;IIIIIII)V", - garbageValue = "-1992669827" - ) - static final void method6107(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field731) { // L: 10006 - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; // L: 10007 - } - - Client.field731 = false; // L: 10008 - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10009 - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10010 - var0.scrollY -= 4; // L: 10011 - IsaacCipher.invalidateWidget(var0); // L: 10012 - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10014 - var0.scrollY += 4; // L: 10015 - IsaacCipher.invalidateWidget(var0); // L: 10016 - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10018 - var7 = var3 * (var3 - 32) / var4; // L: 10019 - if (var7 < 8) { // L: 10020 - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; // L: 10021 - int var9 = var3 - 32 - var7; // L: 10022 - var0.scrollY = var8 * (var4 - var3) / var9; // L: 10023 - IsaacCipher.invalidateWidget(var0); // L: 10024 - Client.field731 = true; // L: 10025 - } - } - - if (Client.mouseWheelRotation != 0) { // L: 10028 - var7 = var0.width; // L: 10029 - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10030 - var0.scrollY += Client.mouseWheelRotation * 45; // L: 10031 - IsaacCipher.invalidateWidget(var0); // L: 10032 - } - } - - } // L: 10035 } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 56408e442c..905cf9b1fb 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -1,694 +1,272 @@ -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("cm") +@ObfuscatedName("ce") @Implements("Projectile") public final class Projectile extends Renderable { - @ObfuscatedName("bv") - static String field1254; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -755996103 + intValue = 1989294347 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1141398545 + intValue = 830473187 ) @Export("plane") int plane; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 877328381 + intValue = 681655727 ) @Export("sourceX") int sourceX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1822373019 + intValue = 1797150279 ) @Export("sourceY") int sourceY; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -584501537 + intValue = 1639037601 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1427536699 + intValue = -873076039 ) @Export("endHeight") int endHeight; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1057628543 + intValue = 285476427 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1465417479 + intValue = 1384507767 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1352197335 + intValue = 931208305 ) @Export("slope") int slope; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1830330659 + intValue = 2012617583 ) @Export("startHeight") int startHeight; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 165397127 + intValue = -3097229 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("isMoving") boolean isMoving; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("x") double x; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("y") double y; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("z") double z; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("speedX") double speedX; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("speedY") double speedY; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("speed") double speed; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("speedZ") double speedZ; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1955217023 + intValue = 688098207 ) @Export("yaw") int yaw; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2095511803 + intValue = 257882257 ) @Export("pitch") int pitch; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ljs;" + descriptor = "Lkw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 900549733 + intValue = 1593867047 ) @Export("frame") int frame; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 404929191 + intValue = -1599773741 ) @Export("frameCycle") int frameCycle; Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { this.isMoving = false; // L: 20 - this.frame = 0; // L: 32 + this.frame = 0; 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; - this.cycleStart = var6; + this.sourceZ = var5; // L: 40 + this.cycleStart = var6; // L: 41 this.cycleEnd = var7; // L: 42 - this.slope = var8; + this.slope = var8; // L: 43 this.startHeight = var9; // L: 44 - this.targetIndex = var10; - this.endHeight = var11; + this.targetIndex = var10; // L: 45 + this.endHeight = var11; // L: 46 this.isMoving = false; // L: 47 - int var12 = AbstractUserComparator.SpotAnimationDefinition_get(this.id).sequence; + int var12 = Varps.SpotAnimationDefinition_get(this.id).sequence; // L: 48 if (var12 != -1) { // L: 49 - this.sequenceDefinition = InterfaceParent.SequenceDefinition_get(var12); + this.sequenceDefinition = class225.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 50 } - } + } // L: 51 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "101" + descriptor = "(IIIII)V", + garbageValue = "549276456" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; if (!this.isMoving) { // L: 54 - var5 = (double)(var1 - this.sourceX); - double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57 - this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58 - this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; + var5 = (double)(var1 - this.sourceX); // L: 55 + double var7 = (double)(var2 - this.sourceY); // L: 56 + double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57 + this.x = var5 * (double)this.startHeight / var9 + (double)this.sourceX; // L: 58 + this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; // L: 59 this.z = (double)this.sourceZ; // L: 60 } var5 = (double)(this.cycleEnd + 1 - var4); // L: 62 - 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) { - this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); + 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((double)this.slope * 0.02454369D); } - this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); + this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); // L: 67 } // L: 68 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "114" + descriptor = "(I)Lgv;", + garbageValue = "1835906978" + ) + @Export("getModel") + protected final Model getModel() { + SpotAnimationDefinition var1 = Varps.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); // L: 95 + return var2; // L: 96 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "622513403" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; - this.x += (double)var1 * this.speedX; - this.y += this.speedY * (double)var1; - this.z += (double)var1 * 0.5D * this.accelerationZ * (double)var1 + this.speedZ * (double)var1; - this.speedZ += (double)var1 * this.accelerationZ; + this.isMoving = true; // L: 71 + this.x += this.speedX * (double)var1; // L: 72 + this.y += this.speedY * (double)var1; // L: 73 + this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + (double)var1 * this.speedZ; // L: 74 + this.speedZ += (double)var1 * this.accelerationZ; // L: 75 this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76 this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77 - if (this.sequenceDefinition != null) { - this.frameCycle += var1; + 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; // L: 84 - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 85 this.frame = 0; } } } - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-1389566626" ) - @Export("getModel") - protected final Model getModel() { - SpotAnimationDefinition var1 = AbstractUserComparator.SpotAnimationDefinition_get(this.id); - Model var2 = var1.getModel(this.frame); // L: 93 - if (var2 == null) { // L: 94 - return null; - } else { - var2.rotateZ(this.pitch); - return var2; + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 + if (var4 == null) { // L: 24 + var4 = new ChatChannel(); // L: 25 + Messages.Messages_channels.put(var0, var4); // L: 26 } - } - @ObfuscatedName("n") + Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 + Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 + Messages.Messages_queue.add(var5); // L: 30 + Client.chatCycle = Client.cycleCntr; // L: 31 + } // L: 32 + + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "23" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "23539817" ) - @Export("findAndLoadCache") - public static void findAndLoadCache(String var0, String var1, int var2, int var3) throws IOException { - JagexCache.idxCount = var3; // L: 40 - JagexCache.cacheGamebuild = var2; // L: 41 - - try { - JagexCache.operatingSystemName = System.getProperty("os.name"); // L: 43 - } catch (Exception var28) { // L: 45 - JagexCache.operatingSystemName = "Unknown"; // L: 46 - } - - GZipDecompressor.formattedOperatingSystemName = JagexCache.operatingSystemName.toLowerCase(); // L: 48 - - try { - JagexCache.userHomeDirectory = System.getProperty("user.home"); // L: 50 - if (JagexCache.userHomeDirectory != null) { // L: 51 - JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/"; - } - } catch (Exception var27) { // L: 53 - } - - try { - if (GZipDecompressor.formattedOperatingSystemName.startsWith("win")) { // L: 55 - if (JagexCache.userHomeDirectory == null) { // L: 56 - JagexCache.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (JagexCache.userHomeDirectory == null) { // L: 59 - JagexCache.userHomeDirectory = System.getenv("HOME"); - } - - if (JagexCache.userHomeDirectory != null) { // L: 61 - JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/"; - } - } catch (Exception var26) { // L: 63 - } - - if (JagexCache.userHomeDirectory == null) { // L: 64 - JagexCache.userHomeDirectory = "~/"; - } - - class224.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", JagexCache.userHomeDirectory, "/tmp/", ""}; // L: 65 - Timer.cacheSubPaths = new String[]{".jagex_cache_" + JagexCache.cacheGamebuild, ".file_store_" + JagexCache.cacheGamebuild}; // L: 66 - int var18 = 0; - - label250: - while (var18 < 4) { - String var6 = var18 == 0 ? "" : "" + var18; // L: 70 - JagexCache.JagexCache_locationFile = new File(JagexCache.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 - String var7 = null; // L: 72 - String var8 = null; // L: 73 - boolean var9 = false; // L: 74 - Buffer var11; - File var33; - if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 - try { - AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 - - 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) { - throw new IOException(); // L: 82 - } - } - - 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 var30) { // L: 100 - var30.printStackTrace(); // L: 101 - } - - if (var7 != null) { // L: 103 - var33 = new File(var7); // L: 104 - if (!var33.exists()) { // L: 105 - var7 = null; // L: 106 - } - } - - if (var7 != null) { // L: 109 - var33 = new File(var7, "test.dat"); // L: 110 - if (!class23.isWriteable(var33, true)) { // L: 111 - var7 = null; // L: 112 - } - } - } - - if (var7 == null && var18 == 0) { // L: 116 - label225: - for (int var19 = 0; var19 < Timer.cacheSubPaths.length; ++var19) { // L: 117 - for (int var20 = 0; var20 < class224.cacheParentPaths.length; ++var20) { // L: 118 - File var21 = new File(class224.cacheParentPaths[var20] + Timer.cacheSubPaths[var19] + File.separatorChar + var0 + File.separatorChar); // L: 119 - if (var21.exists() && class23.isWriteable(new File(var21, "test.dat"), true)) { // L: 120 121 - var7 = var21.toString(); // L: 122 - var9 = true; // L: 123 - break label225; // L: 124 - } - } - } - } - - if (var7 == null) { // L: 130 - var7 = JagexCache.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 131 - var9 = true; // L: 132 - } - - File var32; - if (var8 != null) { // L: 134 - var32 = new File(var8); // L: 135 - var33 = new File(var7); // L: 136 - - try { - File[] var35 = var32.listFiles(); // L: 138 - File[] var22 = var35; // L: 140 - - for (int var14 = 0; var14 < var22.length; ++var14) { // L: 141 - File var15 = var22[var14]; // L: 142 - File var16 = new File(var33, var15.getName()); // L: 144 - boolean var17 = var15.renameTo(var16); // L: 145 - if (!var17) { // L: 146 - throw new IOException(); - } - } - } catch (Exception var29) { // L: 151 - var29.printStackTrace(); // L: 152 - } - - var9 = true; // L: 154 - } - - if (var9) { // L: 156 - var32 = new File(var7); // L: 157 - var11 = null; // L: 158 - - try { - AccessFile var36 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 162 - Buffer var37 = new Buffer(500); // L: 163 - var37.writeByte(3); // L: 164 - var37.writeByte(var11 != null ? 1 : 0); // L: 165 - var37.writeCESU8(var32.getPath()); // L: 166 - if (var11 != null) { // L: 167 - var37.writeCESU8(""); - } - - var36.write(var37.array, 0, var37.offset); // L: 168 - var36.close(); // L: 169 - } catch (IOException var25) { // L: 171 - var25.printStackTrace(); // L: 172 - } - } - - File var5 = new File(var7); // L: 176 - JagexCache.cacheDir = var5; // L: 178 - if (!JagexCache.cacheDir.exists()) { // L: 179 - JagexCache.cacheDir.mkdirs(); - } - - File[] var31 = JagexCache.cacheDir.listFiles(); // L: 180 - if (var31 != null) { // L: 181 - File[] var34 = var31; // L: 183 - - for (int var23 = 0; var23 < var34.length; ++var23) { // L: 184 - File var24 = var34[var23]; // L: 185 - if (!class23.isWriteable(var24, false)) { // L: 187 - ++var18; // L: 67 - continue label250; - } - } - } - break; - } - - class3.assertCacheDirExists(JagexCache.cacheDir); // L: 194 - Varcs.findOrCreateRandomDatFile(); // L: 195 - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GraphicsObject.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 196 - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GraphicsObject.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 197 - WorldMapEvent.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; // L: 198 - - for (var18 = 0; var18 < JagexCache.idxCount; ++var18) { // L: 199 - WorldMapEvent.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(GraphicsObject.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 200 - } - - } // L: 202 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)[B", - garbageValue = "-22" - ) - public static byte[] method2260() { - byte[] var0 = new byte[24]; // L: 279 - - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 281 - JagexCache.JagexCache_randomDat.readFully(var0); // L: 282 - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 283 284 285 - } - - if (var1 >= 24) { - throw new IOException(); // L: 287 - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { // L: 290 - var0[var2] = -1; - } - } - - return var0; // L: 292 - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-87" - ) - static final void method2262(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7826 - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7827 - Client.field816[var4] = true; - } - } - - } // L: 7829 - - @ObfuscatedName("ip") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "2" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9046 - WorldMapManager.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9047 - } - - long var4 = -1L; // L: 9050 - long var6 = -1L; // L: 9051 - - int var8; - for (var8 = 0; var8 < AbstractWorldMapData.method342(); ++var8) { // L: 9052 - long var22 = ObjectSound.method2044(var8); // L: 9053 - if (var22 != var6) { // L: 9054 - var6 = var22; // L: 9055 - int var11 = class200.method3865(var8); // L: 9056 - int var12 = NPC.method2179(var8); // L: 9057 - int var13 = FontName.method5502(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9060 - int var15 = AbstractWorldMapIcon.method710(var8); // L: 9063 - if (var13 == 2 && MilliClock.scene.getObjectFlags(class90.Client_plane, var11, var12, var22) >= 0) { // L: 9064 9065 - ObjectComposition var16 = WorldMapAreaData.getObjectDefinition(var15); // L: 9066 - if (var16.transforms != null) { // L: 9067 - var16 = var16.transform(); - } - - if (var16 == null) { // L: 9068 - continue; - } - - if (Client.isItemSelected == 1) { // L: 9069 - WorldMapManager.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FileSystem.colorStartTag(65535) + var16.name, 1, var15, var11, var12); // L: 9070 - } else if (Client.isSpellSelected) { // L: 9073 - if ((GrandExchangeOfferNameComparator.selectedSpellFlags & 4) == 4) { // L: 9074 - WorldMapManager.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FileSystem.colorStartTag(65535) + var16.name, 2, var15, var11, var12); // L: 9075 - } - } else { - String[] var17 = var16.actions; // L: 9080 - if (var17 != null) { // L: 9081 - for (int var18 = 4; var18 >= 0; --var18) { // L: 9082 - if (var17[var18] != null) { // L: 9083 - short var19 = 0; // L: 9084 - if (var18 == 0) { // L: 9085 - var19 = 3; - } - - if (var18 == 1) { // L: 9086 - var19 = 4; - } - - if (var18 == 2) { // L: 9087 - var19 = 5; - } - - if (var18 == 3) { // L: 9088 - var19 = 6; - } - - if (var18 == 4) { // L: 9089 - var19 = 1001; - } - - WorldMapManager.insertMenuItemNoShift(var17[var18], FileSystem.colorStartTag(65535) + var16.name, var19, var15, var11, var12); // L: 9090 - } - } - } - - WorldMapManager.insertMenuItemNoShift("Examine", FileSystem.colorStartTag(65535) + var16.name, 1002, var16.id, var11, var12); // L: 9095 - } - } - - Player var20; - int var24; - NPC var25; - int var32; - int[] var33; - if (var13 == 1) { // L: 9100 - NPC var28 = Client.npcs[var15]; // L: 9101 - if (var28 == null) { // L: 9102 - continue; - } - - if (var28.definition.size == 1 && (var28.x & 127) == 64 && (var28.y & 127) == 64) { // L: 9103 - for (var24 = 0; var24 < Client.npcCount; ++var24) { // L: 9104 - var25 = Client.npcs[Client.npcIndices[var24]]; // L: 9105 - if (var25 != null && var25 != var28 && var25.definition.size == 1 && var25.x == var28.x && var25.y == var28.y) { // L: 9106 - GameBuild.addNpcToMenu(var25.definition, Client.npcIndices[var24], var11, var12); - } - } - - var24 = Players.Players_count; // L: 9108 - var33 = Players.Players_indices; // L: 9109 - - for (var32 = 0; var32 < var24; ++var32) { // L: 9110 - var20 = Client.players[var33[var32]]; // L: 9111 - if (var20 != null && var20.x == var28.x && var20.y == var28.y) { // L: 9112 - GrandExchangeOfferUnitPriceComparator.addPlayerToMenu(var20, var33[var32], var11, var12); - } - } - } - - GameBuild.addNpcToMenu(var28.definition, var15, var11, var12); // L: 9115 - } - - if (var13 == 0) { // L: 9117 - Player var29 = Client.players[var15]; // L: 9118 - if (var29 == null) { // L: 9119 - continue; - } - - if ((var29.x & 127) == 64 && (var29.y & 127) == 64) { // L: 9120 - for (var24 = 0; var24 < Client.npcCount; ++var24) { // L: 9121 - var25 = Client.npcs[Client.npcIndices[var24]]; // L: 9122 - if (var25 != null && var25.definition.size == 1 && var29.x == var25.x && var29.y == var25.y) { // L: 9123 - GameBuild.addNpcToMenu(var25.definition, Client.npcIndices[var24], var11, var12); - } - } - - var24 = Players.Players_count; // L: 9125 - var33 = Players.Players_indices; // L: 9126 - - for (var32 = 0; var32 < var24; ++var32) { // L: 9127 - var20 = Client.players[var33[var32]]; // L: 9128 - if (var20 != null && var29 != var20 && var20.x == var29.x && var20.y == var29.y) { // L: 9129 - GrandExchangeOfferUnitPriceComparator.addPlayerToMenu(var20, var33[var32], var11, var12); - } - } - } - - if (var15 != Client.combatTargetPlayerIndex) { // L: 9132 - GrandExchangeOfferUnitPriceComparator.addPlayerToMenu(var29, var15, var11, var12); - } else { - var4 = var22; // L: 9133 - } - } - - if (var13 == 3) { // L: 9135 - NodeDeque var31 = Client.groundItems[class90.Client_plane][var11][var12]; // L: 9136 - if (var31 != null) { // L: 9137 - for (TileItem var30 = (TileItem)var31.first(); var30 != null; var30 = (TileItem)var31.next()) { // L: 9138 9139 9172 - ItemComposition var34 = class281.ItemDefinition_get(var30.id); // L: 9140 - if (Client.isItemSelected == 1) { // L: 9141 - WorldMapManager.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FileSystem.colorStartTag(16748608) + var34.name, 16, var30.id, var11, var12); // L: 9142 - } else if (Client.isSpellSelected) { // L: 9145 - if ((GrandExchangeOfferNameComparator.selectedSpellFlags & 1) == 1) { // L: 9146 - WorldMapManager.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FileSystem.colorStartTag(16748608) + var34.name, 17, var30.id, var11, var12); // L: 9147 - } - } else { - String[] var26 = var34.groundActions; // L: 9152 - - for (int var27 = 4; var27 >= 0; --var27) { // L: 9153 - if (var26 != null && var26[var27] != null) { // L: 9154 - byte var21 = 0; // L: 9155 - if (var27 == 0) { // L: 9156 - var21 = 18; - } - - if (var27 == 1) { // L: 9157 - var21 = 19; - } - - if (var27 == 2) { // L: 9158 - var21 = 20; - } - - if (var27 == 3) { // L: 9159 - var21 = 21; - } - - if (var27 == 4) { // L: 9160 - var21 = 22; - } - - WorldMapManager.insertMenuItemNoShift(var26[var27], FileSystem.colorStartTag(16748608) + var34.name, var21, var30.id, var11, var12); // L: 9161 - } else if (var27 == 2) { // L: 9164 - WorldMapManager.insertMenuItemNoShift("Take", FileSystem.colorStartTag(16748608) + var34.name, 20, var30.id, var11, var12); // L: 9165 - } - } - - WorldMapManager.insertMenuItemNoShift("Examine", FileSystem.colorStartTag(16748608) + var34.name, 1004, var30.id, var11, var12); // L: 9169 - } - } - } - } - } - } - - if (var4 != -1L) { // L: 9177 - var8 = ReflectionCheck.method2451(var4); // L: 9178 - int var9 = GrandExchangeOfferNameComparator.Entity_unpackSceneX(var4); // L: 9179 - Player var10 = Client.players[Client.combatTargetPlayerIndex]; // L: 9180 - GrandExchangeOfferUnitPriceComparator.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); // L: 9181 - } - - } // L: 9183 -} \ No newline at end of file + static final void method1981(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 132 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your ignore list first").toString(); + class69.addGameMessage(30, "", var1); // L: 134 + } // L: 136 +} diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 19b6692cf5..6dd7096ce1 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,13 +14,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("aa") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("component") Component component; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); // L: 31 } // L: 32 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1004976621" + garbageValue = "1086849299" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; // L: 35 } // L: 36 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2060006654" + garbageValue = "2076883796" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 } // L: 40 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-1656973228" + descriptor = "(IIIIB)V", + garbageValue = "-60" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 } // L: 44 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "-2070122870" + descriptor = "(Ljava/awt/Graphics;IIB)V", + garbageValue = "-61" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } // L: 53 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-973132" + garbageValue = "1564869855" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index b29c886bd1..5ae627911d 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("ou") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("am") + @ObfuscatedName("ay") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } // L: 16 - @ObfuscatedName("db") + @ObfuscatedName("dc") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { Rasterizer2D_pixels = var0; // L: 19 @@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 } // L: 23 - @ObfuscatedName("dl") + @ObfuscatedName("dn") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { Rasterizer2D_xClipStart = 0; // L: 26 @@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 } // L: 30 - @ObfuscatedName("dm") + @ObfuscatedName("de") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { if (var0 < 0) { // L: 33 @@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var3; // L: 40 } // L: 41 - @ObfuscatedName("dj") + @ObfuscatedName("da") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { if (Rasterizer2D_xClipStart < var0) { // L: 44 @@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode { } // L: 48 - @ObfuscatedName("dh") + @ObfuscatedName("dz") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { var0[0] = Rasterizer2D_xClipStart; // L: 51 @@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode { var0[3] = Rasterizer2D_yClipEnd; // L: 54 } // L: 55 - @ObfuscatedName("ds") + @ObfuscatedName("dr") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { Rasterizer2D_xClipStart = var0[0]; // L: 58 @@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_yClipEnd = var0[3]; // L: 61 } // L: 62 - @ObfuscatedName("dp") + @ObfuscatedName("dh") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; // L: 65 @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } // L: 79 - @ObfuscatedName("dy") + @ObfuscatedName("du") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { if (var2 == 0) { // L: 82 @@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode { } } // L: 84 133 - @ObfuscatedName("dv") + @ObfuscatedName("di") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { if (var4 != 0) { // L: 136 @@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode { } } // L: 139 207 - @ObfuscatedName("dr") + @ObfuscatedName("dp") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { // L: 210 @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } // L: 232 - @ObfuscatedName("dc") + @ObfuscatedName("db") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { if (var0 < Rasterizer2D_xClipStart) { // L: 235 @@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode { } // L: 253 - @ObfuscatedName("dq") + @ObfuscatedName("ds") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { if (var2 > 0 && var3 > 0) { // L: 256 @@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode { } } // L: 282 - @ObfuscatedName("dt") + @ObfuscatedName("dv") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var2 > 0 && var3 > 0) { // L: 285 @@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode { } } // L: 326 - @ObfuscatedName("de") + @ObfuscatedName("dk") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } // L: 380 - @ObfuscatedName("dw") + @ObfuscatedName("df") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 } // L: 387 - @ObfuscatedName("dz") + @ObfuscatedName("dx") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390 @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } // L: 396 - @ObfuscatedName("dg") + @ObfuscatedName("dj") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } // L: 407 - @ObfuscatedName("dn") + @ObfuscatedName("dt") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 @@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode { } } // L: 431 - @ObfuscatedName("da") + @ObfuscatedName("dd") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 @@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode { } } // L: 442 - @ObfuscatedName("df") + @ObfuscatedName("dw") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 @@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode { } } // L: 467 - @ObfuscatedName("ek") + @ObfuscatedName("ec") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { var2 -= var0; // L: 470 @@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode { } } // L: 475 480 524 - @ObfuscatedName("eo") + @ObfuscatedName("ek") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 @@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode { } } // L: 529 - @ObfuscatedName("en") + @ObfuscatedName("ei") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { int var5 = var0 + Rasterizer2D_width * var1; // L: 532 diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index 6100d91e8d..1b3c406c1a 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3,92 +3,92 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("fq") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("n") - static boolean field1775; - @ObfuscatedName("v") - static boolean field1788; - @ObfuscatedName("d") + @ObfuscatedName("f") + static boolean field1899; + @ObfuscatedName("o") + static boolean field1921; + @ObfuscatedName("u") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("c") - public static boolean field1777; - @ObfuscatedName("y") + @ObfuscatedName("p") + public static boolean field1903; + @ObfuscatedName("b") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lew;" + descriptor = "Lgn;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("r") - static int[] field1797; - @ObfuscatedName("o") - static int[] field1774; - @ObfuscatedName("j") + @ObfuscatedName("w") + static int[] field1919; + @ObfuscatedName("s") + static int[] field1922; + @ObfuscatedName("y") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1775 = false; // L: 8 - field1788 = false; // L: 9 + field1899 = false; // L: 8 + field1921 = false; // L: 9 Rasterizer3D_isLowDetailTexture = false; // L: 10 - field1777 = true; // L: 11 + field1903 = 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 - field1797 = new int[512]; // L: 31 - field1774 = new int[2048]; // L: 32 + field1919 = new int[512]; // L: 31 + field1922 = new int[2048]; // L: 32 Rasterizer3D_sine = new int[2048]; // L: 33 Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; for (var0 = 1; var0 < 512; ++var0) { // L: 37 - field1797[var0] = 32768 / var0; // L: 38 + field1919[var0] = 32768 / var0; // L: 38 } for (var0 = 1; var0 < 2048; ++var0) { // L: 40 - field1774[var0] = 65536 / var0; // L: 41 + field1922[var0] = 65536 / var0; // L: 41 } for (var0 = 0; var0 < 2048; ++var0) { // L: 43 @@ -98,668 +98,678 @@ public class Rasterizer3D extends Rasterizer2D { } // L: 47 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 } // L: 55 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; // L: 58 Rasterizer3D_clipHeight = var3 - var1; // L: 59 Rasterizer3D_method3(); // L: 60 + int var4; + int var5; if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 - Rasterizer3D_rowOffsets = new int[GameObject.method3452(Rasterizer3D_clipHeight)]; + 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; // L: 62 + var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 75 - for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 63 - Rasterizer3D_rowOffsets[var5] = var4; // L: 64 - var4 += Rasterizer2D.Rasterizer2D_width; // L: 65 + for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 76 + Rasterizer3D_rowOffsets[var5] = var4; // L: 77 + var4 += Rasterizer2D.Rasterizer2D_width; // L: 78 } - } // L: 67 + } // L: 80 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { - Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 - Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 72 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 73 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 74 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 - } // L: 76 + Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // 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("c") - public static final void method3169(int var0, int var1) { - int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 - int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 - int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 - Rasterizer3D_clipMidX = var0 - var4; // L: 82 - Rasterizer3D_clipMidY = var1 - var3; // L: 83 - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 84 - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 85 - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 86 - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 - } // L: 88 + @ObfuscatedName("p") + public static final void method3411(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("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lew;)V" + descriptor = "(Lgn;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; // L: 91 - } // L: 92 + Rasterizer3D_textureLoader = var0; // L: 104 + } // L: 105 - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 - } // L: 96 + Rasterizer3D_buildPalette(var0, 0, 512); // L: 108 + } // L: 109 - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; // L: 99 + int var4 = var2 * 128; // L: 112 - for (int var5 = var2; var5 < var3; ++var5) { // L: 100 - double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 101 - double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 102 + for (int var5 = var2; var5 < var3; ++var5) { // 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) { // L: 103 - double var11 = (double)var10 / 128.0D; // L: 104 - double var13 = var11; // L: 105 - double var15 = var11; // L: 106 - double var17 = var11; // L: 107 - if (var8 != 0.0D) { // L: 108 + for (int var10 = 0; var10 < 128; ++var10) { // 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) { // L: 110 + if (var11 < 0.5D) { // L: 123 var19 = var11 * (1.0D + var8); } else { - var19 = var11 + var8 - var11 * var8; // L: 111 + var19 = var11 + var8 - var11 * var8; // L: 124 } - double var21 = 2.0D * var11 - var19; // L: 112 - double var23 = var6 + 0.3333333333333333D; // L: 113 - if (var23 > 1.0D) { // L: 114 + double var21 = 2.0D * var11 - var19; // L: 125 + double var23 = var6 + 0.3333333333333333D; // L: 126 + if (var23 > 1.0D) { // L: 127 --var23; } - double var27 = var6 - 0.3333333333333333D; // L: 116 - if (var27 < 0.0D) { // L: 117 + double var27 = var6 - 0.3333333333333333D; // L: 129 + if (var27 < 0.0D) { // L: 130 ++var27; } - if (6.0D * var23 < 1.0D) { // L: 118 + if (6.0D * var23 < 1.0D) { // L: 131 var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if (2.0D * var23 < 1.0D) { // L: 119 + } else if (2.0D * var23 < 1.0D) { // L: 132 var13 = var19; - } else if (3.0D * var23 < 2.0D) { // L: 120 + } else if (3.0D * var23 < 2.0D) { // L: 133 var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { - var13 = var21; // L: 121 + var13 = var21; // L: 134 } - if (6.0D * var6 < 1.0D) { // L: 122 + if (6.0D * var6 < 1.0D) { // L: 135 var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if (2.0D * var6 < 1.0D) { // L: 123 + } else if (2.0D * var6 < 1.0D) { // L: 136 var15 = var19; - } else if (3.0D * var6 < 2.0D) { // L: 124 + } else if (3.0D * var6 < 2.0D) { // L: 137 var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { - var15 = var21; // L: 125 + var15 = var21; // L: 138 } - if (6.0D * var27 < 1.0D) { // L: 126 + if (6.0D * var27 < 1.0D) { // L: 139 var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if (2.0D * var27 < 1.0D) { // L: 127 + } else if (2.0D * var27 < 1.0D) { // L: 140 var17 = var19; - } else if (3.0D * var27 < 2.0D) { // L: 128 + } else if (3.0D * var27 < 2.0D) { // L: 141 var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; } else { - var17 = var21; // L: 129 + var17 = var21; // L: 142 } } - int var29 = (int)(var13 * 256.0D); // L: 131 - int var20 = (int)(var15 * 256.0D); // L: 132 - int var30 = (int)(var17 * 256.0D); // L: 133 - int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 134 - var22 = Rasterizer3D_brighten(var22, var0); // L: 135 - if (var22 == 0) { // L: 136 + int var29 = (int)(var13 * 256.0D); // 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; // L: 137 + Rasterizer3D_colorPalette[var4++] = var22; // L: 150 } } - } // L: 140 + } // L: 153 - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 - double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144 - double var7 = (double)(var0 & 255) / 256.0D; // L: 145 - var3 = Math.pow(var3, var1); // L: 146 - var5 = Math.pow(var5, var1); // L: 147 - var7 = Math.pow(var7, var1); // L: 148 - int var9 = (int)(var3 * 256.0D); // L: 149 - int var10 = (int)(var5 * 256.0D); // L: 150 - int var11 = (int)(var7 * 256.0D); // L: 151 - return var11 + (var10 << 8) + (var9 << 16); // L: 152 + double var3 = (double)(var0 >> 16) / 256.0D; // 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("q") - public static void method3237(int var0, int var1, int var2) { - field1775 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 - } // L: 157 + @ObfuscatedName("h") + public static void method3389(int var0, int var1, int var2) { + field1899 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 169 + } // L: 170 - @ObfuscatedName("l") - static final void method3175(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = var4 - var3; // L: 160 - int var10 = var1 - var0; // L: 161 - int var11 = var5 - var3; // L: 162 - int var12 = var2 - var0; // L: 163 - int var13 = var7 - var6; // L: 164 - int var14 = var8 - var6; // L: 165 + @ObfuscatedName("n") + static final void method3383(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) { // L: 167 + if (var2 != var1) { // L: 180 var15 = (var5 - var4 << 14) / (var2 - var1); } else { - var15 = 0; // L: 168 + var15 = 0; // L: 181 } int var16; - if (var0 != var1) { // L: 170 + if (var0 != var1) { // L: 183 var16 = (var9 << 14) / var10; } else { - var16 = 0; // L: 171 + var16 = 0; // L: 184 } int var17; - if (var0 != var2) { // L: 173 + if (var0 != var2) { // L: 186 var17 = (var11 << 14) / var12; } else { - var17 = 0; // L: 174 + var17 = 0; // L: 187 } - int var18 = var9 * var12 - var11 * var10; // L: 175 - if (var18 != 0) { // L: 176 - int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 177 - int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 178 - if (var0 <= var1 && var0 <= var2) { // L: 179 - if (var0 < Rasterizer3D_clipHeight) { // L: 180 - if (var1 > Rasterizer3D_clipHeight) { // L: 181 + int var18 = var9 * var12 - var11 * var10; // 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) { // L: 182 + if (var2 > Rasterizer3D_clipHeight) { // L: 195 var2 = Rasterizer3D_clipHeight; } - var6 = var19 + ((var6 << 8) - var3 * var19); // L: 183 - if (var1 < var2) { // L: 184 - var5 = var3 <<= 14; // L: 185 - if (var0 < 0) { // L: 186 - var5 -= var0 * var17; // L: 187 - var3 -= var0 * var16; // L: 188 - var6 -= var0 * var20; // L: 189 - var0 = 0; // L: 190 + var6 = var19 + ((var6 << 8) - var3 * var19); // 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; // L: 192 - if (var1 < 0) { // L: 193 - var4 -= var15 * var1; // L: 194 - var1 = 0; // L: 195 + 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)) { // L: 197 - var2 -= var1; // L: 218 - var1 -= var0; // L: 219 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 220 + if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 210 + var2 -= var1; // L: 231 + var1 -= var0; // L: 232 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 233 while (true) { - --var1; // L: 221 + --var1; // L: 234 if (var1 < 0) { while (true) { - --var2; // L: 228 + --var2; // L: 241 if (var2 < 0) { - return; // L: 235 + return; // L: 248 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 229 - var5 += var17; // L: 230 - var4 += var15; // L: 231 - var6 += var20; // L: 232 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 233 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // 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); // L: 222 - var5 += var17; // L: 223 - var3 += var16; // L: 224 - var6 += var20; // L: 225 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 235 + var5 += var17; // L: 236 + var3 += var16; // L: 237 + var6 += var20; // L: 238 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 239 } } else { - var2 -= var1; // L: 198 - var1 -= var0; // L: 199 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 200 + var2 -= var1; // L: 211 + var1 -= var0; // L: 212 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 213 while (true) { - --var1; // L: 201 + --var1; // L: 214 if (var1 < 0) { while (true) { - --var2; // L: 208 + --var2; // L: 221 if (var2 < 0) { - return; // L: 215 + return; // L: 228 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 209 - var5 += var17; // L: 210 - var4 += var15; // L: 211 - var6 += var20; // L: 212 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 213 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // 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); // L: 202 - var5 += var17; // L: 203 - var3 += var16; // L: 204 - var6 += var20; // L: 205 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 206 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 215 + var5 += var17; // L: 216 + var3 += var16; // L: 217 + var6 += var20; // L: 218 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 219 } } } else { - var4 = var3 <<= 14; // L: 239 - if (var0 < 0) { // L: 240 - var4 -= var0 * var17; // L: 241 - var3 -= var0 * var16; // L: 242 - var6 -= var0 * var20; // L: 243 - var0 = 0; // L: 244 + var4 = var3 <<= 14; // 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; // L: 246 - if (var2 < 0) { // L: 247 - var5 -= var15 * var2; // L: 248 - var2 = 0; // L: 249 + 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) { // L: 251 - var1 -= var2; // L: 252 - var2 -= var0; // L: 253 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 254 + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 264 + var1 -= var2; // L: 265 + var2 -= var0; // L: 266 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 267 while (true) { - --var2; // L: 255 + --var2; // L: 268 if (var2 < 0) { while (true) { - --var1; // L: 262 + --var1; // L: 275 if (var1 < 0) { - return; // L: 269 + return; // L: 282 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 263 - var5 += var15; // L: 264 - var3 += var16; // L: 265 - var6 += var20; // L: 266 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 267 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // 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); // L: 256 - var4 += var17; // L: 257 - var3 += var16; // L: 258 - var6 += var20; // L: 259 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 260 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 269 + var4 += var17; // L: 270 + var3 += var16; // L: 271 + var6 += var20; // L: 272 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 273 } } else { - var1 -= var2; // L: 272 - var2 -= var0; // L: 273 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 274 + var1 -= var2; // L: 285 + var2 -= var0; // L: 286 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 287 while (true) { - --var2; // L: 275 + --var2; // L: 288 if (var2 < 0) { while (true) { - --var1; // L: 282 + --var1; // L: 295 if (var1 < 0) { - return; // L: 289 + return; // L: 302 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 283 - var5 += var15; // L: 284 - var3 += var16; // L: 285 - var6 += var20; // L: 286 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 287 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // 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); // L: 276 - var4 += var17; // L: 277 - var3 += var16; // L: 278 - var6 += var20; // L: 279 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 289 + var4 += var17; // L: 290 + var3 += var16; // L: 291 + var6 += var20; // L: 292 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 293 } } } } - } else if (var1 <= var2) { // L: 293 - if (var1 < Rasterizer3D_clipHeight) { // L: 294 - if (var2 > Rasterizer3D_clipHeight) { // L: 295 + } 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) { // L: 296 + if (var0 > Rasterizer3D_clipHeight) { // L: 309 var0 = Rasterizer3D_clipHeight; } - var7 = var19 + ((var7 << 8) - var19 * var4); // L: 297 - if (var2 < var0) { // L: 298 - var3 = var4 <<= 14; // L: 299 - if (var1 < 0) { // L: 300 - var3 -= var16 * var1; // L: 301 - var4 -= var15 * var1; // L: 302 - var7 -= var20 * var1; // L: 303 - var1 = 0; // L: 304 + var7 = var19 + ((var7 << 8) - var19 * var4); // 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; // L: 306 - if (var2 < 0) { // L: 307 - var5 -= var17 * var2; // L: 308 - var2 = 0; // L: 309 + 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)) { // L: 311 - var0 -= var2; // L: 332 - var2 -= var1; // L: 333 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 334 + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 324 + var0 -= var2; // L: 345 + var2 -= var1; // L: 346 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 347 while (true) { - --var2; // L: 335 + --var2; // L: 348 if (var2 < 0) { while (true) { - --var0; // L: 342 + --var0; // L: 355 if (var0 < 0) { - return; // L: 349 + return; // L: 362 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 343 - var3 += var16; // L: 344 - var5 += var17; // L: 345 - var7 += var20; // L: 346 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 347 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // 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); // L: 336 - var3 += var16; // L: 337 - var4 += var15; // L: 338 - var7 += var20; // L: 339 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 349 + var3 += var16; // L: 350 + var4 += var15; // L: 351 + var7 += var20; // L: 352 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 353 } } else { - var0 -= var2; // L: 312 - var2 -= var1; // L: 313 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 314 + var0 -= var2; // L: 325 + var2 -= var1; // L: 326 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 327 while (true) { - --var2; // L: 315 + --var2; // L: 328 if (var2 < 0) { while (true) { - --var0; // L: 322 + --var0; // L: 335 if (var0 < 0) { - return; // L: 329 + return; // L: 342 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 323 - var3 += var16; // L: 324 - var5 += var17; // L: 325 - var7 += var20; // L: 326 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 327 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // 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); // L: 316 - var3 += var16; // L: 317 - var4 += var15; // L: 318 - var7 += var20; // L: 319 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 320 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 329 + var3 += var16; // L: 330 + var4 += var15; // L: 331 + var7 += var20; // L: 332 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 333 } } } else { - var5 = var4 <<= 14; // L: 353 - if (var1 < 0) { // L: 354 - var5 -= var16 * var1; // L: 355 - var4 -= var15 * var1; // L: 356 - var7 -= var20 * var1; // L: 357 - var1 = 0; // L: 358 + var5 = var4 <<= 14; // 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; // L: 360 - if (var0 < 0) { // L: 361 - var3 -= var0 * var17; // L: 362 - var0 = 0; // L: 363 + var3 <<= 14; // L: 373 + if (var0 < 0) { // L: 374 + var3 -= var0 * var17; // L: 375 + var0 = 0; // L: 376 } - if (var16 < var15) { // L: 365 - var2 -= var0; // L: 366 - var0 -= var1; // L: 367 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 368 + if (var16 < var15) { // L: 378 + var2 -= var0; // L: 379 + var0 -= var1; // L: 380 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 381 while (true) { - --var0; // L: 369 + --var0; // L: 382 if (var0 < 0) { while (true) { - --var2; // L: 376 + --var2; // L: 389 if (var2 < 0) { - return; // L: 383 + return; // L: 396 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 377 - var3 += var17; // L: 378 - var4 += var15; // L: 379 - var7 += var20; // L: 380 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 381 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // 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); // L: 370 - var5 += var16; // L: 371 - var4 += var15; // L: 372 - var7 += var20; // L: 373 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 374 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 383 + var5 += var16; // L: 384 + var4 += var15; // L: 385 + var7 += var20; // L: 386 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 387 } } else { - var2 -= var0; // L: 386 - var0 -= var1; // L: 387 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 388 + var2 -= var0; // L: 399 + var0 -= var1; // L: 400 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 401 while (true) { - --var0; // L: 389 + --var0; // L: 402 if (var0 < 0) { while (true) { - --var2; // L: 396 + --var2; // L: 409 if (var2 < 0) { - return; // L: 403 + return; // L: 416 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 397 - var3 += var17; // L: 398 - var4 += var15; // L: 399 - var7 += var20; // L: 400 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 401 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // 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); // L: 390 - var5 += var16; // L: 391 - var4 += var15; // L: 392 - var7 += var20; // L: 393 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // 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) { // L: 408 - if (var0 > Rasterizer3D_clipHeight) { // L: 409 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 421 + if (var0 > Rasterizer3D_clipHeight) { // L: 422 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 410 + if (var1 > Rasterizer3D_clipHeight) { // L: 423 var1 = Rasterizer3D_clipHeight; } - var8 = var19 + ((var8 << 8) - var5 * var19); // L: 411 - if (var0 < var1) { // L: 412 - var4 = var5 <<= 14; // L: 413 - if (var2 < 0) { // L: 414 - var4 -= var15 * var2; // L: 415 - var5 -= var17 * var2; // L: 416 - var8 -= var20 * var2; // L: 417 - var2 = 0; // L: 418 + var8 = var19 + ((var8 << 8) - var5 * var19); // 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; // L: 420 - if (var0 < 0) { // L: 421 - var3 -= var0 * var16; // L: 422 - var0 = 0; // L: 423 + var3 <<= 14; // L: 433 + if (var0 < 0) { // L: 434 + var3 -= var0 * var16; // L: 435 + var0 = 0; // L: 436 } - if (var15 < var17) { // L: 425 - var1 -= var0; // L: 426 - var0 -= var2; // L: 427 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 428 + if (var15 < var17) { // L: 438 + var1 -= var0; // L: 439 + var0 -= var2; // L: 440 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 441 while (true) { - --var0; // L: 429 + --var0; // L: 442 if (var0 < 0) { while (true) { - --var1; // L: 436 + --var1; // L: 449 if (var1 < 0) { - return; // L: 443 + return; // L: 456 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 437 - var4 += var15; // L: 438 - var3 += var16; // L: 439 - var8 += var20; // L: 440 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 441 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // 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); // L: 430 - var4 += var15; // L: 431 - var5 += var17; // L: 432 - var8 += var20; // L: 433 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 434 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 443 + var4 += var15; // L: 444 + var5 += var17; // L: 445 + var8 += var20; // L: 446 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 447 } } else { - var1 -= var0; // L: 446 - var0 -= var2; // L: 447 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 448 + var1 -= var0; // L: 459 + var0 -= var2; // L: 460 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 461 while (true) { - --var0; // L: 449 + --var0; // L: 462 if (var0 < 0) { while (true) { - --var1; // L: 456 + --var1; // L: 469 if (var1 < 0) { - return; // L: 463 + return; // L: 476 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 457 - var4 += var15; // L: 458 - var3 += var16; // L: 459 - var8 += var20; // L: 460 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 461 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // 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); // L: 450 - var4 += var15; // L: 451 - var5 += var17; // L: 452 - var8 += var20; // L: 453 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 463 + var4 += var15; // L: 464 + var5 += var17; // L: 465 + var8 += var20; // L: 466 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 467 } } } else { - var3 = var5 <<= 14; // L: 467 - if (var2 < 0) { // L: 468 - var3 -= var15 * var2; // L: 469 - var5 -= var17 * var2; // L: 470 - var8 -= var20 * var2; // L: 471 - var2 = 0; // L: 472 + var3 = var5 <<= 14; // 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; // L: 474 - if (var1 < 0) { // L: 475 - var4 -= var16 * var1; // L: 476 - var1 = 0; // L: 477 + var4 <<= 14; // L: 487 + if (var1 < 0) { // L: 488 + var4 -= var16 * var1; // L: 489 + var1 = 0; // L: 490 } - if (var15 < var17) { // L: 479 - var0 -= var1; // L: 480 - var1 -= var2; // L: 481 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 482 + if (var15 < var17) { // L: 492 + var0 -= var1; // L: 493 + var1 -= var2; // L: 494 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 495 while (true) { - --var1; // L: 483 + --var1; // L: 496 if (var1 < 0) { while (true) { - --var0; // L: 490 + --var0; // L: 503 if (var0 < 0) { - return; // L: 497 + return; // L: 510 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 491 - var4 += var16; // L: 492 - var5 += var17; // L: 493 - var8 += var20; // L: 494 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 495 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // 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); // L: 484 - var3 += var15; // L: 485 - var5 += var17; // L: 486 - var8 += var20; // L: 487 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 488 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 497 + var3 += var15; // L: 498 + var5 += var17; // L: 499 + var8 += var20; // L: 500 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 501 } } else { - var0 -= var1; // L: 500 - var1 -= var2; // L: 501 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 502 + var0 -= var1; // L: 513 + var1 -= var2; // L: 514 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 515 while (true) { - --var1; // L: 503 + --var1; // L: 516 if (var1 < 0) { while (true) { - --var0; // L: 510 + --var0; // L: 523 if (var0 < 0) { - return; // L: 517 + return; // L: 530 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 511 - var4 += var16; // L: 512 - var5 += var17; // L: 513 - var8 += var20; // L: 514 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 515 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // 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); // L: 504 - var3 += var15; // L: 505 - var5 += var17; // L: 506 - var8 += var20; // L: 507 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 517 + var3 += var15; // L: 518 + var5 += var17; // L: 519 + var8 += var20; // L: 520 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 521 } } } @@ -767,1298 +777,1298 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("s") + @ObfuscatedName("l") @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 (field1775) { // L: 524 - if (var5 > Rasterizer3D_clipWidth) { // L: 525 + if (field1899) { // L: 537 + if (var5 > Rasterizer3D_clipWidth) { // L: 538 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 526 + if (var4 < 0) { // L: 539 var4 = 0; } } - if (var4 < var5) { // L: 528 - var1 += var4; // L: 529 - var6 += var4 * var7; // L: 530 + if (var4 < var5) { // L: 541 + var1 += var4; // L: 542 + var6 += var4 * var7; // L: 543 int var8; int var9; int var10; - if (field1777) { // L: 531 - var3 = var5 - var4 >> 2; // L: 532 - var7 <<= 2; // L: 533 - if (Rasterizer3D_alpha == 0) { // L: 534 - if (var3 > 0) { // L: 535 + if (field1903) { // 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]; // L: 537 - var6 += var7; // L: 538 - var0[var1++] = var2; // L: 539 - var0[var1++] = var2; // L: 540 - var0[var1++] = var2; // L: 541 - var0[var1++] = var2; // L: 542 - --var3; // L: 543 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 550 + var6 += var7; // L: 551 + var0[var1++] = var2; // L: 552 + var0[var1++] = var2; // L: 553 + var0[var1++] = var2; // L: 554 + var0[var1++] = var2; // L: 555 + --var3; // L: 556 } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 545 - if (var3 > 0) { // L: 546 - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 547 + var3 = var5 - var4 & 3; // L: 558 + if (var3 > 0) { // L: 559 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 560 do { - var0[var1++] = var2; // L: 549 - --var3; // L: 550 + var0[var1++] = var2; // L: 562 + --var3; // L: 563 } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; // L: 554 - var9 = 256 - Rasterizer3D_alpha; // L: 555 - if (var3 > 0) { // L: 556 + var8 = Rasterizer3D_alpha; // L: 567 + var9 = 256 - Rasterizer3D_alpha; // L: 568 + if (var3 > 0) { // L: 569 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 558 - var6 += var7; // L: 559 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 560 - var10 = var0[var1]; // L: 561 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 562 - var10 = var0[var1]; // L: 563 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 564 - var10 = var0[var1]; // L: 565 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 566 - var10 = var0[var1]; // L: 567 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 568 - --var3; // L: 569 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 571 + var6 += var7; // L: 572 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 573 + var10 = var0[var1]; // L: 574 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 575 + var10 = var0[var1]; // L: 576 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 577 + var10 = var0[var1]; // L: 578 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 579 + var10 = var0[var1]; // L: 580 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 581 + --var3; // L: 582 } while(var3 > 0); } - var3 = var5 - var4 & 3; // L: 571 - if (var3 > 0) { // L: 572 - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 573 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 574 + var3 = var5 - var4 & 3; // L: 584 + if (var3 > 0) { // L: 585 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 586 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 587 do { - var10 = var0[var1]; // L: 576 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 577 - --var3; // L: 578 + var10 = var0[var1]; // L: 589 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 590 + --var3; // L: 591 } while(var3 > 0); } } } else { - var3 = var5 - var4; // L: 584 - if (Rasterizer3D_alpha == 0) { // L: 585 + var3 = var5 - var4; // L: 597 + if (Rasterizer3D_alpha == 0) { // L: 598 do { - var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; // L: 587 - var6 += var7; // L: 588 - --var3; // L: 589 + var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; // L: 600 + var6 += var7; // L: 601 + --var3; // L: 602 } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; // L: 592 - var9 = 256 - Rasterizer3D_alpha; // L: 593 + var8 = Rasterizer3D_alpha; // L: 605 + var9 = 256 - Rasterizer3D_alpha; // L: 606 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 595 - var6 += var7; // L: 596 - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 597 - var10 = var0[var1]; // L: 598 - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 599 - --var3; // L: 600 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 608 + var6 += var7; // L: 609 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 610 + var10 = var0[var1]; // L: 611 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 612 + --var3; // L: 613 } while(var3 > 0); } } } - } // L: 581 602 + } // L: 594 615 - @ObfuscatedName("b") - public static final void method3179(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; // L: 607 - if (var0 != var1) { // L: 608 + @ObfuscatedName("m") + public static final void method3370(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = 0; // L: 620 + if (var0 != var1) { // L: 621 var7 = (var4 - var3 << 14) / (var1 - var0); } - int var8 = 0; // L: 609 - if (var2 != var1) { // L: 610 + int var8 = 0; // L: 622 + if (var2 != var1) { // L: 623 var8 = (var5 - var4 << 14) / (var2 - var1); } - int var9 = 0; // L: 611 - if (var0 != var2) { // L: 612 + int var9 = 0; // L: 624 + if (var0 != var2) { // L: 625 var9 = (var3 - var5 << 14) / (var0 - var2); } - if (var0 <= var1 && var0 <= var2) { // L: 613 - if (var0 < Rasterizer3D_clipHeight) { // L: 614 - if (var1 > Rasterizer3D_clipHeight) { // L: 615 + if (var0 <= var1 && var0 <= var2) { // L: 626 + if (var0 < Rasterizer3D_clipHeight) { // L: 627 + if (var1 > Rasterizer3D_clipHeight) { // L: 628 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 616 + if (var2 > Rasterizer3D_clipHeight) { // L: 629 var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { // L: 617 - var5 = var3 <<= 14; // L: 618 - if (var0 < 0) { // L: 619 - var5 -= var0 * var9; // L: 620 - var3 -= var0 * var7; // L: 621 - var0 = 0; // L: 622 + if (var1 < var2) { // L: 630 + var5 = var3 <<= 14; // L: 631 + if (var0 < 0) { // L: 632 + var5 -= var0 * var9; // L: 633 + var3 -= var0 * var7; // L: 634 + var0 = 0; // L: 635 } - var4 <<= 14; // L: 624 - if (var1 < 0) { // L: 625 - var4 -= var8 * var1; // L: 626 - var1 = 0; // L: 627 + var4 <<= 14; // L: 637 + if (var1 < 0) { // L: 638 + var4 -= var8 * var1; // L: 639 + var1 = 0; // L: 640 } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 629 - var2 -= var1; // L: 630 - var1 -= var0; // L: 631 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 632 + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 642 + var2 -= var1; // L: 643 + var1 -= var0; // L: 644 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 645 while (true) { - --var1; // L: 633 + --var1; // L: 646 if (var1 < 0) { while (true) { - --var2; // L: 639 + --var2; // L: 652 if (var2 < 0) { - return; // L: 645 + return; // L: 658 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 640 - var5 += var9; // L: 641 - var4 += var8; // L: 642 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 643 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 653 + var5 += var9; // L: 654 + var4 += var8; // L: 655 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 656 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 634 - var5 += var9; // L: 635 - var3 += var7; // L: 636 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 637 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 647 + var5 += var9; // L: 648 + var3 += var7; // L: 649 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 650 } } else { - var2 -= var1; // L: 648 - var1 -= var0; // L: 649 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 650 + var2 -= var1; // L: 661 + var1 -= var0; // L: 662 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 663 while (true) { - --var1; // L: 651 + --var1; // L: 664 if (var1 < 0) { while (true) { - --var2; // L: 657 + --var2; // L: 670 if (var2 < 0) { - return; // L: 663 + return; // L: 676 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 658 - var5 += var9; // L: 659 - var4 += var8; // L: 660 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 661 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 671 + var5 += var9; // L: 672 + var4 += var8; // L: 673 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 674 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 652 - var5 += var9; // L: 653 - var3 += var7; // L: 654 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 655 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 665 + var5 += var9; // L: 666 + var3 += var7; // L: 667 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 668 } } } else { - var4 = var3 <<= 14; // L: 667 - if (var0 < 0) { // L: 668 - var4 -= var0 * var9; // L: 669 - var3 -= var0 * var7; // L: 670 - var0 = 0; // L: 671 + var4 = var3 <<= 14; // L: 680 + if (var0 < 0) { // L: 681 + var4 -= var0 * var9; // L: 682 + var3 -= var0 * var7; // L: 683 + var0 = 0; // L: 684 } - var5 <<= 14; // L: 673 - if (var2 < 0) { // L: 674 - var5 -= var8 * var2; // L: 675 - var2 = 0; // L: 676 + var5 <<= 14; // L: 686 + if (var2 < 0) { // L: 687 + var5 -= var8 * var2; // L: 688 + var2 = 0; // L: 689 } - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 678 - var1 -= var2; // L: 697 - var2 -= var0; // L: 698 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 699 + if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 691 + var1 -= var2; // L: 710 + var2 -= var0; // L: 711 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 712 while (true) { - --var2; // L: 700 + --var2; // L: 713 if (var2 < 0) { while (true) { - --var1; // L: 706 + --var1; // L: 719 if (var1 < 0) { - return; // L: 712 + return; // L: 725 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 707 - var5 += var8; // L: 708 - var3 += var7; // L: 709 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 720 + var5 += var8; // L: 721 + var3 += var7; // L: 722 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 723 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 701 - var4 += var9; // L: 702 - var3 += var7; // L: 703 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 704 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 714 + var4 += var9; // L: 715 + var3 += var7; // L: 716 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 717 } } else { - var1 -= var2; // L: 679 - var2 -= var0; // L: 680 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 681 + var1 -= var2; // L: 692 + var2 -= var0; // L: 693 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 694 while (true) { - --var2; // L: 682 + --var2; // L: 695 if (var2 < 0) { while (true) { - --var1; // L: 688 + --var1; // L: 701 if (var1 < 0) { - return; // L: 694 + return; // L: 707 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 689 - var5 += var8; // L: 690 - var3 += var7; // L: 691 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 692 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 702 + var5 += var8; // L: 703 + var3 += var7; // L: 704 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 705 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 683 - var4 += var9; // L: 684 - var3 += var7; // L: 685 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 686 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 696 + var4 += var9; // L: 697 + var3 += var7; // L: 698 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 699 } } } } - } else if (var1 <= var2) { // L: 716 - if (var1 < Rasterizer3D_clipHeight) { // L: 717 - if (var2 > Rasterizer3D_clipHeight) { // L: 718 + } else if (var1 <= var2) { // L: 729 + if (var1 < Rasterizer3D_clipHeight) { // L: 730 + if (var2 > Rasterizer3D_clipHeight) { // L: 731 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 719 + if (var0 > Rasterizer3D_clipHeight) { // L: 732 var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { // L: 720 - var3 = var4 <<= 14; // L: 721 - if (var1 < 0) { // L: 722 - var3 -= var7 * var1; // L: 723 - var4 -= var8 * var1; // L: 724 - var1 = 0; // L: 725 + if (var2 < var0) { // L: 733 + var3 = var4 <<= 14; // L: 734 + if (var1 < 0) { // L: 735 + var3 -= var7 * var1; // L: 736 + var4 -= var8 * var1; // L: 737 + var1 = 0; // L: 738 } - var5 <<= 14; // L: 727 - if (var2 < 0) { // L: 728 - var5 -= var9 * var2; // L: 729 - var2 = 0; // L: 730 + var5 <<= 14; // L: 740 + if (var2 < 0) { // L: 741 + var5 -= var9 * var2; // L: 742 + var2 = 0; // L: 743 } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 732 - var0 -= var2; // L: 733 - var2 -= var1; // L: 734 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 735 + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 745 + var0 -= var2; // L: 746 + var2 -= var1; // L: 747 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 748 while (true) { - --var2; // L: 736 + --var2; // L: 749 if (var2 < 0) { while (true) { - --var0; // L: 742 + --var0; // L: 755 if (var0 < 0) { - return; // L: 748 + return; // L: 761 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 743 - var3 += var7; // L: 744 - var5 += var9; // L: 745 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 746 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 756 + var3 += var7; // L: 757 + var5 += var9; // L: 758 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 759 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 737 - var3 += var7; // L: 738 - var4 += var8; // L: 739 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 740 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 750 + var3 += var7; // L: 751 + var4 += var8; // L: 752 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 753 } } else { - var0 -= var2; // L: 751 - var2 -= var1; // L: 752 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 753 + var0 -= var2; // L: 764 + var2 -= var1; // L: 765 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 766 while (true) { - --var2; // L: 754 + --var2; // L: 767 if (var2 < 0) { while (true) { - --var0; // L: 760 + --var0; // L: 773 if (var0 < 0) { - return; // L: 766 + return; // L: 779 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 761 - var3 += var7; // L: 762 - var5 += var9; // L: 763 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 764 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 774 + var3 += var7; // L: 775 + var5 += var9; // L: 776 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 777 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 755 - var3 += var7; // L: 756 - var4 += var8; // L: 757 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 758 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 768 + var3 += var7; // L: 769 + var4 += var8; // L: 770 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 771 } } } else { - var5 = var4 <<= 14; // L: 770 - if (var1 < 0) { // L: 771 - var5 -= var7 * var1; // L: 772 - var4 -= var8 * var1; // L: 773 - var1 = 0; // L: 774 + var5 = var4 <<= 14; // L: 783 + if (var1 < 0) { // L: 784 + var5 -= var7 * var1; // L: 785 + var4 -= var8 * var1; // L: 786 + var1 = 0; // L: 787 } - var3 <<= 14; // L: 776 - if (var0 < 0) { // L: 777 - var3 -= var0 * var9; // L: 778 - var0 = 0; // L: 779 + var3 <<= 14; // L: 789 + if (var0 < 0) { // L: 790 + var3 -= var0 * var9; // L: 791 + var0 = 0; // L: 792 } - if (var7 < var8) { // L: 781 - var2 -= var0; // L: 782 - var0 -= var1; // L: 783 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 784 + if (var7 < var8) { // L: 794 + var2 -= var0; // L: 795 + var0 -= var1; // L: 796 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 797 while (true) { - --var0; // L: 785 + --var0; // L: 798 if (var0 < 0) { while (true) { - --var2; // L: 791 + --var2; // L: 804 if (var2 < 0) { - return; // L: 797 + return; // L: 810 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 792 - var3 += var9; // L: 793 - var4 += var8; // L: 794 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 795 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 805 + var3 += var9; // L: 806 + var4 += var8; // L: 807 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 808 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 786 - var5 += var7; // L: 787 - var4 += var8; // L: 788 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 789 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 799 + var5 += var7; // L: 800 + var4 += var8; // L: 801 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 802 } } else { - var2 -= var0; // L: 800 - var0 -= var1; // L: 801 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 802 + var2 -= var0; // L: 813 + var0 -= var1; // L: 814 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 815 while (true) { - --var0; // L: 803 + --var0; // L: 816 if (var0 < 0) { while (true) { - --var2; // L: 809 + --var2; // L: 822 if (var2 < 0) { - return; // L: 815 + return; // L: 828 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 810 - var3 += var9; // L: 811 - var4 += var8; // L: 812 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 813 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 823 + var3 += var9; // L: 824 + var4 += var8; // L: 825 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 826 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 804 - var5 += var7; // L: 805 - var4 += var8; // L: 806 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 807 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 817 + var5 += var7; // L: 818 + var4 += var8; // L: 819 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 820 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 820 - if (var0 > Rasterizer3D_clipHeight) { // L: 821 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 833 + if (var0 > Rasterizer3D_clipHeight) { // L: 834 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 822 + if (var1 > Rasterizer3D_clipHeight) { // L: 835 var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { // L: 823 - var4 = var5 <<= 14; // L: 824 - if (var2 < 0) { // L: 825 - var4 -= var8 * var2; // L: 826 - var5 -= var9 * var2; // L: 827 - var2 = 0; // L: 828 + if (var0 < var1) { // L: 836 + var4 = var5 <<= 14; // L: 837 + if (var2 < 0) { // L: 838 + var4 -= var8 * var2; // L: 839 + var5 -= var9 * var2; // L: 840 + var2 = 0; // L: 841 } - var3 <<= 14; // L: 830 - if (var0 < 0) { // L: 831 - var3 -= var0 * var7; // L: 832 - var0 = 0; // L: 833 + var3 <<= 14; // L: 843 + if (var0 < 0) { // L: 844 + var3 -= var0 * var7; // L: 845 + var0 = 0; // L: 846 } - if (var8 < var9) { // L: 835 - var1 -= var0; // L: 836 - var0 -= var2; // L: 837 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 838 + if (var8 < var9) { // L: 848 + var1 -= var0; // L: 849 + var0 -= var2; // L: 850 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 851 while (true) { - --var0; // L: 839 + --var0; // L: 852 if (var0 < 0) { while (true) { - --var1; // L: 845 + --var1; // L: 858 if (var1 < 0) { - return; // L: 851 + return; // L: 864 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 846 - var4 += var8; // L: 847 - var3 += var7; // L: 848 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 849 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 859 + var4 += var8; // L: 860 + var3 += var7; // L: 861 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 862 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 840 - var4 += var8; // L: 841 - var5 += var9; // L: 842 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 843 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 853 + var4 += var8; // L: 854 + var5 += var9; // L: 855 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 856 } } else { - var1 -= var0; // L: 854 - var0 -= var2; // L: 855 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 856 + var1 -= var0; // L: 867 + var0 -= var2; // L: 868 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 869 while (true) { - --var0; // L: 857 + --var0; // L: 870 if (var0 < 0) { while (true) { - --var1; // L: 863 + --var1; // L: 876 if (var1 < 0) { - return; // L: 869 + return; // L: 882 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 864 - var4 += var8; // L: 865 - var3 += var7; // L: 866 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 867 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 877 + var4 += var8; // L: 878 + var3 += var7; // L: 879 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 880 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 858 - var4 += var8; // L: 859 - var5 += var9; // L: 860 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 861 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 871 + var4 += var8; // L: 872 + var5 += var9; // L: 873 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 874 } } } else { - var3 = var5 <<= 14; // L: 873 - if (var2 < 0) { // L: 874 - var3 -= var8 * var2; // L: 875 - var5 -= var9 * var2; // L: 876 - var2 = 0; // L: 877 + var3 = var5 <<= 14; // L: 886 + if (var2 < 0) { // L: 887 + var3 -= var8 * var2; // L: 888 + var5 -= var9 * var2; // L: 889 + var2 = 0; // L: 890 } - var4 <<= 14; // L: 879 - if (var1 < 0) { // L: 880 - var4 -= var7 * var1; // L: 881 - var1 = 0; // L: 882 + var4 <<= 14; // L: 892 + if (var1 < 0) { // L: 893 + var4 -= var7 * var1; // L: 894 + var1 = 0; // L: 895 } - if (var8 < var9) { // L: 884 - var0 -= var1; // L: 885 - var1 -= var2; // L: 886 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 887 + if (var8 < var9) { // L: 897 + var0 -= var1; // L: 898 + var1 -= var2; // L: 899 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 900 while (true) { - --var1; // L: 888 + --var1; // L: 901 if (var1 < 0) { while (true) { - --var0; // L: 894 + --var0; // L: 907 if (var0 < 0) { - return; // L: 900 + return; // L: 913 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 895 - var4 += var7; // L: 896 - var5 += var9; // L: 897 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 898 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 908 + var4 += var7; // L: 909 + var5 += var9; // L: 910 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 911 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 889 - var3 += var8; // L: 890 - var5 += var9; // L: 891 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 892 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 902 + var3 += var8; // L: 903 + var5 += var9; // L: 904 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 905 } } else { - var0 -= var1; // L: 903 - var1 -= var2; // L: 904 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 905 + var0 -= var1; // L: 916 + var1 -= var2; // L: 917 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 918 while (true) { - --var1; // L: 906 + --var1; // L: 919 if (var1 < 0) { while (true) { - --var0; // L: 912 + --var0; // L: 925 if (var0 < 0) { - return; // L: 918 + return; // L: 931 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 913 - var4 += var7; // L: 914 - var5 += var9; // L: 915 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 916 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 926 + var4 += var7; // L: 927 + var5 += var9; // L: 928 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 929 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 907 - var3 += var8; // L: 908 - var5 += var9; // L: 909 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 910 + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 920 + var3 += var8; // L: 921 + var5 += var9; // L: 922 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 923 } } } } } - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1775) { // L: 925 - if (var5 > Rasterizer3D_clipWidth) { // L: 926 + if (field1899) { // L: 938 + if (var5 > Rasterizer3D_clipWidth) { // L: 939 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { // L: 927 + if (var4 < 0) { // L: 940 var4 = 0; } } - if (var4 < var5) { // L: 929 - var1 += var4; // L: 930 - var3 = var5 - var4 >> 2; // L: 931 - if (Rasterizer3D_alpha != 0) { // L: 932 - if (Rasterizer3D_alpha == 254) { // L: 944 + if (var4 < var5) { // L: 942 + var1 += var4; // L: 943 + var3 = var5 - var4 >> 2; // L: 944 + if (Rasterizer3D_alpha != 0) { // L: 945 + if (Rasterizer3D_alpha == 254) { // L: 957 while (true) { - --var3; // L: 945 + --var3; // L: 958 if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 951 + var3 = var5 - var4 & 3; // L: 964 while (true) { - --var3; // L: 952 + --var3; // L: 965 if (var3 < 0) { - return; // L: 976 + return; // L: 989 } - var0[var1++] = var0[var1]; // L: 953 + var0[var1++] = var0[var1]; // L: 966 } } - var0[var1++] = var0[var1]; // L: 946 - var0[var1++] = var0[var1]; // L: 947 - var0[var1++] = var0[var1]; // L: 948 - var0[var1++] = var0[var1]; // L: 949 + var0[var1++] = var0[var1]; // L: 959 + var0[var1++] = var0[var1]; // L: 960 + var0[var1++] = var0[var1]; // L: 961 + var0[var1++] = var0[var1]; // L: 962 } } else { - int var6 = Rasterizer3D_alpha; // L: 957 - int var7 = 256 - Rasterizer3D_alpha; // L: 958 - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 959 + int var6 = Rasterizer3D_alpha; // L: 970 + int var7 = 256 - Rasterizer3D_alpha; // L: 971 + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 972 while (true) { - --var3; // L: 960 + --var3; // L: 973 int var8; if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 970 + var3 = var5 - var4 & 3; // L: 983 while (true) { - --var3; // L: 971 + --var3; // L: 984 if (var3 < 0) { return; } - var8 = var0[var1]; // L: 972 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 973 + var8 = var0[var1]; // L: 985 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 986 } } - var8 = var0[var1]; // L: 961 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 962 - var8 = var0[var1]; // L: 963 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 964 - var8 = var0[var1]; // L: 965 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 966 - var8 = var0[var1]; // L: 967 - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 968 + var8 = var0[var1]; // L: 974 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 975 + var8 = var0[var1]; // L: 976 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 977 + var8 = var0[var1]; // L: 978 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 979 + var8 = var0[var1]; // L: 980 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 981 } } } else { while (true) { - --var3; // L: 933 + --var3; // L: 946 if (var3 < 0) { - var3 = var5 - var4 & 3; // L: 939 + var3 = var5 - var4 & 3; // L: 952 while (true) { - --var3; // L: 940 + --var3; // L: 953 if (var3 < 0) { return; } - var0[var1++] = var2; // L: 941 + var0[var1++] = var2; // L: 954 } } - var0[var1++] = var2; // L: 934 - var0[var1++] = var2; // L: 935 - var0[var1++] = var2; // L: 936 - var0[var1++] = var2; // L: 937 + var0[var1++] = var2; // L: 947 + var0[var1++] = var2; // L: 948 + var0[var1++] = var2; // L: 949 + var0[var1++] = var2; // L: 950 } } } } - @ObfuscatedName("w") - static final void method3212(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 979 + @ObfuscatedName("c") + static final void method3372(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: 992 int var20; - if (var19 == null) { // L: 980 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981 - method3175(var0, var1, var2, var3, var4, var5, method3183(var20, var6), method3183(var20, var7), method3183(var20, var8)); // L: 982 + if (var19 == null) { // L: 993 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 994 + method3383(var0, var1, var2, var3, var4, var5, method3415(var20, var6), method3415(var20, var7), method3415(var20, var8)); // L: 995 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985 - field1788 = Rasterizer3D_textureLoader.vmethod3432(var18); // L: 986 - var20 = var4 - var3; // L: 987 - int var21 = var1 - var0; // L: 988 - int var22 = var5 - var3; // L: 989 - int var23 = var2 - var0; // L: 990 - int var24 = var7 - var6; // L: 991 - int var25 = var8 - var6; // L: 992 - int var26 = 0; // L: 993 - if (var0 != var1) { // L: 994 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 998 + field1921 = Rasterizer3D_textureLoader.vmethod3790(var18); // L: 999 + var20 = var4 - var3; // L: 1000 + int var21 = var1 - var0; // L: 1001 + int var22 = var5 - var3; // L: 1002 + int var23 = var2 - var0; // L: 1003 + int var24 = var7 - var6; // L: 1004 + int var25 = var8 - var6; // L: 1005 + int var26 = 0; // L: 1006 + if (var0 != var1) { // L: 1007 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 995 - if (var2 != var1) { // L: 996 + int var27 = 0; // L: 1008 + if (var2 != var1) { // L: 1009 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 997 - if (var0 != var2) { // L: 998 + int var28 = 0; // L: 1010 + if (var0 != var2) { // L: 1011 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 999 - if (var29 != 0) { // L: 1000 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1001 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1002 - var10 = var9 - var10; // L: 1003 - var13 = var12 - var13; // L: 1004 - var16 = var15 - var16; // L: 1005 - var11 -= var9; // L: 1006 - var14 -= var12; // L: 1007 - var17 -= var15; // L: 1008 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1009 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1010 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1011 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1012 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1013 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1014 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1015 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1016 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1017 + int var29 = var20 * var23 - var22 * var21; // L: 1012 + if (var29 != 0) { // L: 1013 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1014 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1015 + var10 = var9 - var10; // L: 1016 + var13 = var12 - var13; // L: 1017 + var16 = var15 - var16; // L: 1018 + var11 -= var9; // L: 1019 + var14 -= var12; // L: 1020 + var17 -= var15; // L: 1021 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1022 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1023 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1024 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1025 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1026 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1027 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1028 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1029 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1030 int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1018 - if (var0 < Rasterizer3D_clipHeight) { // L: 1019 - if (var1 > Rasterizer3D_clipHeight) { // L: 1020 + if (var0 <= var1 && var0 <= var2) { // L: 1031 + if (var0 < Rasterizer3D_clipHeight) { // L: 1032 + if (var1 > Rasterizer3D_clipHeight) { // L: 1033 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1021 + if (var2 > Rasterizer3D_clipHeight) { // L: 1034 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1022 - if (var1 < var2) { // L: 1023 - var5 = var3 <<= 14; // L: 1024 - if (var0 < 0) { // L: 1025 - var5 -= var0 * var28; // L: 1026 - var3 -= var0 * var26; // L: 1027 - var6 -= var0 * var31; // L: 1028 - var0 = 0; // L: 1029 + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1035 + if (var1 < var2) { // L: 1036 + var5 = var3 <<= 14; // L: 1037 + if (var0 < 0) { // L: 1038 + var5 -= var0 * var28; // L: 1039 + var3 -= var0 * var26; // L: 1040 + var6 -= var0 * var31; // L: 1041 + var0 = 0; // L: 1042 } - var4 <<= 14; // L: 1031 - if (var1 < 0) { // L: 1032 - var4 -= var27 * var1; // L: 1033 - var1 = 0; // L: 1034 + var4 <<= 14; // L: 1044 + if (var1 < 0) { // L: 1045 + var4 -= var27 * var1; // L: 1046 + var1 = 0; // L: 1047 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1036 - var32 += var34 * var41; // L: 1037 - var35 += var37 * var41; // L: 1038 - var38 += var40 * var41; // L: 1039 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1040 - var2 -= var1; // L: 1067 - var1 -= var0; // L: 1068 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1049 + var32 += var34 * var41; // L: 1050 + var35 += var37 * var41; // L: 1051 + var38 += var40 * var41; // L: 1052 + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1053 + var2 -= var1; // L: 1054 + var1 -= var0; // L: 1055 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1056 while (true) { - --var1; // L: 1070 + --var1; // L: 1057 if (var1 < 0) { while (true) { - --var2; // L: 1080 + --var2; // L: 1067 if (var2 < 0) { - return; // L: 1090 + return; // L: 1077 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081 - var5 += var28; // L: 1082 - var4 += var27; // L: 1083 - var6 += var31; // L: 1084 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085 - var32 += var34; // L: 1086 - var35 += var37; // L: 1087 - var38 += var40; // L: 1088 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1068 + var5 += var28; // L: 1069 + var4 += var27; // L: 1070 + var6 += var31; // L: 1071 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1072 + var32 += var34; // L: 1073 + var35 += var37; // L: 1074 + var38 += var40; // L: 1075 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071 - var5 += var28; // L: 1072 - var3 += var26; // L: 1073 - var6 += var31; // L: 1074 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075 - var32 += var34; // L: 1076 - var35 += var37; // L: 1077 - var38 += var40; // L: 1078 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1058 + var5 += var28; // L: 1059 + var3 += var26; // L: 1060 + var6 += var31; // L: 1061 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1062 + var32 += var34; // L: 1063 + var35 += var37; // L: 1064 + var38 += var40; // L: 1065 } } else { - var2 -= var1; // L: 1041 - var1 -= var0; // L: 1042 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1043 + var2 -= var1; // L: 1080 + var1 -= var0; // L: 1081 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1082 while (true) { - --var1; // L: 1044 + --var1; // L: 1083 if (var1 < 0) { while (true) { - --var2; // L: 1054 + --var2; // L: 1093 if (var2 < 0) { - return; // L: 1064 + return; // L: 1103 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1055 - var5 += var28; // L: 1056 - var4 += var27; // L: 1057 - var6 += var31; // L: 1058 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1059 - var32 += var34; // L: 1060 - var35 += var37; // L: 1061 - var38 += var40; // L: 1062 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1094 + var5 += var28; // L: 1095 + var4 += var27; // L: 1096 + var6 += var31; // L: 1097 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1098 + var32 += var34; // L: 1099 + var35 += var37; // L: 1100 + var38 += var40; // L: 1101 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1045 - var5 += var28; // L: 1046 - var3 += var26; // L: 1047 - var6 += var31; // L: 1048 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1049 - var32 += var34; // L: 1050 - var35 += var37; // L: 1051 - var38 += var40; // L: 1052 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1084 + var5 += var28; // L: 1085 + var3 += var26; // L: 1086 + var6 += var31; // L: 1087 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1088 + var32 += var34; // L: 1089 + var35 += var37; // L: 1090 + var38 += var40; // L: 1091 } } } else { - var4 = var3 <<= 14; // L: 1094 - if (var0 < 0) { // L: 1095 - var4 -= var0 * var28; // L: 1096 - var3 -= var0 * var26; // L: 1097 - var6 -= var0 * var31; // L: 1098 - var0 = 0; // L: 1099 + var4 = var3 <<= 14; // L: 1107 + if (var0 < 0) { // L: 1108 + var4 -= var0 * var28; // L: 1109 + var3 -= var0 * var26; // L: 1110 + var6 -= var0 * var31; // L: 1111 + var0 = 0; // L: 1112 } - var5 <<= 14; // L: 1101 - if (var2 < 0) { // L: 1102 - var5 -= var27 * var2; // L: 1103 - var2 = 0; // L: 1104 + var5 <<= 14; // L: 1114 + if (var2 < 0) { // L: 1115 + var5 -= var27 * var2; // L: 1116 + var2 = 0; // L: 1117 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1106 - var32 += var34 * var41; // L: 1107 - var35 += var37 * var41; // L: 1108 - var38 += var40 * var41; // L: 1109 - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1110 - var1 -= var2; // L: 1111 - var2 -= var0; // L: 1112 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1113 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1119 + var32 += var34 * var41; // L: 1120 + var35 += var37 * var41; // L: 1121 + var38 += var40 * var41; // L: 1122 + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1123 + var1 -= var2; // L: 1150 + var2 -= var0; // L: 1151 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1152 while (true) { - --var2; // L: 1114 + --var2; // L: 1153 if (var2 < 0) { while (true) { - --var1; // L: 1124 + --var1; // L: 1163 if (var1 < 0) { - return; // L: 1134 + return; // L: 1173 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1125 - var5 += var27; // L: 1126 - var3 += var26; // L: 1127 - var6 += var31; // L: 1128 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1129 - var32 += var34; // L: 1130 - var35 += var37; // L: 1131 - var38 += var40; // L: 1132 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1164 + var5 += var27; // L: 1165 + var3 += var26; // L: 1166 + var6 += var31; // L: 1167 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1168 + var32 += var34; // L: 1169 + var35 += var37; // L: 1170 + var38 += var40; // L: 1171 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1115 - var4 += var28; // L: 1116 - var3 += var26; // L: 1117 - var6 += var31; // L: 1118 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1119 - var32 += var34; // L: 1120 - var35 += var37; // L: 1121 - var38 += var40; // L: 1122 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1154 + var4 += var28; // L: 1155 + var3 += var26; // L: 1156 + var6 += var31; // L: 1157 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1158 + var32 += var34; // L: 1159 + var35 += var37; // L: 1160 + var38 += var40; // L: 1161 } } else { - var1 -= var2; // L: 1137 - var2 -= var0; // L: 1138 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1139 + var1 -= var2; // L: 1124 + var2 -= var0; // L: 1125 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1126 while (true) { - --var2; // L: 1140 + --var2; // L: 1127 if (var2 < 0) { while (true) { - --var1; // L: 1150 + --var1; // L: 1137 if (var1 < 0) { - return; // L: 1160 + return; // L: 1147 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1151 - var5 += var27; // L: 1152 - var3 += var26; // L: 1153 - var6 += var31; // L: 1154 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1155 - var32 += var34; // L: 1156 - var35 += var37; // L: 1157 - var38 += var40; // L: 1158 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1138 + var5 += var27; // L: 1139 + var3 += var26; // L: 1140 + var6 += var31; // L: 1141 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1142 + var32 += var34; // L: 1143 + var35 += var37; // L: 1144 + var38 += var40; // L: 1145 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1141 - var4 += var28; // L: 1142 - var3 += var26; // L: 1143 - var6 += var31; // L: 1144 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1145 - var32 += var34; // L: 1146 - var35 += var37; // L: 1147 - var38 += var40; // L: 1148 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1128 + var4 += var28; // L: 1129 + var3 += var26; // L: 1130 + var6 += var31; // L: 1131 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1132 + var32 += var34; // L: 1133 + var35 += var37; // L: 1134 + var38 += var40; // L: 1135 } } } } - } else if (var1 <= var2) { // L: 1164 - if (var1 < Rasterizer3D_clipHeight) { // L: 1165 - if (var2 > Rasterizer3D_clipHeight) { // L: 1166 + } else if (var1 <= var2) { // L: 1177 + if (var1 < Rasterizer3D_clipHeight) { // L: 1178 + if (var2 > Rasterizer3D_clipHeight) { // L: 1179 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 1167 + if (var0 > Rasterizer3D_clipHeight) { // L: 1180 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1168 - if (var2 < var0) { // L: 1169 - var3 = var4 <<= 14; // L: 1170 - if (var1 < 0) { // L: 1171 - var3 -= var26 * var1; // L: 1172 - var4 -= var27 * var1; // L: 1173 - var7 -= var31 * var1; // L: 1174 - var1 = 0; // L: 1175 + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1181 + if (var2 < var0) { // L: 1182 + var3 = var4 <<= 14; // L: 1183 + if (var1 < 0) { // L: 1184 + var3 -= var26 * var1; // L: 1185 + var4 -= var27 * var1; // L: 1186 + var7 -= var31 * var1; // L: 1187 + var1 = 0; // L: 1188 } - var5 <<= 14; // L: 1177 - if (var2 < 0) { // L: 1178 - var5 -= var28 * var2; // L: 1179 - var2 = 0; // L: 1180 + var5 <<= 14; // L: 1190 + if (var2 < 0) { // L: 1191 + var5 -= var28 * var2; // L: 1192 + var2 = 0; // L: 1193 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1182 - var32 += var34 * var41; // L: 1183 - var35 += var37 * var41; // L: 1184 - var38 += var40 * var41; // L: 1185 - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 1186 - var0 -= var2; // L: 1213 - var2 -= var1; // L: 1214 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1215 + var41 = var1 - Rasterizer3D_clipMidY; // L: 1195 + var32 += var34 * var41; // L: 1196 + var35 += var37 * var41; // L: 1197 + var38 += var40 * var41; // L: 1198 + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1199 + var0 -= var2; // L: 1200 + var2 -= var1; // L: 1201 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1202 while (true) { - --var2; // L: 1216 + --var2; // L: 1203 if (var2 < 0) { while (true) { - --var0; // L: 1226 + --var0; // L: 1213 if (var0 < 0) { - return; // L: 1236 + return; // L: 1223 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1227 - var3 += var26; // L: 1228 - var5 += var28; // L: 1229 - var7 += var31; // L: 1230 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1231 - var32 += var34; // L: 1232 - var35 += var37; // L: 1233 - var38 += var40; // L: 1234 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1214 + var3 += var26; // L: 1215 + var5 += var28; // L: 1216 + var7 += var31; // L: 1217 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1218 + var32 += var34; // L: 1219 + var35 += var37; // L: 1220 + var38 += var40; // L: 1221 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1217 - var3 += var26; // L: 1218 - var4 += var27; // L: 1219 - var7 += var31; // L: 1220 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1221 - var32 += var34; // L: 1222 - var35 += var37; // L: 1223 - var38 += var40; // L: 1224 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1204 + var3 += var26; // L: 1205 + var4 += var27; // L: 1206 + var7 += var31; // L: 1207 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1208 + var32 += var34; // L: 1209 + var35 += var37; // L: 1210 + var38 += var40; // L: 1211 } } else { - var0 -= var2; // L: 1187 - var2 -= var1; // L: 1188 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1189 + var0 -= var2; // L: 1226 + var2 -= var1; // L: 1227 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1228 while (true) { - --var2; // L: 1190 + --var2; // L: 1229 if (var2 < 0) { while (true) { - --var0; // L: 1200 + --var0; // L: 1239 if (var0 < 0) { - return; // L: 1210 + return; // L: 1249 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1201 - var3 += var26; // L: 1202 - var5 += var28; // L: 1203 - var7 += var31; // L: 1204 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1205 - var32 += var34; // L: 1206 - var35 += var37; // L: 1207 - var38 += var40; // L: 1208 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1240 + var3 += var26; // L: 1241 + var5 += var28; // L: 1242 + var7 += var31; // L: 1243 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1244 + var32 += var34; // L: 1245 + var35 += var37; // L: 1246 + var38 += var40; // L: 1247 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1191 - var3 += var26; // L: 1192 - var4 += var27; // L: 1193 - var7 += var31; // L: 1194 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1195 - var32 += var34; // L: 1196 - var35 += var37; // L: 1197 - var38 += var40; // L: 1198 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1230 + var3 += var26; // L: 1231 + var4 += var27; // L: 1232 + var7 += var31; // L: 1233 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1234 + var32 += var34; // L: 1235 + var35 += var37; // L: 1236 + var38 += var40; // L: 1237 } } } else { - var5 = var4 <<= 14; // L: 1240 - if (var1 < 0) { // L: 1241 - var5 -= var26 * var1; // L: 1242 - var4 -= var27 * var1; // L: 1243 - var7 -= var31 * var1; // L: 1244 - var1 = 0; // L: 1245 + var5 = var4 <<= 14; // L: 1253 + if (var1 < 0) { // L: 1254 + var5 -= var26 * var1; // L: 1255 + var4 -= var27 * var1; // L: 1256 + var7 -= var31 * var1; // L: 1257 + var1 = 0; // L: 1258 } - var3 <<= 14; // L: 1247 - if (var0 < 0) { // L: 1248 - var3 -= var0 * var28; // L: 1249 - var0 = 0; // L: 1250 + var3 <<= 14; // L: 1260 + if (var0 < 0) { // L: 1261 + var3 -= var0 * var28; // L: 1262 + var0 = 0; // L: 1263 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 1252 - var32 += var34 * var41; // L: 1253 - var35 += var37 * var41; // L: 1254 - var38 += var40 * var41; // L: 1255 - if (var26 < var27) { // L: 1256 - var2 -= var0; // L: 1257 - var0 -= var1; // L: 1258 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1259 + var41 = var1 - Rasterizer3D_clipMidY; // L: 1265 + var32 += var34 * var41; // L: 1266 + var35 += var37 * var41; // L: 1267 + var38 += var40 * var41; // L: 1268 + if (var26 < var27) { // L: 1269 + var2 -= var0; // L: 1270 + var0 -= var1; // L: 1271 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1272 while (true) { - --var0; // L: 1260 + --var0; // L: 1273 if (var0 < 0) { while (true) { - --var2; // L: 1270 + --var2; // L: 1283 if (var2 < 0) { - return; // L: 1280 + return; // L: 1293 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1271 - var3 += var28; // L: 1272 - var4 += var27; // L: 1273 - var7 += var31; // L: 1274 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1275 - var32 += var34; // L: 1276 - var35 += var37; // L: 1277 - var38 += var40; // L: 1278 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1284 + var3 += var28; // L: 1285 + var4 += var27; // L: 1286 + var7 += var31; // L: 1287 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1288 + var32 += var34; // L: 1289 + var35 += var37; // L: 1290 + var38 += var40; // L: 1291 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1261 - var5 += var26; // L: 1262 - var4 += var27; // L: 1263 - var7 += var31; // L: 1264 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1265 - var32 += var34; // L: 1266 - var35 += var37; // L: 1267 - var38 += var40; // L: 1268 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1274 + var5 += var26; // L: 1275 + var4 += var27; // L: 1276 + var7 += var31; // L: 1277 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1278 + var32 += var34; // L: 1279 + var35 += var37; // L: 1280 + var38 += var40; // L: 1281 } } else { - var2 -= var0; // L: 1283 - var0 -= var1; // L: 1284 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 1285 + var2 -= var0; // L: 1296 + var0 -= var1; // L: 1297 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1298 while (true) { - --var0; // L: 1286 + --var0; // L: 1299 if (var0 < 0) { while (true) { - --var2; // L: 1296 + --var2; // L: 1309 if (var2 < 0) { - return; // L: 1306 + return; // L: 1319 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1297 - var3 += var28; // L: 1298 - var4 += var27; // L: 1299 - var7 += var31; // L: 1300 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1301 - var32 += var34; // L: 1302 - var35 += var37; // L: 1303 - var38 += var40; // L: 1304 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1310 + var3 += var28; // L: 1311 + var4 += var27; // L: 1312 + var7 += var31; // L: 1313 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1314 + var32 += var34; // L: 1315 + var35 += var37; // L: 1316 + var38 += var40; // L: 1317 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1287 - var5 += var26; // L: 1288 - var4 += var27; // L: 1289 - var7 += var31; // L: 1290 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 1291 - var32 += var34; // L: 1292 - var35 += var37; // L: 1293 - var38 += var40; // L: 1294 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1300 + var5 += var26; // L: 1301 + var4 += var27; // L: 1302 + var7 += var31; // L: 1303 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1304 + var32 += var34; // L: 1305 + var35 += var37; // L: 1306 + var38 += var40; // L: 1307 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 1311 - if (var0 > Rasterizer3D_clipHeight) { // L: 1312 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 1324 + if (var0 > Rasterizer3D_clipHeight) { // L: 1325 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 1313 + if (var1 > Rasterizer3D_clipHeight) { // L: 1326 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 1314 - if (var0 < var1) { // L: 1315 - var4 = var5 <<= 14; // L: 1316 - if (var2 < 0) { // L: 1317 - var4 -= var27 * var2; // L: 1318 - var5 -= var28 * var2; // L: 1319 - var8 -= var31 * var2; // L: 1320 - var2 = 0; // L: 1321 + var8 = (var8 << 9) - var5 * var30 + var30; // L: 1327 + if (var0 < var1) { // L: 1328 + var4 = var5 <<= 14; // L: 1329 + if (var2 < 0) { // L: 1330 + var4 -= var27 * var2; // L: 1331 + var5 -= var28 * var2; // L: 1332 + var8 -= var31 * var2; // L: 1333 + var2 = 0; // L: 1334 } - var3 <<= 14; // L: 1323 - if (var0 < 0) { // L: 1324 - var3 -= var0 * var26; // L: 1325 - var0 = 0; // L: 1326 + var3 <<= 14; // L: 1336 + if (var0 < 0) { // L: 1337 + var3 -= var0 * var26; // L: 1338 + var0 = 0; // L: 1339 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1328 - var32 += var34 * var41; // L: 1329 - var35 += var37 * var41; // L: 1330 - var38 += var40 * var41; // L: 1331 - if (var27 < var28) { // L: 1332 - var1 -= var0; // L: 1333 - var0 -= var2; // L: 1334 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1335 + var41 = var2 - Rasterizer3D_clipMidY; // L: 1341 + var32 += var34 * var41; // L: 1342 + var35 += var37 * var41; // L: 1343 + var38 += var40 * var41; // L: 1344 + if (var27 < var28) { // L: 1345 + var1 -= var0; // L: 1346 + var0 -= var2; // L: 1347 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1348 while (true) { - --var0; // L: 1336 + --var0; // L: 1349 if (var0 < 0) { while (true) { - --var1; // L: 1346 + --var1; // L: 1359 if (var1 < 0) { - return; // L: 1356 + return; // L: 1369 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1347 - var4 += var27; // L: 1348 - var3 += var26; // L: 1349 - var8 += var31; // L: 1350 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1351 - var32 += var34; // L: 1352 - var35 += var37; // L: 1353 - var38 += var40; // L: 1354 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1360 + var4 += var27; // L: 1361 + var3 += var26; // L: 1362 + var8 += var31; // L: 1363 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1364 + var32 += var34; // L: 1365 + var35 += var37; // L: 1366 + var38 += var40; // L: 1367 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1337 - var4 += var27; // L: 1338 - var5 += var28; // L: 1339 - var8 += var31; // L: 1340 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1341 - var32 += var34; // L: 1342 - var35 += var37; // L: 1343 - var38 += var40; // L: 1344 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1350 + var4 += var27; // L: 1351 + var5 += var28; // L: 1352 + var8 += var31; // L: 1353 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1354 + var32 += var34; // L: 1355 + var35 += var37; // L: 1356 + var38 += var40; // L: 1357 } } else { - var1 -= var0; // L: 1359 - var0 -= var2; // L: 1360 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1361 + var1 -= var0; // L: 1372 + var0 -= var2; // L: 1373 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1374 while (true) { - --var0; // L: 1362 + --var0; // L: 1375 if (var0 < 0) { while (true) { - --var1; // L: 1372 + --var1; // L: 1385 if (var1 < 0) { - return; // L: 1382 + return; // L: 1395 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1373 - var4 += var27; // L: 1374 - var3 += var26; // L: 1375 - var8 += var31; // L: 1376 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1377 - var32 += var34; // L: 1378 - var35 += var37; // L: 1379 - var38 += var40; // L: 1380 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1386 + var4 += var27; // L: 1387 + var3 += var26; // L: 1388 + var8 += var31; // L: 1389 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1390 + var32 += var34; // L: 1391 + var35 += var37; // L: 1392 + var38 += var40; // L: 1393 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1363 - var4 += var27; // L: 1364 - var5 += var28; // L: 1365 - var8 += var31; // L: 1366 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1367 - var32 += var34; // L: 1368 - var35 += var37; // L: 1369 - var38 += var40; // L: 1370 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1376 + var4 += var27; // L: 1377 + var5 += var28; // L: 1378 + var8 += var31; // L: 1379 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1380 + var32 += var34; // L: 1381 + var35 += var37; // L: 1382 + var38 += var40; // L: 1383 } } } else { - var3 = var5 <<= 14; // L: 1386 - if (var2 < 0) { // L: 1387 - var3 -= var27 * var2; // L: 1388 - var5 -= var28 * var2; // L: 1389 - var8 -= var31 * var2; // L: 1390 - var2 = 0; // L: 1391 + var3 = var5 <<= 14; // L: 1399 + if (var2 < 0) { // L: 1400 + var3 -= var27 * var2; // L: 1401 + var5 -= var28 * var2; // L: 1402 + var8 -= var31 * var2; // L: 1403 + var2 = 0; // L: 1404 } - var4 <<= 14; // L: 1393 - if (var1 < 0) { // L: 1394 - var4 -= var26 * var1; // L: 1395 - var1 = 0; // L: 1396 + var4 <<= 14; // L: 1406 + if (var1 < 0) { // L: 1407 + var4 -= var26 * var1; // L: 1408 + var1 = 0; // L: 1409 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 1398 - var32 += var34 * var41; // L: 1399 - var35 += var37 * var41; // L: 1400 - var38 += var40 * var41; // L: 1401 - if (var27 < var28) { // L: 1402 - var0 -= var1; // L: 1403 - var1 -= var2; // L: 1404 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1405 + var41 = var2 - Rasterizer3D_clipMidY; // L: 1411 + var32 += var34 * var41; // L: 1412 + var35 += var37 * var41; // L: 1413 + var38 += var40 * var41; // L: 1414 + if (var27 < var28) { // L: 1415 + var0 -= var1; // L: 1416 + var1 -= var2; // L: 1417 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1418 while (true) { - --var1; // L: 1406 + --var1; // L: 1419 if (var1 < 0) { while (true) { - --var0; // L: 1416 + --var0; // L: 1429 if (var0 < 0) { - return; // L: 1426 + return; // L: 1439 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1417 - var4 += var26; // L: 1418 - var5 += var28; // L: 1419 - var8 += var31; // L: 1420 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1421 - var32 += var34; // L: 1422 - var35 += var37; // L: 1423 - var38 += var40; // L: 1424 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1430 + var4 += var26; // L: 1431 + var5 += var28; // L: 1432 + var8 += var31; // L: 1433 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1434 + var32 += var34; // L: 1435 + var35 += var37; // L: 1436 + var38 += var40; // L: 1437 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1407 - var3 += var27; // L: 1408 - var5 += var28; // L: 1409 - var8 += var31; // L: 1410 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1411 - var32 += var34; // L: 1412 - var35 += var37; // L: 1413 - var38 += var40; // L: 1414 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1420 + var3 += var27; // L: 1421 + var5 += var28; // L: 1422 + var8 += var31; // L: 1423 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1424 + var32 += var34; // L: 1425 + var35 += var37; // L: 1426 + var38 += var40; // L: 1427 } } else { - var0 -= var1; // L: 1429 - var1 -= var2; // L: 1430 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 1431 + var0 -= var1; // L: 1442 + var1 -= var2; // L: 1443 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1444 while (true) { - --var1; // L: 1432 + --var1; // L: 1445 if (var1 < 0) { while (true) { - --var0; // L: 1442 + --var0; // L: 1455 if (var0 < 0) { - return; // L: 1452 + return; // L: 1465 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1443 - var4 += var26; // L: 1444 - var5 += var28; // L: 1445 - var8 += var31; // L: 1446 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1447 - var32 += var34; // L: 1448 - var35 += var37; // L: 1449 - var38 += var40; // L: 1450 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1456 + var4 += var26; // L: 1457 + var5 += var28; // L: 1458 + var8 += var31; // L: 1459 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1460 + var32 += var34; // L: 1461 + var35 += var37; // L: 1462 + var38 += var40; // L: 1463 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1433 - var3 += var27; // L: 1434 - var5 += var28; // L: 1435 - var8 += var31; // L: 1436 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 1437 - var32 += var34; // L: 1438 - var35 += var37; // L: 1439 - var38 += var40; // L: 1440 + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1446 + var3 += var27; // L: 1447 + var5 += var28; // L: 1448 + var8 += var31; // L: 1449 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1450 + var32 += var34; // L: 1451 + var35 += var37; // L: 1452 + var38 += var40; // L: 1453 } } } } } } - } // L: 983 + } // L: 996 - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1775) { // L: 1461 - if (var6 > Rasterizer3D_clipWidth) { // L: 1462 + if (field1899) { // L: 1474 + if (var6 > Rasterizer3D_clipWidth) { // L: 1475 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 1463 + if (var5 < 0) { // L: 1476 var5 = 0; } } - if (var5 < var6) { // L: 1465 - var4 += var5; // L: 1466 - var7 += var5 * var8; // L: 1467 - int var17 = var6 - var5; // L: 1468 + if (var5 < var6) { // L: 1478 + var4 += var5; // L: 1479 + var7 += var5 * var8; // L: 1480 + int var17 = var6 - var5; // L: 1481 int var15; int var16; int var10000; @@ -2068,1040 +2078,1040 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 1469 - var23 = var5 - Rasterizer3D_clipMidX; // L: 1475 - var9 += var23 * (var12 >> 3); // L: 1476 - var10 += (var13 >> 3) * var23; // L: 1477 - var11 += var23 * (var14 >> 3); // L: 1478 - var22 = var11 >> 12; // L: 1479 - if (var22 != 0) { // L: 1480 - var18 = var9 / var22; // L: 1481 - var19 = var10 / var22; // L: 1482 - if (var18 < 0) { // L: 1483 + if (Rasterizer3D_isLowDetailTexture) { // L: 1482 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1488 + var9 += var23 * (var12 >> 3); // L: 1489 + var10 += (var13 >> 3) * var23; // L: 1490 + var11 += var23 * (var14 >> 3); // L: 1491 + var22 = var11 >> 12; // L: 1492 + if (var22 != 0) { // L: 1493 + var18 = var9 / var22; // L: 1494 + var19 = var10 / var22; // L: 1495 + if (var18 < 0) { // L: 1496 var18 = 0; - } else if (var18 > 4032) { // L: 1484 + } else if (var18 > 4032) { // L: 1497 var18 = 4032; } } else { - var18 = 0; // L: 1487 - var19 = 0; // L: 1488 + var18 = 0; // L: 1500 + var19 = 0; // L: 1501 } - var9 += var12; // L: 1490 - var10 += var13; // L: 1491 - var11 += var14; // L: 1492 - var22 = var11 >> 12; // L: 1493 - if (var22 != 0) { // L: 1494 - var20 = var9 / var22; // L: 1495 - var21 = var10 / var22; // L: 1496 - if (var20 < 0) { // L: 1497 + var9 += var12; // L: 1503 + var10 += var13; // L: 1504 + var11 += var14; // L: 1505 + var22 = var11 >> 12; // L: 1506 + if (var22 != 0) { // L: 1507 + var20 = var9 / var22; // L: 1508 + var21 = var10 / var22; // L: 1509 + if (var20 < 0) { // L: 1510 var20 = 0; - } else if (var20 > 4032) { // L: 1498 + } else if (var20 > 4032) { // L: 1511 var20 = 4032; } } else { - var20 = 0; // L: 1501 - var21 = 0; // L: 1502 + var20 = 0; // L: 1514 + var21 = 0; // L: 1515 } - var2 = (var18 << 20) + var19; // L: 1504 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1505 - var17 >>= 3; // L: 1506 - var8 <<= 3; // L: 1507 - var15 = var7 >> 8; // L: 1508 - if (field1788) { // L: 1509 - if (var17 > 0) { // L: 1510 + var2 = (var18 << 20) + var19; // L: 1517 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1518 + var17 >>= 3; // L: 1519 + var8 <<= 3; // L: 1520 + var15 = var7 >> 8; // L: 1521 + if (field1921) { // L: 1522 + if (var17 > 0) { // L: 1523 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1513 - var2 += var16; // L: 1514 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1515 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1516 - var2 += var16; // L: 1517 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1518 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1519 - var2 += var16; // L: 1520 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1521 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1522 - var2 += var16; // L: 1523 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1524 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1525 - var2 += var16; // L: 1526 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1527 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1528 - var2 += var16; // L: 1529 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1530 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1531 - var2 += var16; // L: 1532 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1533 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1534 - var10000 = var16 + var2; // L: 1535 - var18 = var20; // L: 1536 - var19 = var21; // L: 1537 - var9 += var12; // L: 1538 - var10 += var13; // L: 1539 - var11 += var14; // L: 1540 - var22 = var11 >> 12; // L: 1541 - if (var22 != 0) { // L: 1542 - var20 = var9 / var22; // L: 1543 - var21 = var10 / var22; // L: 1544 - if (var20 < 0) { // L: 1545 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1525 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1526 + var2 += var16; // L: 1527 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1528 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1529 + var2 += var16; // L: 1530 + 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 + var10000 = var16 + var2; // L: 1548 + var18 = var20; // L: 1549 + var19 = var21; // L: 1550 + var9 += var12; // L: 1551 + var10 += var13; // L: 1552 + var11 += var14; // L: 1553 + var22 = var11 >> 12; // L: 1554 + if (var22 != 0) { // L: 1555 + var20 = var9 / var22; // L: 1556 + var21 = var10 / var22; // L: 1557 + if (var20 < 0) { // L: 1558 var20 = 0; - } else if (var20 > 4032) { // L: 1546 + } else if (var20 > 4032) { // L: 1559 var20 = 4032; } } else { - var20 = 0; // L: 1549 - var21 = 0; // L: 1550 + var20 = 0; // L: 1562 + var21 = 0; // L: 1563 } - var2 = (var18 << 20) + var19; // L: 1552 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1553 - var7 += var8; // L: 1554 - var15 = var7 >> 8; // L: 1555 - --var17; // L: 1556 + var2 = (var18 << 20) + var19; // L: 1565 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1566 + var7 += var8; // L: 1567 + var15 = var7 >> 8; // L: 1568 + --var17; // L: 1569 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1558 - if (var17 > 0) { // L: 1559 + var17 = var6 - var5 & 7; // L: 1571 + if (var17 > 0) { // L: 1572 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1561 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1562 - var2 += var16; // L: 1563 - --var17; // L: 1564 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1574 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1575 + var2 += var16; // L: 1576 + --var17; // L: 1577 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1568 + if (var17 > 0) { // L: 1581 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1570 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1571 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1583 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1584 } - ++var4; // L: 1573 - var2 += var16; // L: 1574 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1575 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1576 + ++var4; // L: 1586 + var2 += var16; // L: 1587 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1588 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1589 } - ++var4; // L: 1578 - var2 += var16; // L: 1579 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1580 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1581 + ++var4; // L: 1591 + var2 += var16; // L: 1592 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1593 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1594 } - ++var4; // L: 1583 - var2 += var16; // L: 1584 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1585 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1586 + ++var4; // L: 1596 + var2 += var16; // L: 1597 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1598 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1599 } - ++var4; // L: 1588 - var2 += var16; // L: 1589 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1590 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1591 + ++var4; // L: 1601 + var2 += var16; // L: 1602 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1603 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1604 } - ++var4; // L: 1593 - var2 += var16; // L: 1594 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1595 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1596 + ++var4; // L: 1606 + var2 += var16; // L: 1607 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1608 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1609 } - ++var4; // L: 1598 - var2 += var16; // L: 1599 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1600 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1601 + ++var4; // L: 1611 + var2 += var16; // L: 1612 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1613 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1614 } - ++var4; // L: 1603 - var2 += var16; // L: 1604 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1605 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1606 + ++var4; // L: 1616 + var2 += var16; // L: 1617 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1618 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1619 } - ++var4; // L: 1608 - var10000 = var16 + var2; // L: 1609 - var18 = var20; // L: 1610 - var19 = var21; // L: 1611 - var9 += var12; // L: 1612 - var10 += var13; // L: 1613 - var11 += var14; // L: 1614 - var22 = var11 >> 12; // L: 1615 - if (var22 != 0) { // L: 1616 - var20 = var9 / var22; // L: 1617 - var21 = var10 / var22; // L: 1618 - if (var20 < 0) { // L: 1619 + ++var4; // L: 1621 + var10000 = var16 + var2; // L: 1622 + var18 = var20; // L: 1623 + var19 = var21; // L: 1624 + var9 += var12; // L: 1625 + var10 += var13; // L: 1626 + var11 += var14; // L: 1627 + var22 = var11 >> 12; // L: 1628 + if (var22 != 0) { // L: 1629 + var20 = var9 / var22; // L: 1630 + var21 = var10 / var22; // L: 1631 + if (var20 < 0) { // L: 1632 var20 = 0; - } else if (var20 > 4032) { // L: 1620 + } else if (var20 > 4032) { // L: 1633 var20 = 4032; } } else { - var20 = 0; // L: 1623 - var21 = 0; // L: 1624 + var20 = 0; // L: 1636 + var21 = 0; // L: 1637 } - var2 = (var18 << 20) + var19; // L: 1626 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1627 - var7 += var8; // L: 1628 - var15 = var7 >> 8; // L: 1629 - --var17; // L: 1630 + var2 = (var18 << 20) + var19; // L: 1639 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1640 + var7 += var8; // L: 1641 + var15 = var7 >> 8; // L: 1642 + --var17; // L: 1643 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1632 - if (var17 > 0) { // L: 1633 + var17 = var6 - var5 & 7; // L: 1645 + if (var17 > 0) { // L: 1646 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1635 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1636 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1648 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1649 } - ++var4; // L: 1638 - var2 += var16; // L: 1639 - --var17; // L: 1640 + ++var4; // L: 1651 + var2 += var16; // L: 1652 + --var17; // L: 1653 } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 1650 - var9 += var23 * (var12 >> 3); // L: 1651 - var10 += (var13 >> 3) * var23; // L: 1652 - var11 += var23 * (var14 >> 3); // L: 1653 - var22 = var11 >> 14; // L: 1654 - if (var22 != 0) { // L: 1655 - var18 = var9 / var22; // L: 1656 - var19 = var10 / var22; // L: 1657 - if (var18 < 0) { // L: 1658 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1663 + var9 += var23 * (var12 >> 3); // L: 1664 + var10 += (var13 >> 3) * var23; // L: 1665 + var11 += var23 * (var14 >> 3); // L: 1666 + var22 = var11 >> 14; // L: 1667 + if (var22 != 0) { // L: 1668 + var18 = var9 / var22; // L: 1669 + var19 = var10 / var22; // L: 1670 + if (var18 < 0) { // L: 1671 var18 = 0; - } else if (var18 > 16256) { // L: 1659 + } else if (var18 > 16256) { // L: 1672 var18 = 16256; } } else { - var18 = 0; // L: 1662 - var19 = 0; // L: 1663 + var18 = 0; // L: 1675 + var19 = 0; // L: 1676 } - var9 += var12; // L: 1665 - var10 += var13; // L: 1666 - var11 += var14; // L: 1667 - var22 = var11 >> 14; // L: 1668 - if (var22 != 0) { // L: 1669 - var20 = var9 / var22; // L: 1670 - var21 = var10 / var22; // L: 1671 - if (var20 < 0) { // L: 1672 + var9 += var12; // L: 1678 + var10 += var13; // L: 1679 + var11 += var14; // L: 1680 + var22 = var11 >> 14; // L: 1681 + if (var22 != 0) { // L: 1682 + var20 = var9 / var22; // L: 1683 + var21 = var10 / var22; // L: 1684 + if (var20 < 0) { // L: 1685 var20 = 0; - } else if (var20 > 16256) { // L: 1673 + } else if (var20 > 16256) { // L: 1686 var20 = 16256; } } else { - var20 = 0; // L: 1676 - var21 = 0; // L: 1677 + var20 = 0; // L: 1689 + var21 = 0; // L: 1690 } - var2 = (var18 << 18) + var19; // L: 1679 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1680 - var17 >>= 3; // L: 1681 - var8 <<= 3; // L: 1682 - var15 = var7 >> 8; // L: 1683 - if (field1788) { // L: 1684 - if (var17 > 0) { // L: 1685 + var2 = (var18 << 18) + var19; // L: 1692 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1693 + var17 >>= 3; // L: 1694 + var8 <<= 3; // L: 1695 + var15 = var7 >> 8; // L: 1696 + if (field1921) { // L: 1697 + if (var17 > 0) { // L: 1698 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1688 - var2 += var16; // L: 1689 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1690 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1691 - var2 += var16; // L: 1692 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1693 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1694 - var2 += var16; // L: 1695 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1696 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1697 - var2 += var16; // L: 1698 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1699 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1700 - var2 += var16; // L: 1701 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1702 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1703 - var2 += var16; // L: 1704 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1705 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1706 - var2 += var16; // L: 1707 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1708 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1709 - var10000 = var16 + var2; // L: 1710 - var18 = var20; // L: 1711 - var19 = var21; // L: 1712 - var9 += var12; // L: 1713 - var10 += var13; // L: 1714 - var11 += var14; // L: 1715 - var22 = var11 >> 14; // L: 1716 - if (var22 != 0) { // L: 1717 - var20 = var9 / var22; // L: 1718 - var21 = var10 / var22; // L: 1719 - if (var20 < 0) { // L: 1720 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1700 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1701 + var2 += var16; // L: 1702 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1703 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1704 + var2 += var16; // L: 1705 + 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 + var10000 = var16 + var2; // L: 1723 + var18 = var20; // L: 1724 + var19 = var21; // L: 1725 + var9 += var12; // L: 1726 + var10 += var13; // L: 1727 + var11 += var14; // L: 1728 + var22 = var11 >> 14; // L: 1729 + if (var22 != 0) { // L: 1730 + var20 = var9 / var22; // L: 1731 + var21 = var10 / var22; // L: 1732 + if (var20 < 0) { // L: 1733 var20 = 0; - } else if (var20 > 16256) { // L: 1721 + } else if (var20 > 16256) { // L: 1734 var20 = 16256; } } else { - var20 = 0; // L: 1724 - var21 = 0; // L: 1725 + var20 = 0; // L: 1737 + var21 = 0; // L: 1738 } - var2 = (var18 << 18) + var19; // L: 1727 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1728 - var7 += var8; // L: 1729 - var15 = var7 >> 8; // L: 1730 - --var17; // L: 1731 + var2 = (var18 << 18) + var19; // L: 1740 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1741 + var7 += var8; // L: 1742 + var15 = var7 >> 8; // L: 1743 + --var17; // L: 1744 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1733 - if (var17 > 0) { // L: 1734 + var17 = var6 - var5 & 7; // L: 1746 + if (var17 > 0) { // L: 1747 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1736 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1737 - var2 += var16; // L: 1738 - --var17; // L: 1739 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1749 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1750 + var2 += var16; // L: 1751 + --var17; // L: 1752 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 1743 + if (var17 > 0) { // L: 1756 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1745 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1746 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1758 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1759 } - ++var4; // L: 1748 - var2 += var16; // L: 1749 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1750 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1751 + ++var4; // L: 1761 + var2 += var16; // L: 1762 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1763 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1764 } - ++var4; // L: 1753 - var2 += var16; // L: 1754 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1755 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1756 + ++var4; // L: 1766 + var2 += var16; // L: 1767 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1768 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1769 } - ++var4; // L: 1758 - var2 += var16; // L: 1759 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1760 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1761 + ++var4; // L: 1771 + var2 += var16; // L: 1772 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1773 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1774 } - ++var4; // L: 1763 - var2 += var16; // L: 1764 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1765 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1766 + ++var4; // L: 1776 + var2 += var16; // L: 1777 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1778 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1779 } - ++var4; // L: 1768 - var2 += var16; // L: 1769 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1770 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1771 + ++var4; // L: 1781 + var2 += var16; // L: 1782 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1783 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1784 } - ++var4; // L: 1773 - var2 += var16; // L: 1774 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1775 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1776 + ++var4; // L: 1786 + var2 += var16; // L: 1787 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1788 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1789 } - ++var4; // L: 1778 - var2 += var16; // L: 1779 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1780 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1781 + ++var4; // L: 1791 + var2 += var16; // L: 1792 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1793 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1794 } - ++var4; // L: 1783 - var10000 = var16 + var2; // L: 1784 - var18 = var20; // L: 1785 - var19 = var21; // L: 1786 - var9 += var12; // L: 1787 - var10 += var13; // L: 1788 - var11 += var14; // L: 1789 - var22 = var11 >> 14; // L: 1790 - if (var22 != 0) { // L: 1791 - var20 = var9 / var22; // L: 1792 - var21 = var10 / var22; // L: 1793 - if (var20 < 0) { // L: 1794 + ++var4; // L: 1796 + var10000 = var16 + var2; // L: 1797 + var18 = var20; // L: 1798 + var19 = var21; // L: 1799 + var9 += var12; // L: 1800 + var10 += var13; // L: 1801 + var11 += var14; // L: 1802 + var22 = var11 >> 14; // L: 1803 + if (var22 != 0) { // L: 1804 + var20 = var9 / var22; // L: 1805 + var21 = var10 / var22; // L: 1806 + if (var20 < 0) { // L: 1807 var20 = 0; - } else if (var20 > 16256) { // L: 1795 + } else if (var20 > 16256) { // L: 1808 var20 = 16256; } } else { - var20 = 0; // L: 1798 - var21 = 0; // L: 1799 + var20 = 0; // L: 1811 + var21 = 0; // L: 1812 } - var2 = (var18 << 18) + var19; // L: 1801 - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1802 - var7 += var8; // L: 1803 - var15 = var7 >> 8; // L: 1804 - --var17; // L: 1805 + var2 = (var18 << 18) + var19; // L: 1814 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1815 + var7 += var8; // L: 1816 + var15 = var7 >> 8; // L: 1817 + --var17; // L: 1818 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 1807 - if (var17 > 0) { // L: 1808 + var17 = var6 - var5 & 7; // L: 1820 + if (var17 > 0) { // L: 1821 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1810 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1811 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1823 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1824 } - ++var4; // L: 1813 - var2 += var16; // L: 1814 - --var17; // L: 1815 + ++var4; // L: 1826 + var2 += var16; // L: 1827 + --var17; // L: 1828 } while(var17 > 0); } } } } - } // L: 1819 + } // L: 1832 - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1822 + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1835 int var20; - if (var19 == null) { // L: 1823 - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824 - method3175(var0, var1, var2, var3, var4, var5, method3183(var20, var6), method3183(var20, var7), method3183(var20, var8)); // L: 1825 + if (var19 == null) { // L: 1836 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1837 + method3383(var0, var1, var2, var3, var4, var5, method3415(var20, var6), method3415(var20, var7), method3415(var20, var8)); // L: 1838 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828 - field1788 = Rasterizer3D_textureLoader.vmethod3432(var18); // L: 1829 - var20 = var4 - var3; // L: 1830 - int var21 = var1 - var0; // L: 1831 - int var22 = var5 - var3; // L: 1832 - int var23 = var2 - var0; // L: 1833 - int var24 = var7 - var6; // L: 1834 - int var25 = var8 - var6; // L: 1835 - int var26 = 0; // L: 1836 - if (var0 != var1) { // L: 1837 + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1841 + field1921 = Rasterizer3D_textureLoader.vmethod3790(var18); // L: 1842 + var20 = var4 - var3; // L: 1843 + int var21 = var1 - var0; // L: 1844 + int var22 = var5 - var3; // L: 1845 + int var23 = var2 - var0; // L: 1846 + int var24 = var7 - var6; // L: 1847 + int var25 = var8 - var6; // L: 1848 + int var26 = 0; // L: 1849 + if (var0 != var1) { // L: 1850 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; // L: 1838 - if (var2 != var1) { // L: 1839 + int var27 = 0; // L: 1851 + if (var2 != var1) { // L: 1852 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; // L: 1840 - if (var0 != var2) { // L: 1841 + int var28 = 0; // L: 1853 + if (var0 != var2) { // L: 1854 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; // L: 1842 - if (var29 != 0) { // L: 1843 - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1844 - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1845 - var10 = var9 - var10; // L: 1846 - var13 = var12 - var13; // L: 1847 - var16 = var15 - var16; // L: 1848 - var11 -= var9; // L: 1849 - var14 -= var12; // L: 1850 - var17 -= var15; // L: 1851 - int var32 = var11 * var12 - var9 * var14 << 14; // L: 1852 - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1853 - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1854 - int var35 = var10 * var12 - var13 * var9 << 14; // L: 1855 - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1856 - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1857 - int var38 = var13 * var11 - var10 * var14 << 14; // L: 1858 - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1859 - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1860 + int var29 = var20 * var23 - var22 * var21; // L: 1855 + if (var29 != 0) { // L: 1856 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1857 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1858 + var10 = var9 - var10; // L: 1859 + var13 = var12 - var13; // L: 1860 + var16 = var15 - var16; // L: 1861 + var11 -= var9; // L: 1862 + var14 -= var12; // L: 1863 + var17 -= var15; // L: 1864 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1865 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1866 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1867 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1868 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1869 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1870 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1871 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1872 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1873 int var41; - if (var0 <= var1 && var0 <= var2) { // L: 1861 - if (var0 < Rasterizer3D_clipHeight) { // L: 1862 - if (var1 > Rasterizer3D_clipHeight) { // L: 1863 + if (var0 <= var1 && var0 <= var2) { // L: 1874 + if (var0 < Rasterizer3D_clipHeight) { // L: 1875 + if (var1 > Rasterizer3D_clipHeight) { // L: 1876 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { // L: 1864 + if (var2 > Rasterizer3D_clipHeight) { // L: 1877 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1865 - if (var1 < var2) { // L: 1866 - var5 = var3 <<= 14; // L: 1867 - if (var0 < 0) { // L: 1868 - var5 -= var0 * var28; // L: 1869 - var3 -= var0 * var26; // L: 1870 - var6 -= var0 * var31; // L: 1871 - var0 = 0; // L: 1872 + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1878 + if (var1 < var2) { // L: 1879 + var5 = var3 <<= 14; // L: 1880 + if (var0 < 0) { // L: 1881 + var5 -= var0 * var28; // L: 1882 + var3 -= var0 * var26; // L: 1883 + var6 -= var0 * var31; // L: 1884 + var0 = 0; // L: 1885 } - var4 <<= 14; // L: 1874 - if (var1 < 0) { // L: 1875 - var4 -= var27 * var1; // L: 1876 - var1 = 0; // L: 1877 + var4 <<= 14; // L: 1887 + if (var1 < 0) { // L: 1888 + var4 -= var27 * var1; // L: 1889 + var1 = 0; // L: 1890 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1879 - var32 += var34 * var41; // L: 1880 - var35 += var37 * var41; // L: 1881 - var38 += var40 * var41; // L: 1882 - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1883 - var2 -= var1; // L: 1910 - var1 -= var0; // L: 1911 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1892 + var32 += var34 * var41; // L: 1893 + var35 += var37 * var41; // L: 1894 + var38 += var40 * var41; // L: 1895 + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1896 + var2 -= var1; // L: 1923 + var1 -= var0; // L: 1924 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1925 while (true) { - --var1; // L: 1913 + --var1; // L: 1926 if (var1 < 0) { while (true) { - --var2; // L: 1923 + --var2; // L: 1936 if (var2 < 0) { - return; // L: 1933 + return; // L: 1946 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1924 - var5 += var28; // L: 1925 - var4 += var27; // L: 1926 - var6 += var31; // L: 1927 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1928 - var32 += var34; // L: 1929 - var35 += var37; // L: 1930 - var38 += var40; // L: 1931 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1937 + var5 += var28; // L: 1938 + var4 += var27; // L: 1939 + var6 += var31; // L: 1940 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1941 + var32 += var34; // L: 1942 + var35 += var37; // L: 1943 + var38 += var40; // L: 1944 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1914 - var5 += var28; // L: 1915 - var3 += var26; // L: 1916 - var6 += var31; // L: 1917 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1918 - var32 += var34; // L: 1919 - var35 += var37; // L: 1920 - var38 += var40; // L: 1921 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1927 + var5 += var28; // L: 1928 + var3 += var26; // L: 1929 + var6 += var31; // L: 1930 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1931 + var32 += var34; // L: 1932 + var35 += var37; // L: 1933 + var38 += var40; // L: 1934 } } else { - var2 -= var1; // L: 1884 - var1 -= var0; // L: 1885 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 + var2 -= var1; // L: 1897 + var1 -= var0; // L: 1898 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1899 while (true) { - --var1; // L: 1887 + --var1; // L: 1900 if (var1 < 0) { while (true) { - --var2; // L: 1897 + --var2; // L: 1910 if (var2 < 0) { - return; // L: 1907 + return; // L: 1920 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 - var5 += var28; // L: 1899 - var4 += var27; // L: 1900 - var6 += var31; // L: 1901 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 - var32 += var34; // L: 1903 - var35 += var37; // L: 1904 - var38 += var40; // L: 1905 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1911 + var5 += var28; // L: 1912 + var4 += var27; // L: 1913 + var6 += var31; // L: 1914 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1915 + var32 += var34; // L: 1916 + var35 += var37; // L: 1917 + var38 += var40; // L: 1918 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 - var5 += var28; // L: 1889 - var3 += var26; // L: 1890 - var6 += var31; // L: 1891 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 - var32 += var34; // L: 1893 - var35 += var37; // L: 1894 - var38 += var40; // L: 1895 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1901 + var5 += var28; // L: 1902 + var3 += var26; // L: 1903 + var6 += var31; // L: 1904 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1905 + var32 += var34; // L: 1906 + var35 += var37; // L: 1907 + var38 += var40; // L: 1908 } } } else { - var4 = var3 <<= 14; // L: 1937 - if (var0 < 0) { // L: 1938 - var4 -= var0 * var28; // L: 1939 - var3 -= var0 * var26; // L: 1940 - var6 -= var0 * var31; // L: 1941 - var0 = 0; // L: 1942 + var4 = var3 <<= 14; // L: 1950 + if (var0 < 0) { // L: 1951 + var4 -= var0 * var28; // L: 1952 + var3 -= var0 * var26; // L: 1953 + var6 -= var0 * var31; // L: 1954 + var0 = 0; // L: 1955 } - var5 <<= 14; // L: 1944 - if (var2 < 0) { // L: 1945 - var5 -= var27 * var2; // L: 1946 - var2 = 0; // L: 1947 + var5 <<= 14; // L: 1957 + if (var2 < 0) { // L: 1958 + var5 -= var27 * var2; // L: 1959 + var2 = 0; // L: 1960 } - var41 = var0 - Rasterizer3D_clipMidY; // L: 1949 - var32 += var34 * var41; // L: 1950 - var35 += var37 * var41; // L: 1951 - var38 += var40 * var41; // L: 1952 - if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1953 - var1 -= var2; // L: 1980 - var2 -= var0; // L: 1981 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982 + var41 = var0 - Rasterizer3D_clipMidY; // L: 1962 + var32 += var34 * var41; // L: 1963 + var35 += var37 * var41; // L: 1964 + var38 += var40 * var41; // L: 1965 + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1966 + var1 -= var2; // L: 1967 + var2 -= var0; // L: 1968 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1969 while (true) { - --var2; // L: 1983 + --var2; // L: 1970 if (var2 < 0) { while (true) { - --var1; // L: 1993 + --var1; // L: 1980 if (var1 < 0) { - return; // L: 2003 + return; // L: 1990 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1994 - var5 += var27; // L: 1995 - var3 += var26; // L: 1996 - var6 += var31; // L: 1997 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1998 - var32 += var34; // L: 1999 - var35 += var37; // L: 2000 - var38 += var40; // L: 2001 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1981 + var5 += var27; // L: 1982 + var3 += var26; // L: 1983 + var6 += var31; // L: 1984 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1985 + var32 += var34; // L: 1986 + var35 += var37; // L: 1987 + var38 += var40; // L: 1988 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1984 - var4 += var28; // L: 1985 - var3 += var26; // L: 1986 - var6 += var31; // L: 1987 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1988 - var32 += var34; // L: 1989 - var35 += var37; // L: 1990 - var38 += var40; // L: 1991 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1971 + var4 += var28; // L: 1972 + var3 += var26; // L: 1973 + var6 += var31; // L: 1974 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1975 + var32 += var34; // L: 1976 + var35 += var37; // L: 1977 + var38 += var40; // L: 1978 } } else { - var1 -= var2; // L: 1954 - var2 -= var0; // L: 1955 - var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 + var1 -= var2; // L: 1993 + var2 -= var0; // L: 1994 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1995 while (true) { - --var2; // L: 1957 + --var2; // L: 1996 if (var2 < 0) { while (true) { - --var1; // L: 1967 + --var1; // L: 2006 if (var1 < 0) { - return; // L: 1977 + return; // L: 2016 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 - var5 += var27; // L: 1969 - var3 += var26; // L: 1970 - var6 += var31; // L: 1971 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 - var32 += var34; // L: 1973 - var35 += var37; // L: 1974 - var38 += var40; // L: 1975 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 2007 + var5 += var27; // L: 2008 + var3 += var26; // L: 2009 + var6 += var31; // L: 2010 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2011 + var32 += var34; // L: 2012 + var35 += var37; // L: 2013 + var38 += var40; // L: 2014 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 - var4 += var28; // L: 1959 - var3 += var26; // L: 1960 - var6 += var31; // L: 1961 - var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 - var32 += var34; // L: 1963 - var35 += var37; // L: 1964 - var38 += var40; // L: 1965 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1997 + var4 += var28; // L: 1998 + var3 += var26; // L: 1999 + var6 += var31; // L: 2000 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 2001 + var32 += var34; // L: 2002 + var35 += var37; // L: 2003 + var38 += var40; // L: 2004 } } } } - } else if (var1 <= var2) { // L: 2007 - if (var1 < Rasterizer3D_clipHeight) { // L: 2008 - if (var2 > Rasterizer3D_clipHeight) { // L: 2009 + } else if (var1 <= var2) { // L: 2020 + if (var1 < Rasterizer3D_clipHeight) { // L: 2021 + if (var2 > Rasterizer3D_clipHeight) { // L: 2022 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { // L: 2010 + if (var0 > Rasterizer3D_clipHeight) { // L: 2023 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2011 - if (var2 < var0) { // L: 2012 - var3 = var4 <<= 14; // L: 2013 - if (var1 < 0) { // L: 2014 - var3 -= var26 * var1; // L: 2015 - var4 -= var27 * var1; // L: 2016 - var7 -= var31 * var1; // L: 2017 - var1 = 0; // L: 2018 + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2024 + if (var2 < var0) { // L: 2025 + var3 = var4 <<= 14; // L: 2026 + if (var1 < 0) { // L: 2027 + var3 -= var26 * var1; // L: 2028 + var4 -= var27 * var1; // L: 2029 + var7 -= var31 * var1; // L: 2030 + var1 = 0; // L: 2031 } - var5 <<= 14; // L: 2020 - if (var2 < 0) { // L: 2021 - var5 -= var28 * var2; // L: 2022 - var2 = 0; // L: 2023 + var5 <<= 14; // L: 2033 + if (var2 < 0) { // L: 2034 + var5 -= var28 * var2; // L: 2035 + var2 = 0; // L: 2036 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2025 - var32 += var34 * var41; // L: 2026 - var35 += var37 * var41; // L: 2027 - var38 += var40 * var41; // L: 2028 - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2029 - var0 -= var2; // L: 2030 - var2 -= var1; // L: 2031 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032 + var41 = var1 - Rasterizer3D_clipMidY; // L: 2038 + var32 += var34 * var41; // L: 2039 + var35 += var37 * var41; // L: 2040 + var38 += var40 * var41; // L: 2041 + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2042 + var0 -= var2; // L: 2069 + var2 -= var1; // L: 2070 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2071 while (true) { - --var2; // L: 2033 + --var2; // L: 2072 if (var2 < 0) { while (true) { - --var0; // L: 2043 + --var0; // L: 2082 if (var0 < 0) { - return; // L: 2053 + return; // L: 2092 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2044 - var3 += var26; // L: 2045 - var5 += var28; // L: 2046 - var7 += var31; // L: 2047 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2048 - var32 += var34; // L: 2049 - var35 += var37; // L: 2050 - var38 += var40; // L: 2051 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2083 + var3 += var26; // L: 2084 + var5 += var28; // L: 2085 + var7 += var31; // L: 2086 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2087 + var32 += var34; // L: 2088 + var35 += var37; // L: 2089 + var38 += var40; // L: 2090 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2034 - var3 += var26; // L: 2035 - var4 += var27; // L: 2036 - var7 += var31; // L: 2037 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2038 - var32 += var34; // L: 2039 - var35 += var37; // L: 2040 - var38 += var40; // L: 2041 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2073 + var3 += var26; // L: 2074 + var4 += var27; // L: 2075 + var7 += var31; // L: 2076 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2077 + var32 += var34; // L: 2078 + var35 += var37; // L: 2079 + var38 += var40; // L: 2080 } } else { - var0 -= var2; // L: 2056 - var2 -= var1; // L: 2057 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 + var0 -= var2; // L: 2043 + var2 -= var1; // L: 2044 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2045 while (true) { - --var2; // L: 2059 + --var2; // L: 2046 if (var2 < 0) { while (true) { - --var0; // L: 2069 + --var0; // L: 2056 if (var0 < 0) { - return; // L: 2079 + return; // L: 2066 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 - var3 += var26; // L: 2071 - var5 += var28; // L: 2072 - var7 += var31; // L: 2073 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 - var32 += var34; // L: 2075 - var35 += var37; // L: 2076 - var38 += var40; // L: 2077 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2057 + var3 += var26; // L: 2058 + var5 += var28; // L: 2059 + var7 += var31; // L: 2060 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2061 + var32 += var34; // L: 2062 + var35 += var37; // L: 2063 + var38 += var40; // L: 2064 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 - var3 += var26; // L: 2061 - var4 += var27; // L: 2062 - var7 += var31; // L: 2063 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 - var32 += var34; // L: 2065 - var35 += var37; // L: 2066 - var38 += var40; // L: 2067 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2047 + var3 += var26; // L: 2048 + var4 += var27; // L: 2049 + var7 += var31; // L: 2050 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2051 + var32 += var34; // L: 2052 + var35 += var37; // L: 2053 + var38 += var40; // L: 2054 } } } else { - var5 = var4 <<= 14; // L: 2083 - if (var1 < 0) { // L: 2084 - var5 -= var26 * var1; // L: 2085 - var4 -= var27 * var1; // L: 2086 - var7 -= var31 * var1; // L: 2087 - var1 = 0; // L: 2088 + var5 = var4 <<= 14; // L: 2096 + if (var1 < 0) { // L: 2097 + var5 -= var26 * var1; // L: 2098 + var4 -= var27 * var1; // L: 2099 + var7 -= var31 * var1; // L: 2100 + var1 = 0; // L: 2101 } - var3 <<= 14; // L: 2090 - if (var0 < 0) { // L: 2091 - var3 -= var0 * var28; // L: 2092 - var0 = 0; // L: 2093 + var3 <<= 14; // L: 2103 + if (var0 < 0) { // L: 2104 + var3 -= var0 * var28; // L: 2105 + var0 = 0; // L: 2106 } - var41 = var1 - Rasterizer3D_clipMidY; // L: 2095 - var32 += var34 * var41; // L: 2096 - var35 += var37 * var41; // L: 2097 - var38 += var40 * var41; // L: 2098 - if (var26 < var27) { // L: 2099 - var2 -= var0; // L: 2100 - var0 -= var1; // L: 2101 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2102 + var41 = var1 - Rasterizer3D_clipMidY; // L: 2108 + var32 += var34 * var41; // L: 2109 + var35 += var37 * var41; // L: 2110 + var38 += var40 * var41; // L: 2111 + if (var26 < var27) { // L: 2112 + var2 -= var0; // L: 2113 + var0 -= var1; // L: 2114 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2115 while (true) { - --var0; // L: 2103 + --var0; // L: 2116 if (var0 < 0) { while (true) { - --var2; // L: 2113 + --var2; // L: 2126 if (var2 < 0) { - return; // L: 2123 + return; // L: 2136 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2114 - var3 += var28; // L: 2115 - var4 += var27; // L: 2116 - var7 += var31; // L: 2117 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2118 - var32 += var34; // L: 2119 - var35 += var37; // L: 2120 - var38 += var40; // L: 2121 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2127 + var3 += var28; // L: 2128 + var4 += var27; // L: 2129 + var7 += var31; // L: 2130 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2131 + var32 += var34; // L: 2132 + var35 += var37; // L: 2133 + var38 += var40; // L: 2134 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2104 - var5 += var26; // L: 2105 - var4 += var27; // L: 2106 - var7 += var31; // L: 2107 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2108 - var32 += var34; // L: 2109 - var35 += var37; // L: 2110 - var38 += var40; // L: 2111 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2117 + var5 += var26; // L: 2118 + var4 += var27; // L: 2119 + var7 += var31; // L: 2120 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2121 + var32 += var34; // L: 2122 + var35 += var37; // L: 2123 + var38 += var40; // L: 2124 } } else { - var2 -= var0; // L: 2126 - var0 -= var1; // L: 2127 - var1 = Rasterizer3D_rowOffsets[var1]; // L: 2128 + var2 -= var0; // L: 2139 + var0 -= var1; // L: 2140 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2141 while (true) { - --var0; // L: 2129 + --var0; // L: 2142 if (var0 < 0) { while (true) { - --var2; // L: 2139 + --var2; // L: 2152 if (var2 < 0) { - return; // L: 2149 + return; // L: 2162 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2140 - var3 += var28; // L: 2141 - var4 += var27; // L: 2142 - var7 += var31; // L: 2143 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2144 - var32 += var34; // L: 2145 - var35 += var37; // L: 2146 - var38 += var40; // L: 2147 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2153 + var3 += var28; // L: 2154 + var4 += var27; // L: 2155 + var7 += var31; // L: 2156 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2157 + var32 += var34; // L: 2158 + var35 += var37; // L: 2159 + var38 += var40; // L: 2160 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2130 - var5 += var26; // L: 2131 - var4 += var27; // L: 2132 - var7 += var31; // L: 2133 - var1 += Rasterizer2D.Rasterizer2D_width; // L: 2134 - var32 += var34; // L: 2135 - var35 += var37; // L: 2136 - var38 += var40; // L: 2137 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2143 + var5 += var26; // L: 2144 + var4 += var27; // L: 2145 + var7 += var31; // L: 2146 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2147 + var32 += var34; // L: 2148 + var35 += var37; // L: 2149 + var38 += var40; // L: 2150 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { // L: 2154 - if (var0 > Rasterizer3D_clipHeight) { // L: 2155 + } else if (var2 < Rasterizer3D_clipHeight) { // L: 2167 + if (var0 > Rasterizer3D_clipHeight) { // L: 2168 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { // L: 2156 + if (var1 > Rasterizer3D_clipHeight) { // L: 2169 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; // L: 2157 - if (var0 < var1) { // L: 2158 - var4 = var5 <<= 14; // L: 2159 - if (var2 < 0) { // L: 2160 - var4 -= var27 * var2; // L: 2161 - var5 -= var28 * var2; // L: 2162 - var8 -= var31 * var2; // L: 2163 - var2 = 0; // L: 2164 + var8 = (var8 << 9) - var5 * var30 + var30; // L: 2170 + if (var0 < var1) { // L: 2171 + var4 = var5 <<= 14; // L: 2172 + if (var2 < 0) { // L: 2173 + var4 -= var27 * var2; // L: 2174 + var5 -= var28 * var2; // L: 2175 + var8 -= var31 * var2; // L: 2176 + var2 = 0; // L: 2177 } - var3 <<= 14; // L: 2166 - if (var0 < 0) { // L: 2167 - var3 -= var0 * var26; // L: 2168 - var0 = 0; // L: 2169 + var3 <<= 14; // L: 2179 + if (var0 < 0) { // L: 2180 + var3 -= var0 * var26; // L: 2181 + var0 = 0; // L: 2182 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2171 - var32 += var34 * var41; // L: 2172 - var35 += var37 * var41; // L: 2173 - var38 += var40 * var41; // L: 2174 - if (var27 < var28) { // L: 2175 - var1 -= var0; // L: 2176 - var0 -= var2; // L: 2177 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2178 + var41 = var2 - Rasterizer3D_clipMidY; // L: 2184 + var32 += var34 * var41; // L: 2185 + var35 += var37 * var41; // L: 2186 + var38 += var40 * var41; // L: 2187 + if (var27 < var28) { // L: 2188 + var1 -= var0; // L: 2189 + var0 -= var2; // L: 2190 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2191 while (true) { - --var0; // L: 2179 + --var0; // L: 2192 if (var0 < 0) { while (true) { - --var1; // L: 2189 + --var1; // L: 2202 if (var1 < 0) { - return; // L: 2199 + return; // L: 2212 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2190 - var4 += var27; // L: 2191 - var3 += var26; // L: 2192 - var8 += var31; // L: 2193 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2194 - var32 += var34; // L: 2195 - var35 += var37; // L: 2196 - var38 += var40; // L: 2197 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2203 + var4 += var27; // L: 2204 + var3 += var26; // L: 2205 + var8 += var31; // L: 2206 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2207 + var32 += var34; // L: 2208 + var35 += var37; // L: 2209 + var38 += var40; // L: 2210 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2180 - var4 += var27; // L: 2181 - var5 += var28; // L: 2182 - var8 += var31; // L: 2183 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2184 - var32 += var34; // L: 2185 - var35 += var37; // L: 2186 - var38 += var40; // L: 2187 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2193 + var4 += var27; // L: 2194 + var5 += var28; // L: 2195 + var8 += var31; // L: 2196 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2197 + var32 += var34; // L: 2198 + var35 += var37; // L: 2199 + var38 += var40; // L: 2200 } } else { - var1 -= var0; // L: 2202 - var0 -= var2; // L: 2203 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2204 + var1 -= var0; // L: 2215 + var0 -= var2; // L: 2216 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2217 while (true) { - --var0; // L: 2205 + --var0; // L: 2218 if (var0 < 0) { while (true) { - --var1; // L: 2215 + --var1; // L: 2228 if (var1 < 0) { - return; // L: 2225 + return; // L: 2238 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2216 - var4 += var27; // L: 2217 - var3 += var26; // L: 2218 - var8 += var31; // L: 2219 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2220 - var32 += var34; // L: 2221 - var35 += var37; // L: 2222 - var38 += var40; // L: 2223 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2229 + var4 += var27; // L: 2230 + var3 += var26; // L: 2231 + var8 += var31; // L: 2232 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2233 + var32 += var34; // L: 2234 + var35 += var37; // L: 2235 + var38 += var40; // L: 2236 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2206 - var4 += var27; // L: 2207 - var5 += var28; // L: 2208 - var8 += var31; // L: 2209 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2210 - var32 += var34; // L: 2211 - var35 += var37; // L: 2212 - var38 += var40; // L: 2213 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2219 + var4 += var27; // L: 2220 + var5 += var28; // L: 2221 + var8 += var31; // L: 2222 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2223 + var32 += var34; // L: 2224 + var35 += var37; // L: 2225 + var38 += var40; // L: 2226 } } } else { - var3 = var5 <<= 14; // L: 2229 - if (var2 < 0) { // L: 2230 - var3 -= var27 * var2; // L: 2231 - var5 -= var28 * var2; // L: 2232 - var8 -= var31 * var2; // L: 2233 - var2 = 0; // L: 2234 + var3 = var5 <<= 14; // L: 2242 + if (var2 < 0) { // L: 2243 + var3 -= var27 * var2; // L: 2244 + var5 -= var28 * var2; // L: 2245 + var8 -= var31 * var2; // L: 2246 + var2 = 0; // L: 2247 } - var4 <<= 14; // L: 2236 - if (var1 < 0) { // L: 2237 - var4 -= var26 * var1; // L: 2238 - var1 = 0; // L: 2239 + var4 <<= 14; // L: 2249 + if (var1 < 0) { // L: 2250 + var4 -= var26 * var1; // L: 2251 + var1 = 0; // L: 2252 } - var41 = var2 - Rasterizer3D_clipMidY; // L: 2241 - var32 += var34 * var41; // L: 2242 - var35 += var37 * var41; // L: 2243 - var38 += var40 * var41; // L: 2244 - if (var27 < var28) { // L: 2245 - var0 -= var1; // L: 2246 - var1 -= var2; // L: 2247 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2248 + var41 = var2 - Rasterizer3D_clipMidY; // L: 2254 + var32 += var34 * var41; // L: 2255 + var35 += var37 * var41; // L: 2256 + var38 += var40 * var41; // L: 2257 + if (var27 < var28) { // L: 2258 + var0 -= var1; // L: 2259 + var1 -= var2; // L: 2260 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2261 while (true) { - --var1; // L: 2249 + --var1; // L: 2262 if (var1 < 0) { while (true) { - --var0; // L: 2259 + --var0; // L: 2272 if (var0 < 0) { - return; // L: 2269 + return; // L: 2282 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2260 - var4 += var26; // L: 2261 - var5 += var28; // L: 2262 - var8 += var31; // L: 2263 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2264 - var32 += var34; // L: 2265 - var35 += var37; // L: 2266 - var38 += var40; // L: 2267 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2273 + var4 += var26; // L: 2274 + var5 += var28; // L: 2275 + var8 += var31; // L: 2276 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2277 + var32 += var34; // L: 2278 + var35 += var37; // L: 2279 + var38 += var40; // L: 2280 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2250 - var3 += var27; // L: 2251 - var5 += var28; // L: 2252 - var8 += var31; // L: 2253 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2254 - var32 += var34; // L: 2255 - var35 += var37; // L: 2256 - var38 += var40; // L: 2257 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2263 + var3 += var27; // L: 2264 + var5 += var28; // L: 2265 + var8 += var31; // L: 2266 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2267 + var32 += var34; // L: 2268 + var35 += var37; // L: 2269 + var38 += var40; // L: 2270 } } else { - var0 -= var1; // L: 2272 - var1 -= var2; // L: 2273 - var2 = Rasterizer3D_rowOffsets[var2]; // L: 2274 + var0 -= var1; // L: 2285 + var1 -= var2; // L: 2286 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2287 while (true) { - --var1; // L: 2275 + --var1; // L: 2288 if (var1 < 0) { while (true) { - --var0; // L: 2285 + --var0; // L: 2298 if (var0 < 0) { - return; // L: 2295 + return; // L: 2308 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2286 - var4 += var26; // L: 2287 - var5 += var28; // L: 2288 - var8 += var31; // L: 2289 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2290 - var32 += var34; // L: 2291 - var35 += var37; // L: 2292 - var38 += var40; // L: 2293 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2299 + var4 += var26; // L: 2300 + var5 += var28; // L: 2301 + var8 += var31; // L: 2302 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2303 + var32 += var34; // L: 2304 + var35 += var37; // L: 2305 + var38 += var40; // L: 2306 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2276 - var3 += var27; // L: 2277 - var5 += var28; // L: 2278 - var8 += var31; // L: 2279 - var2 += Rasterizer2D.Rasterizer2D_width; // L: 2280 - var32 += var34; // L: 2281 - var35 += var37; // L: 2282 - var38 += var40; // L: 2283 + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2289 + var3 += var27; // L: 2290 + var5 += var28; // L: 2291 + var8 += var31; // L: 2292 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2293 + var32 += var34; // L: 2294 + var35 += var37; // L: 2295 + var38 += var40; // L: 2296 } } } } } } - } // L: 1826 + } // L: 1839 - @ObfuscatedName("x") + @ObfuscatedName("q") @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 (field1775) { // L: 2304 - if (var6 > Rasterizer3D_clipWidth) { // L: 2305 + if (field1899) { // L: 2317 + if (var6 > Rasterizer3D_clipWidth) { // L: 2318 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { // L: 2306 + if (var5 < 0) { // L: 2319 var5 = 0; } } - if (var5 < var6) { // L: 2308 - var4 += var5; // L: 2309 - var7 += var5 * var8; // L: 2310 - int var17 = var6 - var5; // L: 2311 + if (var5 < var6) { // L: 2321 + var4 += var5; // L: 2322 + var7 += var5 * var8; // L: 2323 + int var17 = var6 - var5; // L: 2324 int var15; int var16; int var18; @@ -3110,336 +3120,336 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { // L: 2312 - var23 = var5 - Rasterizer3D_clipMidX; // L: 2319 - var9 += var23 * var12; // L: 2320 - var10 += var13 * var23; // L: 2321 - var11 += var23 * var14; // L: 2322 - var22 = var11 >> 12; // L: 2323 - if (var22 != 0) { // L: 2324 - var18 = var9 / var22; // L: 2325 - var19 = var10 / var22; // L: 2326 + if (Rasterizer3D_isLowDetailTexture) { // L: 2325 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2332 + var9 += var23 * var12; // L: 2333 + var10 += var13 * var23; // L: 2334 + var11 += var23 * var14; // L: 2335 + var22 = var11 >> 12; // L: 2336 + if (var22 != 0) { // L: 2337 + var18 = var9 / var22; // L: 2338 + var19 = var10 / var22; // L: 2339 } else { - var18 = 0; // L: 2329 - var19 = 0; // L: 2330 + var18 = 0; // L: 2342 + var19 = 0; // L: 2343 } - var9 += var17 * var12; // L: 2332 - var10 += var13 * var17; // L: 2333 - var11 += var17 * var14; // L: 2334 - var22 = var11 >> 12; // L: 2335 - if (var22 != 0) { // L: 2336 - var20 = var9 / var22; // L: 2337 - var21 = var10 / var22; // L: 2338 + var9 += var17 * var12; // L: 2345 + var10 += var13 * var17; // L: 2346 + var11 += var17 * var14; // L: 2347 + var22 = var11 >> 12; // L: 2348 + if (var22 != 0) { // L: 2349 + var20 = var9 / var22; // L: 2350 + var21 = var10 / var22; // L: 2351 } else { - var20 = 0; // L: 2341 - var21 = 0; // L: 2342 + var20 = 0; // L: 2354 + var21 = 0; // L: 2355 } - var2 = (var18 << 20) + var19; // L: 2344 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2345 - var17 >>= 3; // L: 2346 - var8 <<= 3; // L: 2347 - var15 = var7 >> 8; // L: 2348 - if (field1788) { // L: 2350 - if (var17 > 0) { // L: 2351 - do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2353 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2354 - var2 += var16; // L: 2355 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2356 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2357 - var2 += var16; // L: 2358 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2359 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2360 - var2 += var16; // L: 2361 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2362 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2363 - var2 += var16; // L: 2364 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2365 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2366 - var2 += var16; // L: 2367 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2368 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2369 - var2 += var16; // L: 2370 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2371 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2372 - var2 += var16; // L: 2373 - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2374 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2375 - var2 += var16; // L: 2376 - var7 += var8; // L: 2377 - var15 = var7 >> 8; // L: 2378 - --var17; // L: 2379 - } while(var17 > 0); - } - - var17 = var6 - var5 & 7; // L: 2381 - if (var17 > 0) { // L: 2382 + var2 = (var18 << 20) + var19; // L: 2357 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2358 + var17 >>= 3; // L: 2359 + var8 <<= 3; // L: 2360 + var15 = var7 >> 8; // L: 2361 + if (field1921) { // L: 2363 + if (var17 > 0) { // L: 2364 do { + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2366 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2367 + var2 += var16; // L: 2368 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2369 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2370 + var2 += var16; // L: 2371 + 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 - --var17; // L: 2387 + 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 + var7 += var8; // L: 2390 + var15 = var7 >> 8; // L: 2391 + --var17; // L: 2392 + } while(var17 > 0); + } + + var17 = var6 - var5 & 7; // L: 2394 + if (var17 > 0) { // L: 2395 + do { + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2397 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2398 + var2 += var16; // L: 2399 + --var17; // L: 2400 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2391 + if (var17 > 0) { // L: 2404 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2393 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2394 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2406 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2407 } - ++var4; // L: 2396 - var2 += var16; // L: 2397 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2398 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2399 + ++var4; // L: 2409 + var2 += var16; // L: 2410 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2411 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2412 } - ++var4; // L: 2401 - var2 += var16; // L: 2402 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2403 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2404 + ++var4; // L: 2414 + var2 += var16; // L: 2415 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2416 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2417 } - ++var4; // L: 2406 - var2 += var16; // L: 2407 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2408 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2409 + ++var4; // L: 2419 + var2 += var16; // L: 2420 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2421 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2422 } - ++var4; // L: 2411 - var2 += var16; // L: 2412 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2413 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2414 + ++var4; // L: 2424 + var2 += var16; // L: 2425 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2426 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2427 } - ++var4; // L: 2416 - var2 += var16; // L: 2417 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2418 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2419 + ++var4; // L: 2429 + var2 += var16; // L: 2430 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2431 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2432 } - ++var4; // L: 2421 - var2 += var16; // L: 2422 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2423 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2424 + ++var4; // L: 2434 + var2 += var16; // L: 2435 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2436 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2437 } - ++var4; // L: 2426 - var2 += var16; // L: 2427 - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2428 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2429 + ++var4; // L: 2439 + var2 += var16; // L: 2440 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2441 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2442 } - ++var4; // L: 2431 - var2 += var16; // L: 2432 - var7 += var8; // L: 2433 - var15 = var7 >> 8; // L: 2434 - --var17; // L: 2435 + ++var4; // L: 2444 + var2 += var16; // L: 2445 + var7 += var8; // L: 2446 + var15 = var7 >> 8; // L: 2447 + --var17; // L: 2448 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2437 - if (var17 > 0) { // L: 2438 + var17 = var6 - var5 & 7; // L: 2450 + if (var17 > 0) { // L: 2451 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2440 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2441 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2453 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2454 } - ++var4; // L: 2443 - var2 += var16; // L: 2444 - --var17; // L: 2445 + ++var4; // L: 2456 + var2 += var16; // L: 2457 + --var17; // L: 2458 } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; // L: 2456 - var9 += var23 * var12; // L: 2457 - var10 += var13 * var23; // L: 2458 - var11 += var23 * var14; // L: 2459 - var22 = var11 >> 14; // L: 2460 - if (var22 != 0) { // L: 2461 - var18 = var9 / var22; // L: 2462 - var19 = var10 / var22; // L: 2463 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2469 + var9 += var23 * var12; // L: 2470 + var10 += var13 * var23; // L: 2471 + var11 += var23 * var14; // L: 2472 + var22 = var11 >> 14; // L: 2473 + if (var22 != 0) { // L: 2474 + var18 = var9 / var22; // L: 2475 + var19 = var10 / var22; // L: 2476 } else { - var18 = 0; // L: 2466 - var19 = 0; // L: 2467 + var18 = 0; // L: 2479 + var19 = 0; // L: 2480 } - var9 += var17 * var12; // L: 2469 - var10 += var13 * var17; // L: 2470 - var11 += var17 * var14; // L: 2471 - var22 = var11 >> 14; // L: 2472 - if (var22 != 0) { // L: 2473 - var20 = var9 / var22; // L: 2474 - var21 = var10 / var22; // L: 2475 + var9 += var17 * var12; // L: 2482 + var10 += var13 * var17; // L: 2483 + var11 += var17 * var14; // L: 2484 + var22 = var11 >> 14; // L: 2485 + if (var22 != 0) { // L: 2486 + var20 = var9 / var22; // L: 2487 + var21 = var10 / var22; // L: 2488 } else { - var20 = 0; // L: 2478 - var21 = 0; // L: 2479 + var20 = 0; // L: 2491 + var21 = 0; // L: 2492 } - var2 = (var18 << 18) + var19; // L: 2481 - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2482 - var17 >>= 3; // L: 2483 - var8 <<= 3; // L: 2484 - var15 = var7 >> 8; // L: 2485 - if (field1788) { // L: 2487 - if (var17 > 0) { // L: 2488 - do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2490 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2491 - var2 += var16; // L: 2492 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2493 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2494 - var2 += var16; // L: 2495 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2496 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2497 - var2 += var16; // L: 2498 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2499 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2500 - var2 += var16; // L: 2501 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2502 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2503 - var2 += var16; // L: 2504 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2505 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2506 - var2 += var16; // L: 2507 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2508 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2509 - var2 += var16; // L: 2510 - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2511 - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2512 - var2 += var16; // L: 2513 - var7 += var8; // L: 2514 - var15 = var7 >> 8; // L: 2515 - --var17; // L: 2516 - } while(var17 > 0); - } - - var17 = var6 - var5 & 7; // L: 2518 - if (var17 > 0) { // L: 2519 + var2 = (var18 << 18) + var19; // L: 2494 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2495 + var17 >>= 3; // L: 2496 + var8 <<= 3; // L: 2497 + var15 = var7 >> 8; // L: 2498 + if (field1921) { // L: 2500 + if (var17 > 0) { // L: 2501 do { + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2503 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2504 + var2 += var16; // L: 2505 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2506 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2507 + var2 += var16; // L: 2508 + 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 - --var17; // L: 2524 + 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 + var7 += var8; // L: 2527 + var15 = var7 >> 8; // L: 2528 + --var17; // L: 2529 + } while(var17 > 0); + } + + var17 = var6 - var5 & 7; // L: 2531 + if (var17 > 0) { // L: 2532 + do { + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2534 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2535 + var2 += var16; // L: 2536 + --var17; // L: 2537 } while(var17 > 0); } } else { - if (var17 > 0) { // L: 2528 + if (var17 > 0) { // L: 2541 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2530 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2531 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2543 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2544 } - ++var4; // L: 2533 - var2 += var16; // L: 2534 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2535 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2536 + ++var4; // L: 2546 + var2 += var16; // L: 2547 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2548 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2549 } - ++var4; // L: 2538 - var2 += var16; // L: 2539 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2540 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2541 + ++var4; // L: 2551 + var2 += var16; // L: 2552 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2553 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2554 } - ++var4; // L: 2543 - var2 += var16; // L: 2544 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2545 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2546 + ++var4; // L: 2556 + var2 += var16; // L: 2557 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2558 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2559 } - ++var4; // L: 2548 - var2 += var16; // L: 2549 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2550 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2551 + ++var4; // L: 2561 + var2 += var16; // L: 2562 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2563 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2564 } - ++var4; // L: 2553 - var2 += var16; // L: 2554 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2555 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2556 + ++var4; // L: 2566 + var2 += var16; // L: 2567 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2568 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2569 } - ++var4; // L: 2558 - var2 += var16; // L: 2559 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2560 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2561 + ++var4; // L: 2571 + var2 += var16; // L: 2572 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2573 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2574 } - ++var4; // L: 2563 - var2 += var16; // L: 2564 - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2565 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2566 + ++var4; // L: 2576 + var2 += var16; // L: 2577 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2578 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2579 } - ++var4; // L: 2568 - var2 += var16; // L: 2569 - var7 += var8; // L: 2570 - var15 = var7 >> 8; // L: 2571 - --var17; // L: 2572 + ++var4; // L: 2581 + var2 += var16; // L: 2582 + var7 += var8; // L: 2583 + var15 = var7 >> 8; // L: 2584 + --var17; // L: 2585 } while(var17 > 0); } - var17 = var6 - var5 & 7; // L: 2574 - if (var17 > 0) { // L: 2575 + var17 = var6 - var5 & 7; // L: 2587 + if (var17 > 0) { // L: 2588 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2577 - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2578 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2590 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2591 } - ++var4; // L: 2580 - var2 += var16; // L: 2581 - --var17; // L: 2582 + ++var4; // L: 2593 + var2 += var16; // L: 2594 + --var17; // L: 2595 } while(var17 > 0); } } } } - } // L: 2586 + } // L: 2599 - @ObfuscatedName("g") - static final int method3183(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 2589 - if (var1 < 2) { // L: 2590 + @ObfuscatedName("t") + static final int method3415(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 2602 + if (var1 < 2) { // L: 2603 var1 = 2; - } else if (var1 > 126) { // L: 2591 + } else if (var1 > 126) { // L: 2604 var1 = 126; } - return (var0 & 65408) + var1; // L: 2592 + return (var0 & 65408) + var1; // L: 2605 } - @ObfuscatedName("u") - static final int method3233(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2596 + @ObfuscatedName("v") + static final int method3377(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2609 } - @ObfuscatedName("t") - static final int method3185(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2600 + @ObfuscatedName("x") + static final int method3378(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2613 } - @ObfuscatedName("p") - static final int method3186(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; // L: 2604 + @ObfuscatedName("z") + static final int method3379(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; // L: 2617 } - @ObfuscatedName("o") - static final int method3187(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; // L: 2608 + @ObfuscatedName("i") + static final int method3380(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; // L: 2621 } - @ObfuscatedName("ay") - static final int method3188(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; // L: 2612 + @ObfuscatedName("a") + static final int method3400(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2625 } - @ObfuscatedName("am") - static final int method3189(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; // L: 2616 + @ObfuscatedName("w") + static final int method3367(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2629 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 0e0fe6bfa3..05b26cba02 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,107 +3,107 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("bk") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("n") - int field1496; - @ObfuscatedName("v") - int field1484; - @ObfuscatedName("d") - int field1485; - @ObfuscatedName("c") - int field1486; - @ObfuscatedName("y") - int field1487; - @ObfuscatedName("h") - int field1488; - @ObfuscatedName("z") - int field1495; + @ObfuscatedName("f") + int field444; + @ObfuscatedName("o") + int field443; + @ObfuscatedName("u") + int field440; + @ObfuscatedName("p") + int field441; + @ObfuscatedName("b") + int field442; @ObfuscatedName("e") + int field451; + @ObfuscatedName("k") + int field448; + @ObfuscatedName("g") @Export("numLoops") int numLoops; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("start") int start; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("end") int end; - @ObfuscatedName("s") - boolean field1493; - @ObfuscatedName("b") - int field1483; - @ObfuscatedName("a") - int field1494; - @ObfuscatedName("k") - int field1489; - @ObfuscatedName("i") - int field1497; + @ObfuscatedName("l") + boolean field439; + @ObfuscatedName("m") + int field447; + @ObfuscatedName("d") + int field450; + @ObfuscatedName("c") + int field438; + @ObfuscatedName("j") + int field452; @ObfuscatedSignature( - descriptor = "(Ldm;III)V" + descriptor = "(Lah;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; // L: 51 this.start = var1.start; // L: 52 this.end = var1.end; // L: 53 - this.field1493 = var1.field1404; // L: 54 - this.field1484 = var2; // L: 55 - this.field1485 = var3; // L: 56 - this.field1486 = var4; // L: 57 - this.field1496 = 0; // L: 58 - this.method2714(); // L: 59 + this.field439 = var1.field370; // L: 54 + this.field443 = var2; // L: 55 + this.field440 = var3; // L: 56 + this.field441 = var4; // L: 57 + this.field444 = 0; // L: 58 + this.method899(); // L: 59 } // L: 60 @ObfuscatedSignature( - descriptor = "(Ldm;II)V" + descriptor = "(Lah;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; // L: 39 this.start = var1.start; // L: 40 this.end = var1.end; // L: 41 - this.field1493 = var1.field1404; // L: 42 - this.field1484 = var2; // L: 43 - this.field1485 = var3; // L: 44 - this.field1486 = 8192; // L: 45 - this.field1496 = 0; // L: 46 - this.method2714(); // L: 47 + this.field439 = var1.field370; // L: 42 + this.field443 = var2; // L: 43 + this.field440 = var3; // L: 44 + this.field441 = 8192; // L: 45 + this.field444 = 0; // L: 46 + this.method899(); // L: 47 } // L: 48 - @ObfuscatedName("y") - void method2714() { - this.field1487 = this.field1485; // L: 73 - this.field1488 = method2836(this.field1485, this.field1486); // L: 74 - this.field1495 = method2710(this.field1485, this.field1486); // L: 75 + @ObfuscatedName("b") + void method899() { + this.field442 = this.field440; // L: 73 + this.field451 = method896(this.field440, this.field441); // L: 74 + this.field448 = method894(this.field440, this.field441); // L: 75 } // L: 76 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; // L: 200 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldw;" + descriptor = "()Lbt;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; // L: 204 } - @ObfuscatedName("e") - protected int vmethod4099() { - return this.field1485 == 0 && this.field1483 == 0 ? 0 : 1; // L: 208 209 + @ObfuscatedName("g") + protected int vmethod4124() { + return this.field440 == 0 && this.field447 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1485 == 0 && this.field1483 == 0) { // L: 213 + if (this.field440 == 0 && this.field447 == 0) { // L: 213 this.skip(var3); // L: 214 } else { RawSound var4 = (RawSound)super.sound; // L: 217 @@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream { int var9 = var2; // L: 223 var3 += var2; // L: 224 - if (this.field1496 < 0) { // L: 225 - if (this.field1484 <= 0) { // L: 226 - this.method2723(); // L: 228 + if (this.field444 < 0) { // L: 225 + if (this.field443 <= 0) { // L: 226 + this.method908(); // L: 228 this.remove(); // L: 229 return; // L: 230 } - this.field1496 = 0; + this.field444 = 0; } - if (this.field1496 >= var7) { // L: 233 - if (this.field1484 >= 0) { // L: 234 - this.method2723(); // L: 236 + if (this.field444 >= var7) { // L: 233 + if (this.field443 >= 0) { // L: 234 + this.method908(); // L: 236 this.remove(); // L: 237 return; // L: 238 } - this.field1496 = var7 - 1; + this.field444 = var7 - 1; } if (this.numLoops < 0) { // L: 241 - if (this.field1493) { // L: 242 - if (this.field1484 < 0) { // L: 243 - var9 = this.method2737(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 - if (this.field1496 >= var5) { // L: 245 + if (this.field439) { // L: 242 + if (this.field443 < 0) { // L: 243 + var9 = this.method922(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field444 >= var5) { // L: 245 return; } - this.field1496 = var5 + var5 - 1 - this.field1496; // L: 246 - this.field1484 = -this.field1484; // L: 247 + this.field444 = var5 + var5 - 1 - this.field444; // L: 246 + this.field443 = -this.field443; // L: 247 } while (true) { - var9 = this.method2736(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 - if (this.field1496 < var6) { // L: 251 + var9 = this.method921(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field444 < var6) { // L: 251 return; } - this.field1496 = var6 + var6 - 1 - this.field1496; // L: 252 - this.field1484 = -this.field1484; // L: 253 - var9 = this.method2737(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 - if (this.field1496 >= var5) { // L: 255 + this.field444 = var6 + var6 - 1 - this.field444; // L: 252 + this.field443 = -this.field443; // L: 253 + var9 = this.method922(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field444 >= var5) { // L: 255 return; } - this.field1496 = var5 + var5 - 1 - this.field1496; // L: 256 - this.field1484 = -this.field1484; // L: 257 + this.field444 = var5 + var5 - 1 - this.field444; // L: 256 + this.field443 = -this.field443; // L: 257 } - } else if (this.field1484 < 0) { // L: 260 + } else if (this.field443 < 0) { // L: 260 while (true) { - var9 = this.method2737(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 - if (this.field1496 >= var5) { // L: 263 + var9 = this.method922(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field444 >= var5) { // L: 263 return; } - this.field1496 = var6 - 1 - (var6 - 1 - this.field1496) % var8; // L: 264 + this.field444 = var6 - 1 - (var6 - 1 - this.field444) % var8; // L: 264 } } else { while (true) { - var9 = this.method2736(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 - if (this.field1496 < var6) { // L: 270 + var9 = this.method921(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field444 < var6) { // L: 270 return; } - this.field1496 = var5 + (this.field1496 - var5) % var8; // L: 271 + this.field444 = var5 + (this.field444 - var5) % var8; // L: 271 } } } else { if (this.numLoops > 0) { // L: 275 - if (this.field1493) { // L: 276 + if (this.field439) { // L: 276 label127: { - if (this.field1484 < 0) { // L: 277 - var9 = this.method2737(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 - if (this.field1496 >= var5) { // L: 279 + if (this.field443 < 0) { // L: 277 + var9 = this.method922(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field444 >= var5) { // L: 279 return; } - this.field1496 = var5 + var5 - 1 - this.field1496; // L: 280 - this.field1484 = -this.field1484; // L: 281 + this.field444 = var5 + var5 - 1 - this.field444; // L: 280 + this.field443 = -this.field443; // L: 281 if (--this.numLoops == 0) { // L: 282 break label127; } } do { - var9 = this.method2736(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 - if (this.field1496 < var6) { // L: 286 + var9 = this.method921(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field444 < var6) { // L: 286 return; } - this.field1496 = var6 + var6 - 1 - this.field1496; // L: 287 - this.field1484 = -this.field1484; // L: 288 + this.field444 = var6 + var6 - 1 - this.field444; // L: 287 + this.field443 = -this.field443; // L: 288 if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method2737(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 - if (this.field1496 >= var5) { // L: 291 + var9 = this.method922(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field444 >= var5) { // L: 291 return; } - this.field1496 = var5 + var5 - 1 - this.field1496; // L: 292 - this.field1484 = -this.field1484; // L: 293 + this.field444 = var5 + var5 - 1 - this.field444; // L: 292 + this.field443 = -this.field443; // L: 293 } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field1484 < 0) { // L: 297 + if (this.field443 < 0) { // L: 297 while (true) { - var9 = this.method2737(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 - if (this.field1496 >= var5) { // L: 300 + var9 = this.method922(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field444 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field1496) / var8; // L: 301 + var10 = (var6 - 1 - this.field444) / var8; // L: 301 if (var10 >= this.numLoops) { // L: 302 - this.field1496 += var8 * this.numLoops; // L: 303 + this.field444 += var8 * this.numLoops; // L: 303 this.numLoops = 0; // L: 304 break; // L: 305 } - this.field1496 += var8 * var10; // L: 307 + this.field444 += var8 * var10; // L: 307 this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method2736(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 - if (this.field1496 < var6) { // L: 314 + var9 = this.method921(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field444 < var6) { // L: 314 return; } - var10 = (this.field1496 - var5) / var8; // L: 315 + var10 = (this.field444 - var5) / var8; // L: 315 if (var10 >= this.numLoops) { // L: 316 - this.field1496 -= var8 * this.numLoops; // L: 317 + this.field444 -= var8 * this.numLoops; // L: 317 this.numLoops = 0; // L: 318 break; // L: 319 } - this.field1496 -= var8 * var10; // L: 321 + this.field444 -= var8 * var10; // L: 321 this.numLoops -= var10; // L: 322 } } } } - if (this.field1484 < 0) { // L: 326 - this.method2737(var1, var9, 0, var3, 0); // L: 327 - if (this.field1496 < 0) { // L: 328 - this.field1496 = -1; // L: 329 - this.method2723(); // L: 330 + if (this.field443 < 0) { // L: 326 + this.method922(var1, var9, 0, var3, 0); // L: 327 + if (this.field444 < 0) { // L: 328 + this.field444 = -1; // L: 329 + this.method908(); // L: 330 this.remove(); // L: 331 } } else { - this.method2736(var1, var9, var7, var3, 0); // L: 335 - if (this.field1496 >= var7) { // L: 336 - this.field1496 = var7; // L: 337 - this.method2723(); // L: 338 + this.method921(var1, var9, var7, var3, 0); // L: 335 + if (this.field444 >= var7) { // L: 336 + this.field444 = var7; // L: 337 + this.method908(); // L: 338 this.remove(); // L: 339 } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } // L: 215 342 - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; // L: 79 } // L: 80 - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("skip") public synchronized void skip(int var1) { - if (this.field1483 > 0) { // L: 345 - if (var1 >= this.field1483) { // L: 346 - if (this.field1485 == Integer.MIN_VALUE) { // L: 347 - this.field1485 = 0; // L: 348 - this.field1495 = 0; // L: 349 - this.field1488 = 0; // L: 350 - this.field1487 = 0; // L: 351 + if (this.field447 > 0) { // L: 345 + if (var1 >= this.field447) { // L: 346 + if (this.field440 == Integer.MIN_VALUE) { // L: 347 + this.field440 = 0; // L: 348 + this.field448 = 0; // L: 349 + this.field451 = 0; // L: 350 + this.field442 = 0; // L: 351 this.remove(); // L: 352 - var1 = this.field1483; // L: 353 + var1 = this.field447; // L: 353 } - this.field1483 = 0; // L: 355 - this.method2714(); // L: 356 + this.field447 = 0; // L: 355 + this.method899(); // L: 356 } else { - this.field1487 += this.field1494 * var1; // L: 359 - this.field1488 += this.field1489 * var1; // L: 360 - this.field1495 += this.field1497 * var1; // L: 361 - this.field1483 -= var1; // L: 362 + this.field442 += this.field450 * var1; // L: 359 + this.field451 += this.field438 * var1; // L: 360 + this.field448 += this.field452 * var1; // L: 361 + this.field447 -= var1; // L: 362 } } @@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1496 < 0) { // L: 371 - if (this.field1484 <= 0) { // L: 372 - this.method2723(); // L: 374 + if (this.field444 < 0) { // L: 371 + if (this.field443 <= 0) { // L: 372 + this.method908(); // L: 374 this.remove(); // L: 375 return; // L: 376 } - this.field1496 = 0; + this.field444 = 0; } - if (this.field1496 >= var5) { // L: 379 - if (this.field1484 >= 0) { // L: 380 - this.method2723(); // L: 382 + if (this.field444 >= var5) { // L: 379 + if (this.field443 >= 0) { // L: 380 + this.method908(); // L: 382 this.remove(); // L: 383 return; // L: 384 } - this.field1496 = var5 - 1; + this.field444 = var5 - 1; } - this.field1496 += this.field1484 * var1; // L: 387 + this.field444 += this.field443 * var1; // L: 387 if (this.numLoops < 0) { // L: 388 - if (!this.field1493) { // L: 389 - if (this.field1484 < 0) { // L: 404 - if (this.field1496 >= var3) { // L: 405 + if (!this.field439) { // L: 389 + if (this.field443 < 0) { // L: 404 + if (this.field444 >= var3) { // L: 405 return; } - this.field1496 = var4 - 1 - (var4 - 1 - this.field1496) % var6; // L: 406 + this.field444 = var4 - 1 - (var4 - 1 - this.field444) % var6; // L: 406 } else { - if (this.field1496 < var4) { // L: 409 + if (this.field444 < var4) { // L: 409 return; } - this.field1496 = var3 + (this.field1496 - var3) % var6; // L: 410 + this.field444 = var3 + (this.field444 - var3) % var6; // L: 410 } } else { - if (this.field1484 < 0) { // L: 390 - if (this.field1496 >= var3) { // L: 391 + if (this.field443 < 0) { // L: 390 + if (this.field444 >= var3) { // L: 391 return; } - this.field1496 = var3 + var3 - 1 - this.field1496; // L: 392 - this.field1484 = -this.field1484; // L: 393 + this.field444 = var3 + var3 - 1 - this.field444; // L: 392 + this.field443 = -this.field443; // L: 393 } - while (this.field1496 >= var4) { // L: 396 - this.field1496 = var4 + var4 - 1 - this.field1496; // L: 397 - this.field1484 = -this.field1484; // L: 398 - if (this.field1496 >= var3) { // L: 399 + while (this.field444 >= var4) { // L: 396 + this.field444 = var4 + var4 - 1 - this.field444; // L: 397 + this.field443 = -this.field443; // L: 398 + if (this.field444 >= var3) { // L: 399 return; } - this.field1496 = var3 + var3 - 1 - this.field1496; // L: 400 - this.field1484 = -this.field1484; // L: 401 + this.field444 = var3 + var3 - 1 - this.field444; // L: 400 + this.field443 = -this.field443; // L: 401 } } } else { if (this.numLoops > 0) { // L: 414 - if (this.field1493) { // L: 415 + if (this.field439) { // L: 415 label129: { - if (this.field1484 < 0) { // L: 416 - if (this.field1496 >= var3) { // L: 417 + if (this.field443 < 0) { // L: 416 + if (this.field444 >= var3) { // L: 417 return; } - this.field1496 = var3 + var3 - 1 - this.field1496; // L: 418 - this.field1484 = -this.field1484; // L: 419 + this.field444 = var3 + var3 - 1 - this.field444; // L: 418 + this.field443 = -this.field443; // L: 419 if (--this.numLoops == 0) { // L: 420 break label129; } } do { - if (this.field1496 < var4) { // L: 423 + if (this.field444 < var4) { // L: 423 return; } - this.field1496 = var4 + var4 - 1 - this.field1496; // L: 424 - this.field1484 = -this.field1484; // L: 425 + this.field444 = var4 + var4 - 1 - this.field444; // L: 424 + this.field443 = -this.field443; // L: 425 if (--this.numLoops == 0) { // L: 426 break; } - if (this.field1496 >= var3) { // L: 427 + if (this.field444 >= var3) { // L: 427 return; } - this.field1496 = var3 + var3 - 1 - this.field1496; // L: 428 - this.field1484 = -this.field1484; // L: 429 + this.field444 = var3 + var3 - 1 - this.field444; // L: 428 + this.field443 = -this.field443; // L: 429 } while(--this.numLoops != 0); // L: 430 } } else { label161: { int var7; - if (this.field1484 < 0) { // L: 433 - if (this.field1496 >= var3) { // L: 434 + if (this.field443 < 0) { // L: 433 + if (this.field444 >= var3) { // L: 434 return; } - var7 = (var4 - 1 - this.field1496) / var6; // L: 435 + var7 = (var4 - 1 - this.field444) / var6; // L: 435 if (var7 >= this.numLoops) { // L: 436 - this.field1496 += var6 * this.numLoops; // L: 437 + this.field444 += var6 * this.numLoops; // L: 437 this.numLoops = 0; // L: 438 break label161; // L: 439 } - this.field1496 += var6 * var7; // L: 441 + this.field444 += var6 * var7; // L: 441 this.numLoops -= var7; // L: 442 } else { - if (this.field1496 < var4) { // L: 445 + if (this.field444 < var4) { // L: 445 return; } - var7 = (this.field1496 - var3) / var6; // L: 446 + var7 = (this.field444 - var3) / var6; // L: 446 if (var7 >= this.numLoops) { // L: 447 - this.field1496 -= var6 * this.numLoops; // L: 448 + this.field444 -= var6 * this.numLoops; // L: 448 this.numLoops = 0; // L: 449 break label161; // L: 450 } - this.field1496 -= var6 * var7; // L: 452 + this.field444 -= var6 * var7; // L: 452 this.numLoops -= var7; // L: 453 } @@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream { } } - if (this.field1484 < 0) { // L: 457 - if (this.field1496 < 0) { // L: 458 - this.field1496 = -1; // L: 459 - this.method2723(); // L: 460 + if (this.field443 < 0) { // L: 457 + if (this.field444 < 0) { // L: 458 + this.field444 = -1; // L: 459 + this.method908(); // L: 460 this.remove(); // L: 461 } - } else if (this.field1496 >= var5) { // L: 465 - this.field1496 = var5; // L: 466 - this.method2723(); // L: 467 + } else if (this.field444 >= var5) { // L: 465 + this.field444 = var5; // L: 466 + this.method908(); // L: 467 this.remove(); // L: 468 } } } // L: 412 471 - @ObfuscatedName("b") - public synchronized void method2796(int var1) { - this.method2718(var1 << 6, this.method2773()); // L: 83 + @ObfuscatedName("m") + public synchronized void method901(int var1) { + this.method916(var1 << 6, this.method905()); // L: 83 } // L: 84 - @ObfuscatedName("a") - synchronized void method2717(int var1) { - this.method2718(var1, this.method2773()); // L: 87 + @ObfuscatedName("d") + synchronized void method937(int var1) { + this.method916(var1, this.method905()); // L: 87 } // L: 88 - @ObfuscatedName("w") - synchronized void method2718(int var1, int var2) { - this.field1485 = var1; // L: 91 - this.field1486 = var2; // L: 92 - this.field1483 = 0; // L: 93 - this.method2714(); // L: 94 + @ObfuscatedName("c") + synchronized void method916(int var1, int var2) { + this.field440 = var1; // L: 91 + this.field441 = var2; // L: 92 + this.field447 = 0; // L: 93 + this.method899(); // L: 94 } // L: 95 - @ObfuscatedName("k") - public synchronized int method2719() { - return this.field1485 == Integer.MIN_VALUE ? 0 : this.field1485; // L: 98 + @ObfuscatedName("j") + public synchronized int method904() { + return this.field440 == Integer.MIN_VALUE ? 0 : this.field440; // L: 98 } - @ObfuscatedName("i") - public synchronized int method2773() { - return this.field1486 < 0 ? -1 : this.field1486; // L: 102 + @ObfuscatedName("r") + public synchronized int method905() { + return this.field441 < 0 ? -1 : this.field441; // L: 102 } - @ObfuscatedName("x") - public synchronized void method2781(int var1) { + @ObfuscatedName("q") + public synchronized void method906(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 if (var1 < -1) { // L: 107 var1 = -1; @@ -507,326 +507,157 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1496 = var1; // L: 109 + this.field444 = var1; // L: 109 } // L: 110 - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method2722() { - this.field1484 = (this.field1484 ^ this.field1484 >> 31) + (this.field1484 >>> 31); // L: 113 - this.field1484 = -this.field1484; // L: 114 + public synchronized void method907() { + this.field443 = (this.field443 ^ this.field443 >> 31) + (this.field443 >>> 31); // L: 113 + this.field443 = -this.field443; // L: 114 } // L: 115 - @ObfuscatedName("u") - void method2723() { - if (this.field1483 != 0) { // L: 118 - if (this.field1485 == Integer.MIN_VALUE) { - this.field1485 = 0; // L: 119 + @ObfuscatedName("v") + void method908() { + if (this.field447 != 0) { // L: 118 + if (this.field440 == Integer.MIN_VALUE) { + this.field440 = 0; // L: 119 } - this.field1483 = 0; // L: 120 - this.method2714(); // L: 121 + this.field447 = 0; // L: 120 + this.method899(); // L: 121 } } // L: 123 - @ObfuscatedName("t") - public synchronized void method2741(int var1, int var2) { - this.method2843(var1, var2, this.method2773()); // L: 126 + @ObfuscatedName("x") + public synchronized void method909(int var1, int var2) { + this.method910(var1, var2, this.method905()); // L: 126 } // L: 127 - @ObfuscatedName("p") - public synchronized void method2843(int var1, int var2, int var3) { + @ObfuscatedName("z") + public synchronized void method910(int var1, int var2, int var3) { if (var1 == 0) { // L: 130 - this.method2718(var2, var3); // L: 131 + this.method916(var2, var3); // L: 131 } else { - int var4 = method2836(var2, var3); // L: 134 - int var5 = method2710(var2, var3); // L: 135 - if (var4 == this.field1488 && var5 == this.field1495) { // L: 136 - this.field1483 = 0; // L: 137 + int var4 = method896(var2, var3); // L: 134 + int var5 = method894(var2, var3); // L: 135 + if (var4 == this.field451 && var5 == this.field448) { // L: 136 + this.field447 = 0; // L: 137 } else { - int var6 = var2 - this.field1487; // L: 140 - if (this.field1487 - var2 > var6) { // L: 141 - var6 = this.field1487 - var2; + int var6 = var2 - this.field442; // L: 140 + if (this.field442 - var2 > var6) { // L: 141 + var6 = this.field442 - var2; } - if (var4 - this.field1488 > var6) { // L: 142 - var6 = var4 - this.field1488; + if (var4 - this.field451 > var6) { // L: 142 + var6 = var4 - this.field451; } - if (this.field1488 - var4 > var6) { // L: 143 - var6 = this.field1488 - var4; + if (this.field451 - var4 > var6) { // L: 143 + var6 = this.field451 - var4; } - if (var5 - this.field1495 > var6) { - var6 = var5 - this.field1495; // L: 144 + if (var5 - this.field448 > var6) { + var6 = var5 - this.field448; // L: 144 } - if (this.field1495 - var5 > var6) { // L: 145 - var6 = this.field1495 - var5; + if (this.field448 - var5 > var6) { // L: 145 + var6 = this.field448 - var5; } if (var1 > var6) { // L: 146 var1 = var6; } - this.field1483 = var1; // L: 147 - this.field1485 = var2; // L: 148 - this.field1486 = var3; // L: 149 - this.field1494 = (var2 - this.field1487) / var1; // L: 150 - this.field1489 = (var4 - this.field1488) / var1; // L: 151 - this.field1497 = (var5 - this.field1495) / var1; // L: 152 + this.field447 = var1; // L: 147 + this.field440 = var2; // L: 148 + this.field441 = var3; // L: 149 + this.field450 = (var2 - this.field442) / var1; // L: 150 + this.field438 = (var4 - this.field451) / var1; // L: 151 + this.field452 = (var5 - this.field448) / var1; // L: 152 } } } // L: 132 138 153 - @ObfuscatedName("o") - public synchronized void method2803(int var1) { + @ObfuscatedName("at") + public synchronized void method920(int var1) { if (var1 == 0) { // L: 156 - this.method2717(0); // L: 157 + this.method937(0); // L: 157 this.remove(); // L: 158 - } else if (this.field1488 == 0 && this.field1495 == 0) { // L: 161 - this.field1483 = 0; // L: 162 - this.field1485 = 0; // L: 163 - this.field1487 = 0; // L: 164 + } else if (this.field451 == 0 && this.field448 == 0) { // L: 161 + this.field447 = 0; // L: 162 + this.field440 = 0; // L: 163 + this.field442 = 0; // L: 164 this.remove(); // L: 165 } else { - int var2 = -this.field1487; // L: 168 - if (this.field1487 > var2) { // L: 169 - var2 = this.field1487; + int var2 = -this.field442; // L: 168 + if (this.field442 > var2) { // L: 169 + var2 = this.field442; } - if (-this.field1488 > var2) { // L: 170 - var2 = -this.field1488; + if (-this.field451 > var2) { // L: 170 + var2 = -this.field451; } - if (this.field1488 > var2) { // L: 171 - var2 = this.field1488; + if (this.field451 > var2) { // L: 171 + var2 = this.field451; } - if (-this.field1495 > var2) { // L: 172 - var2 = -this.field1495; + if (-this.field448 > var2) { // L: 172 + var2 = -this.field448; } - if (this.field1495 > var2) { // L: 173 - var2 = this.field1495; + if (this.field448 > var2) { // L: 173 + var2 = this.field448; } if (var1 > var2) { // L: 174 var1 = var2; } - this.field1483 = var1; // L: 175 - this.field1485 = Integer.MIN_VALUE; // L: 176 - this.field1494 = -this.field1487 / var1; // L: 177 - this.field1489 = -this.field1488 / var1; // L: 178 - this.field1497 = -this.field1495 / var1; // L: 179 + this.field447 = var1; // L: 175 + this.field440 = Integer.MIN_VALUE; // L: 176 + this.field450 = -this.field442 / var1; // L: 177 + this.field438 = -this.field451 / var1; // L: 178 + this.field452 = -this.field448 / var1; // L: 179 } } // L: 159 166 180 - @ObfuscatedName("ay") - public synchronized void method2802(int var1) { - if (this.field1484 < 0) { // L: 183 - this.field1484 = -var1; + @ObfuscatedName("aj") + public synchronized void method912(int var1) { + if (this.field443 < 0) { // L: 183 + this.field443 = -var1; } else { - this.field1484 = var1; // L: 184 + this.field443 = var1; // L: 184 } } // L: 185 - @ObfuscatedName("am") - public synchronized int method2728() { - return this.field1484 < 0 ? -this.field1484 : this.field1484; // L: 188 + @ObfuscatedName("ax") + public synchronized int method981() { + return this.field443 < 0 ? -this.field443 : this.field443; // L: 188 } - @ObfuscatedName("ag") - public boolean method2786() { - return this.field1496 < 0 || this.field1496 >= ((RawSound)super.sound).samples.length << 8; // L: 192 + @ObfuscatedName("as") + public boolean method973() { + return this.field444 < 0 || this.field444 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } - @ObfuscatedName("ae") - public boolean method2730() { - return this.field1483 != 0; // L: 196 + @ObfuscatedName("ad") + public boolean method941() { + return this.field447 != 0; // L: 196 } - @ObfuscatedName("ac") - int method2736(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1483 > 0) { // L: 474 - int var6 = var2 + this.field1483; // L: 475 - if (var6 > var4) { // L: 476 - var6 = var4; - } - - this.field1483 += var2; // L: 477 - if (this.field1484 == 256 && (this.field1496 & 255) == 0) { // L: 478 - if (PcmPlayer.PcmPlayer_stereo) { // L: 479 - var2 = method2748(0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, this.field1489, this.field1497, 0, var6, var3, this); - } else { - var2 = method2747(((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, this.field1494, 0, var6, var3, this); // L: 480 - } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 - var2 = method2746(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, this.field1489, this.field1497, 0, var6, var3, this, this.field1484, var5); - } else { - var2 = method2751(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, this.field1494, 0, var6, var3, this, this.field1484, var5); // L: 484 - } - - this.field1483 -= var2; // L: 486 - if (this.field1483 != 0) { // L: 487 - return var2; - } - - if (!this.method2738()) { // L: 488 - continue; - } - - return var4; - } - - if (this.field1484 == 256 && (this.field1496 & 255) == 0) { // L: 490 - if (PcmPlayer.PcmPlayer_stereo) { // L: 491 - return method2813(0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, 0, var4, var3, this); - } - - return method2752(((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, 0, var4, var3, this); // L: 492 - } - - if (PcmPlayer.PcmPlayer_stereo) { // L: 495 - return method2744(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, 0, var4, var3, this, this.field1484, var5); - } - - return method2758(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, 0, var4, var3, this, this.field1484, var5); // L: 496 - } - } - - @ObfuscatedName("aq") - int method2737(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1483 > 0) { // L: 501 - int var6 = var2 + this.field1483; // L: 502 - if (var6 > var4) { // L: 503 - var6 = var4; - } - - this.field1483 += var2; // L: 504 - if (this.field1484 == -256 && (this.field1496 & 255) == 0) { // L: 505 - if (PcmPlayer.PcmPlayer_stereo) { // L: 506 - var2 = method2750(0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, this.field1489, this.field1497, 0, var6, var3, this); - } else { - var2 = method2749(((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, this.field1494, 0, var6, var3, this); // L: 507 - } - } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 - var2 = method2847(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, this.field1489, this.field1497, 0, var6, var3, this, this.field1484, var5); - } else { - var2 = method2771(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, this.field1494, 0, var6, var3, this, this.field1484, var5); // L: 511 - } - - this.field1483 -= var2; // L: 513 - if (this.field1483 != 0) { // L: 514 - return var2; - } - - if (!this.method2738()) { // L: 515 - continue; - } - - return var4; - } - - if (this.field1484 == -256 && (this.field1496 & 255) == 0) { // L: 517 - if (PcmPlayer.PcmPlayer_stereo) { // L: 518 - return method2742(0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, 0, var4, var3, this); - } - - return method2735(((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, 0, var4, var3, this); // L: 519 - } - - if (PcmPlayer.PcmPlayer_stereo) { // L: 522 - return method2829(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1488, this.field1495, 0, var4, var3, this, this.field1484, var5); - } - - return method2766(0, 0, ((RawSound)super.sound).samples, var1, this.field1496, var2, this.field1487, 0, var4, var3, this, this.field1484, var5); // L: 523 - } - } - - @ObfuscatedName("at") - boolean method2738() { - int var1 = this.field1485; // 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 = method2836(var1, this.field1486); // L: 537 - var3 = method2710(var1, this.field1486); // L: 538 - } - - if (var1 == this.field1487 && var2 == this.field1488 && var3 == this.field1495) { // L: 540 - if (this.field1485 == Integer.MIN_VALUE) { // L: 570 - this.field1485 = 0; // L: 571 - this.field1495 = 0; // L: 572 - this.field1488 = 0; // L: 573 - this.field1487 = 0; // L: 574 - this.remove(); // L: 575 - return true; // L: 576 - } else { - this.method2714(); // L: 578 - return false; // L: 579 - } - } else { - if (this.field1487 < var1) { // L: 541 - this.field1494 = 1; // L: 542 - this.field1483 = var1 - this.field1487; // L: 543 - } else if (this.field1487 > var1) { // L: 545 - this.field1494 = -1; // L: 546 - this.field1483 = this.field1487 - var1; // L: 547 - } else { - this.field1494 = 0; // L: 549 - } - - if (this.field1488 < var2) { // L: 550 - this.field1489 = 1; // L: 551 - if (this.field1483 == 0 || this.field1483 > var2 - this.field1488) { // L: 552 - this.field1483 = var2 - this.field1488; - } - } else if (this.field1488 > var2) { // L: 554 - this.field1489 = -1; // L: 555 - if (this.field1483 == 0 || this.field1483 > this.field1488 - var2) { // L: 556 - this.field1483 = this.field1488 - var2; - } - } else { - this.field1489 = 0; // L: 558 - } - - if (this.field1495 < var3) { // L: 559 - this.field1497 = 1; // L: 560 - if (this.field1483 == 0 || this.field1483 > var3 - this.field1495) { // L: 561 - this.field1483 = var3 - this.field1495; - } - } else if (this.field1495 > var3) { // L: 563 - this.field1497 = -1; // L: 564 - if (this.field1483 == 0 || this.field1483 > this.field1495 - var3) { // L: 565 - this.field1483 = this.field1495 - var3; - } - } else { - this.field1497 = 0; // L: 567 - } - - return false; // L: 568 - } - } - - @ObfuscatedName("bi") - int vmethod2880() { - int var1 = this.field1487 * 3 >> 6; // L: 31 + @ObfuscatedName("af") + int vmethod1039() { + int var1 = this.field442 * 3 >> 6; // L: 31 var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 if (this.numLoops == 0) { // L: 33 - var1 -= var1 * this.field1496 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field444 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 } @@ -834,38 +665,207 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; // L: 35 } - @ObfuscatedName("n") - static int method2836(int var0, int var1) { + @ObfuscatedName("ao") + int method921(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field447 > 0) { // L: 474 + int var6 = var2 + this.field447; // L: 475 + if (var6 > var4) { // L: 476 + var6 = var4; + } + + this.field447 += var2; // L: 477 + if (this.field443 == 256 && (this.field444 & 255) == 0) { // L: 478 + if (PcmPlayer.PcmPlayer_stereo) { // L: 479 + var2 = method933(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this); + } else { + var2 = method932(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this); // L: 480 + } + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 + var2 = method1008(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this, this.field443, var5); + } else { + var2 = method936(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this, this.field443, var5); // L: 484 + } + + this.field447 -= var2; // L: 486 + if (this.field447 != 0) { // L: 487 + return var2; + } + + if (!this.method923()) { // L: 488 + continue; + } + + return var4; + } + + if (this.field443 == 256 && (this.field444 & 255) == 0) { // L: 490 + if (PcmPlayer.PcmPlayer_stereo) { // L: 491 + return method925(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this); + } + + return method924(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this); // L: 492 + } + + if (PcmPlayer.PcmPlayer_stereo) { // L: 495 + return method929(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this, this.field443, var5); + } + + return method928(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this, this.field443, var5); // L: 496 + } + } + + @ObfuscatedName("ai") + int method922(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field447 > 0) { // L: 501 + int var6 = var2 + this.field447; // L: 502 + if (var6 > var4) { // L: 503 + var6 = var4; + } + + this.field447 += var2; // L: 504 + if (this.field443 == -256 && (this.field444 & 255) == 0) { // L: 505 + if (PcmPlayer.PcmPlayer_stereo) { // L: 506 + var2 = method935(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this); + } else { + var2 = method1027(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this); // L: 507 + } + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 + var2 = method939(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, this.field438, this.field452, 0, var6, var3, this, this.field443, var5); + } else { + var2 = method938(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, this.field450, 0, var6, var3, this, this.field443, var5); // L: 511 + } + + this.field447 -= var2; // L: 513 + if (this.field447 != 0) { // L: 514 + return var2; + } + + if (!this.method923()) { // L: 515 + continue; + } + + return var4; + } + + if (this.field443 == -256 && (this.field444 & 255) == 0) { // L: 517 + if (PcmPlayer.PcmPlayer_stereo) { // L: 518 + return method967(0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this); + } + + return method926(((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this); // L: 519 + } + + if (PcmPlayer.PcmPlayer_stereo) { // L: 522 + return method931(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field451, this.field448, 0, var4, var3, this, this.field443, var5); + } + + return method893(0, 0, ((RawSound)super.sound).samples, var1, this.field444, var2, this.field442, 0, var4, var3, this, this.field443, var5); // L: 523 + } + } + + @ObfuscatedName("av") + boolean method923() { + int var1 = this.field440; // 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 = method896(var1, this.field441); // L: 537 + var3 = method894(var1, this.field441); // L: 538 + } + + if (var1 == this.field442 && var2 == this.field451 && var3 == this.field448) { // L: 540 + if (this.field440 == Integer.MIN_VALUE) { // L: 570 + this.field440 = 0; // L: 571 + this.field448 = 0; // L: 572 + this.field451 = 0; // L: 573 + this.field442 = 0; // L: 574 + this.remove(); // L: 575 + return true; // L: 576 + } else { + this.method899(); // L: 578 + return false; // L: 579 + } + } else { + if (this.field442 < var1) { // L: 541 + this.field450 = 1; // L: 542 + this.field447 = var1 - this.field442; // L: 543 + } else if (this.field442 > var1) { // L: 545 + this.field450 = -1; // L: 546 + this.field447 = this.field442 - var1; // L: 547 + } else { + this.field450 = 0; // L: 549 + } + + if (this.field451 < var2) { // L: 550 + this.field438 = 1; // L: 551 + if (this.field447 == 0 || this.field447 > var2 - this.field451) { // L: 552 + this.field447 = var2 - this.field451; + } + } else if (this.field451 > var2) { // L: 554 + this.field438 = -1; // L: 555 + if (this.field447 == 0 || this.field447 > this.field451 - var2) { // L: 556 + this.field447 = this.field451 - var2; + } + } else { + this.field438 = 0; // L: 558 + } + + if (this.field448 < var3) { // L: 559 + this.field452 = 1; // L: 560 + if (this.field447 == 0 || this.field447 > var3 - this.field448) { // L: 561 + this.field447 = var3 - this.field448; + } + } else if (this.field448 > var3) { // L: 563 + this.field452 = -1; // L: 564 + if (this.field447 == 0 || this.field447 > this.field448 - var3) { // L: 565 + this.field447 = this.field448 - var3; + } + } else { + this.field452 = 0; // L: 567 + } + + return false; // L: 568 + } + } + + @ObfuscatedName("f") + static int method896(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 } - @ObfuscatedName("v") - static int method2710(int var0, int var1) { + @ObfuscatedName("o") + static int method894(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ldm;II)Ldt;" + descriptor = "(Lah;II)Lbk;" ) @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)(StructComposition.field3338 * 100)), var2 << 6) : null; // L: 63 64 + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field394 * 100)), var2 << 6) : null; // L: 63 64 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ldm;III)Ldt;" + descriptor = "(Lah;III)Lbk;" ) - public static RawPcmStream method2845(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method898(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("ak") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILdt;)I" + descriptor = "([B[IIIIIIILbk;)I" ) - static int method2752(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method924(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 583 var7 >>= 8; // L: 584 var4 <<= 2; // L: 585 @@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 596 } - var8.field1496 = var2 << 8; // L: 598 + var8.field444 = var2 << 8; // L: 598 return var3; // L: 599 } - @ObfuscatedName("ax") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILdt;)I" + descriptor = "(I[B[IIIIIIIILbk;)I" ) - static int method2813(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method925(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 603 var9 >>= 8; // L: 604 var5 <<= 2; // L: 605 @@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1496 = var3 << 8; // L: 631 + var10.field444 = var3 << 8; // L: 631 return var4 >> 1; // L: 632 } - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILdt;)I" + descriptor = "([B[IIIIIIILbk;)I" ) - static int method2735(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method926(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; // L: 636 var7 >>= 8; // L: 637 var4 <<= 2; // L: 638 @@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; // L: 649 } - var8.field1496 = var2 << 8; // L: 651 + var8.field444 = var2 << 8; // L: 651 return var3; // L: 652 } - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILdt;)I" + descriptor = "(I[B[IIIIIIIILbk;)I" ) - static int method2742(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method967(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { var3 >>= 8; // L: 656 var9 >>= 8; // L: 657 var5 <<= 2; // L: 658 @@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1496 = var3 << 8; // L: 684 + var10.field444 = var3 << 8; // L: 684 return var4 >> 1; // L: 685 } - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIILbk;II)I" ) - static int method2758(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method928(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 var7 = var8; } @@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field1496 = var4; // L: 703 + var10.field444 = var4; // L: 703 return var5; // L: 704 } - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method2744(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method929(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 var8 = var9; } @@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1496 = var4; // L: 729 + var11.field444 = var4; // L: 729 return var5 >> 1; // L: 730 } - @ObfuscatedName("af") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIILbk;II)I" ) - static int method2766(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + static int method893(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734 var7 = var8; } @@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 } - var10.field1496 = var4; // L: 748 + var10.field444 = var4; // L: 748 return var5; // L: 749 } - @ObfuscatedName("av") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method2829(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + static int method931(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 var8 = var9; } @@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1496 = var4; // L: 773 + var11.field444 = var4; // L: 773 return var5 >> 1; // L: 774 } - @ObfuscatedName("ao") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILdt;)I" + descriptor = "([B[IIIIIIIILbk;)I" ) - static int method2747(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method932(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 778 var8 >>= 8; // L: 779 var4 <<= 2; // L: 780 @@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1488 += var9.field1489 * (var6 - var3); // L: 783 - var9.field1495 += var9.field1497 * (var6 - var3); // L: 784 + var9.field451 += var9.field438 * (var6 - var3); // L: 783 + var9.field448 += var9.field452 * (var6 - var3); // L: 784 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 @@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1487 = var4 >> 2; // L: 801 - var9.field1496 = var2 << 8; // L: 802 + var9.field442 = var4 >> 2; // L: 801 + var9.field444 = var2 << 8; // L: 802 return var3; // L: 803 } - @ObfuscatedName("bj") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILdt;)I" + descriptor = "(I[B[IIIIIIIIIILbk;)I" ) - static int method2748(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method933(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 807 var11 >>= 8; // L: 808 var5 <<= 2; // L: 809 @@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1487 += var12.field1494 * (var9 - var4); // L: 814 + var12.field442 += var12.field450 * (var9 - var4); // L: 814 var4 <<= 1; // L: 815 var9 <<= 1; // L: 816 @@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1488 = var5 >> 2; // L: 848 - var12.field1495 = var6 >> 2; // L: 849 - var12.field1496 = var3 << 8; // L: 850 + var12.field451 = var5 >> 2; // L: 848 + var12.field448 = var6 >> 2; // L: 849 + var12.field444 = var3 << 8; // L: 850 return var4 >> 1; // L: 851 } - @ObfuscatedName("bn") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILdt;)I" + descriptor = "([B[IIIIIIIILbk;)I" ) - static int method2749(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method1027(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { var2 >>= 8; // L: 855 var8 >>= 8; // L: 856 var4 <<= 2; // L: 857 @@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1488 += var9.field1489 * (var6 - var3); // L: 860 - var9.field1495 += var9.field1497 * (var6 - var3); // L: 861 + var9.field451 += var9.field438 * (var6 - var3); // L: 860 + var9.field448 += var9.field452 * (var6 - var3); // L: 861 int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 @@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1487 = var4 >> 2; // L: 878 - var9.field1496 = var2 << 8; // L: 879 + var9.field442 = var4 >> 2; // L: 878 + var9.field444 = var2 << 8; // L: 879 return var3; // L: 880 } - @ObfuscatedName("bp") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILdt;)I" + descriptor = "(I[B[IIIIIIIIIILbk;)I" ) - static int method2750(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + static int method935(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { var3 >>= 8; // L: 884 var11 >>= 8; // L: 885 var5 <<= 2; // L: 886 @@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1487 += var12.field1494 * (var9 - var4); // L: 891 + var12.field442 += var12.field450 * (var9 - var4); // L: 891 var4 <<= 1; // L: 892 var9 <<= 1; // L: 893 @@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1488 = var5 >> 2; // L: 925 - var12.field1495 = var6 >> 2; // L: 926 - var12.field1496 = var3 << 8; // L: 927 + var12.field451 = var5 >> 2; // L: 925 + var12.field448 = var6 >> 2; // L: 926 + var12.field444 = var3 << 8; // L: 927 return var4 >> 1; // L: 928 } - @ObfuscatedName("br") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method2751(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.field1488 -= var11.field1489 * var5; // L: 932 - var11.field1495 -= var11.field1497 * var5; // L: 933 + static int method936(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.field451 -= var11.field438 * var5; // L: 932 + var11.field448 -= var11.field452 * var5; // L: 933 if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } @@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 947 } - var11.field1488 += var11.field1489 * var5; // L: 950 - var11.field1495 += var11.field1497 * var5; // L: 951 - var11.field1487 = var6; // L: 952 - var11.field1496 = var4; // L: 953 + var11.field451 += var11.field438 * var5; // L: 950 + var11.field448 += var11.field452 * var5; // L: 951 + var11.field442 = var6; // L: 952 + var11.field444 = var4; // L: 953 return var5; // L: 954 } - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIIIIILbk;II)I" ) - static int method2746(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.field1487 -= var5 * var13.field1494; // L: 958 + static int method1008(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.field442 -= var5 * var13.field450; // L: 958 if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } @@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 984 - var13.field1487 += var13.field1494 * var5; // L: 985 - var13.field1488 = var6; // L: 986 - var13.field1495 = var7; // L: 987 - var13.field1496 = var4; // L: 988 + var13.field442 += var13.field450 * var5; // L: 985 + var13.field451 = var6; // L: 986 + var13.field448 = var7; // L: 987 + var13.field444 = var4; // L: 988 return var5; // L: 989 } - @ObfuscatedName("bx") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIIILbk;II)I" ) - static int method2771(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.field1488 -= var11.field1489 * var5; // L: 993 - var11.field1495 -= var11.field1497 * var5; // L: 994 + static int method938(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.field451 -= var11.field438 * var5; // L: 993 + var11.field448 -= var11.field452 * var5; // L: 994 if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } @@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; // L: 1008 } - var11.field1488 += var11.field1489 * var5; // L: 1011 - var11.field1495 += var11.field1497 * var5; // L: 1012 - var11.field1487 = var6; // L: 1013 - var11.field1496 = var4; // L: 1014 + var11.field451 += var11.field438 * var5; // L: 1011 + var11.field448 += var11.field452 * var5; // L: 1012 + var11.field442 = var6; // L: 1013 + var11.field444 = var4; // L: 1014 return var5; // L: 1015 } - @ObfuscatedName("bc") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILdt;II)I" + descriptor = "(II[B[IIIIIIIIIILbk;II)I" ) - static int method2847(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.field1487 -= var5 * var13.field1494; // L: 1019 + static int method939(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.field442 -= var5 * var13.field450; // L: 1019 if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } @@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; // L: 1044 - var13.field1487 += var13.field1494 * var5; // L: 1045 - var13.field1488 = var6; // L: 1046 - var13.field1495 = var7; // L: 1047 - var13.field1496 = var4; // L: 1048 + var13.field442 += var13.field450 * var5; // L: 1045 + var13.field451 = var6; // L: 1046 + var13.field448 = var7; // L: 1047 + var13.field444 = 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 dbef8d05b4..fb4f86dce2 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dm") +@ObfuscatedName("ah") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("samples") public byte[] samples; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("start") public int start; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("end") int end; - @ObfuscatedName("y") - public boolean field1404; + @ObfuscatedName("b") + public boolean field370; RawSound(int var1, byte[] var2, int var3, int var4) { this.sampleRate = var1; // L: 13 @@ -33,12 +33,12 @@ public class RawSound extends AbstractSound { this.samples = var2; // L: 21 this.start = var3; // L: 22 this.end = var4; // L: 23 - this.field1404 = var5; // L: 24 + this.field370 = var5; // L: 24 } // L: 25 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ldq;)Ldm;" + descriptor = "(Lby;)Lah;" ) @Export("resample") public RawSound resample(Decimator var1) { diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index bd33ca5fa2..51fa129abd 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -1,118 +1,124 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -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; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("du") +@ObfuscatedName("bd") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("n") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = -566421309 + intValue = -1657025249 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("f") + @Export("intReplaceValues") + int[] intReplaceValues; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1338843583 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -941337557 + intValue = -983973645 ) @Export("size") int size; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("operations") int[] operations; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("y") + @ObfuscatedName("e") @Export("fields") Field[] fields; - @ObfuscatedName("h") - @Export("intReplaceValues") - int[] intReplaceValues; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("methods") Method[] methods; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } // L: 17 - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "-84" + descriptor = "(I)V", + garbageValue = "-2134581058" ) - static boolean method2452(String var0) { - if (var0 == null) { - return false; - } else { - try { - new URL(var0); - return true; // L: 42 - } catch (MalformedURLException var2) { - return false; - } - } - } + public static void method1172() { + Widget.Widget_cachedSprites.clear(); // L: 690 + Widget.Widget_cachedModels.clear(); // L: 691 + Widget.Widget_cachedFonts.clear(); // L: 692 + Widget.Widget_cachedSpriteMasks.clear(); // L: 693 + } // L: 694 @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lig;IIIZB)V", - garbageValue = "-111" + descriptor = "(ILcc;ZI)I", + garbageValue = "298552186" ) - public static void method2450(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class206.musicPlayerStatus = 1; // L: 34 - class206.musicTrackArchive = var0; // L: 35 - class206.musicTrackGroupId = var1; // L: 36 - SoundSystem.musicTrackFileId = var2; // L: 37 - DevicePcmPlayerProvider.musicTrackVolume = var3; // L: 38 - class206.musicTrackBoolean = var4; // L: 39 - class7.pcmSampleLength = 10000; // L: 40 - } // L: 41 - - @ObfuscatedName("y") - public static int method2451(long var0) { - return (int)(var0 >>> 0 & 127L); // L: 60 + static int method1171(int var0, Script var1, boolean var2) { + Widget var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1280 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1281 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1282 + return 1; // L: 1283 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1285 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1286 + return 1; // L: 1287 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1289 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1290 + return 1; // L: 1291 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1293 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1294 + return 1; // L: 1295 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1297 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1298 + return 1; // L: 1299 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1301 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1302 + return 1; // L: 1303 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1305 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1306 + return 1; // L: 1307 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1309 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1310 + return 1; // L: 1311 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1313 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1314 + return 1; // L: 1315 + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1317 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1318 + return 1; // L: 1319 + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1321 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1322 + return 1; // L: 1323 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1325 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color; // L: 1326 + return 1; // L: 1327 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1329 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.color2; // L: 1330 + return 1; // L: 1331 + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1333 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1334 + return 1; // L: 1335 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1337 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1338 + return 1; // L: 1339 + } else if (var0 != 2615 && var0 != 2616) { // L: 1341 + return 2; // L: 1345 + } else { + ++class16.Interpreter_intStackSize; // L: 1342 + return 1; // L: 1343 + } } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(CII)Ljava/lang/String;", - garbageValue = "71351387" - ) - static String method2449(char var0, int var1) { - char[] var2 = new char[var1]; // L: 178 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 179 - var2[var3] = var0; - } - - return new String(var2); // L: 180 - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ldw;I)V", - garbageValue = "-1934858738" - ) - @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; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); // L: 261 - } - - } // L: 262 } diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java index 58f720f844..fa562e22b6 100644 --- a/runescape-client/src/main/java/Renderable.java +++ b/runescape-client/src/main/java/Renderable.java @@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("fm") @Implements("Renderable") public abstract class Renderable extends DualNode { - @ObfuscatedName("ce") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -1481288719 + intValue = 2052938627 ) @Export("height") public int height; @@ -18,17 +18,17 @@ public abstract class Renderable extends DualNode { this.height = 1000; // L: 6 } // L: 8 - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" + descriptor = "(I)Lgv;", + garbageValue = "1835906978" ) @Export("getModel") protected Model getModel() { return null; // L: 19 } - @ObfuscatedName("cz") + @ObfuscatedName("bu") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); // L: 11 @@ -39,16 +39,45 @@ public abstract class Renderable extends DualNode { } // L: 16 - @ObfuscatedName("fz") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "1811451273" ) - static final void method3417() { - if (Client.field889 != class90.Client_plane) { // L: 3402 - Client.field889 = class90.Client_plane; // L: 3403 - class224.createMinimapSprite(class90.Client_plane); // L: 3404 + static void method3629() { + HealthBar.field1311 = 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 = UserComparator8.method2427((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); // L: 30 + HealthBar.field1311[var0] = var3; // L: 31 + ++var0; // L: 29 } - } // L: 3406 -} \ No newline at end of file + var1 = 48; // L: 33 + + for (int var5 = var1 / 6; var0 < HealthBar.field1311.length; var1 -= var5) { // L: 34 35 41 + var3 = var0 * 2; // L: 36 + + for (int var4 = UserComparator8.method2427((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < HealthBar.field1311.length; ++var0) { // L: 37 38 + HealthBar.field1311[var0] = var4; // L: 39 + } + } + + } // L: 43 + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(III)Leb;", + garbageValue = "85156791" + ) + static RouteStrategy method3628(int var0, int var1) { + Client.field878.approxDestinationX = var0; // L: 7760 + Client.field878.approxDestinationY = var1; // L: 7761 + Client.field878.approxDestinationSizeX = 1; // L: 7762 + Client.field878.approxDestinationSizeY = 1; // L: 7763 + return Client.field878; // L: 7764 + } +} diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 29e291fc77..59acdfbe9b 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,34 +1,33 @@ -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("gz") +@ObfuscatedName("eb") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1648093549 + intValue = 997501595 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 845943469 + intValue = -502030217 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1266527917 + intValue = -1934250883 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1498688541 + intValue = 1021808117 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -36,38 +35,20 @@ public abstract class RouteStrategy { protected RouteStrategy() { } // L: 9 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIILfe;I)Z", - garbageValue = "1148121553" + descriptor = "(IIILel;I)Z", + garbageValue = "120127354" ) @Export("hasArrived") public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("h") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-69" + descriptor = "(IB)Z", + garbageValue = "95" ) - static void method3795() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 50 - - while (var0.hasNext()) { // L: 55 - Message var1 = (Message)var0.next(); // L: 51 - var1.clearIsFromFriend(); // L: 53 - } - - } // L: 56 - - @ObfuscatedName("gd") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1059430259" - ) - static void method3794() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4258 - WorldMapScaleHandler.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4259 - } - - } // L: 4261 + static boolean method2653(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 9045 + } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index 5c0baa4bae..b8e2eae636 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,25 +1,30 @@ -import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mr") +@ObfuscatedName("or") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("n") - @Export("RunException_applet") - public static Applet RunException_applet; - @ObfuscatedName("d") + @ObfuscatedName("o") + @Export("localPlayerName") + public static String localPlayerName; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1196724945 + intValue = -495084017 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("y") + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -809712213 + ) + @Export("clientType") + public static int clientType; + @ObfuscatedName("b") @Export("message") String message; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 79e74c2fb6..14bfc9c14e 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,188 +3,188 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("fu") @Implements("Scene") public class Scene { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("g") + @ObfuscatedName("v") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("t") + @ObfuscatedName("z") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("r") + @ObfuscatedName("w") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("o") + @ObfuscatedName("s") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("j") + @ObfuscatedName("y") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("am") + @ObfuscatedName("ay") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "[Lej;" + descriptor = "[Lgb;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("aq") + @ObfuscatedName("at") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("at") + @ObfuscatedName("aj") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("al") + @ObfuscatedName("as") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("az") + @ObfuscatedName("ai") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ah") + @ObfuscatedName("av") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "[[Lea;" + descriptor = "[[Lfd;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("aj") + @ObfuscatedName("au") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Lea;" + descriptor = "[Lfd;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ab") - static final int[] field1860; - @ObfuscatedName("au") - static final int[] field1861; - @ObfuscatedName("ad") - static final int[] field1862; - @ObfuscatedName("af") - static final int[] field1863; - @ObfuscatedName("av") - static final int[] field1864; - @ObfuscatedName("ao") - static final int[] field1845; - @ObfuscatedName("bj") - static final int[] field1866; - @ObfuscatedName("bc") + @ObfuscatedName("al") + static final int[] field1977; + @ObfuscatedName("ar") + static final int[] field1978; + @ObfuscatedName("ak") + static final int[] field1979; + @ObfuscatedName("an") + static final int[] field1980; + @ObfuscatedName("ah") + static final int[] field1981; + @ObfuscatedName("ae") + static final int[] field1982; + @ObfuscatedName("bh") + static final int[] field1931; + @ObfuscatedName("ba") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bw") + @ObfuscatedName("be") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bv") + @ObfuscatedName("bo") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bt") + @ObfuscatedName("bp") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bl") + @ObfuscatedName("bj") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bh") + @ObfuscatedName("bw") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bz") + @ObfuscatedName("by") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bg") + @ObfuscatedName("bq") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("planes") int planes; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("xSize") int xSize; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("ySize") int ySize; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[[[Les;" + descriptor = "[[[Lfx;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("minPlane") int minPlane; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Lej;" + descriptor = "[Lgb;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("l") - int[][][] field1820; - @ObfuscatedName("bq") + @ObfuscatedName("n") + int[][][] field1940; + @ObfuscatedName("bk") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; // L: 51 Scene_currentOccluders = new Occluder[500]; // L: 52 Scene_tilesDeque = new NodeDeque(); // L: 53 - field1860 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 - field1861 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 - field1862 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 - field1863 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 - field1864 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 - field1845 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 - field1866 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + field1977 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field1978 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field1979 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field1980 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field1981 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field1982 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field1931 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 visibilityMap = new boolean[8][32][51][51]; // L: 86 } @@ -226,12 +226,12 @@ public class Scene { this.xSize = var2; // L: 97 this.ySize = var3; // L: 98 this.tiles = new Tile[var1][var2][var3]; // L: 99 - this.field1820 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.field1940 = new int[var1][var2 + 1][var3 + 1]; // L: 100 this.tileHeights = var4; // L: 101 this.clear(); // L: 102 } // L: 103 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } // L: 120 - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("init") public void init(int var1) { this.minPlane = var1; // L: 123 @@ -279,7 +279,7 @@ public class Scene { } // L: 129 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; // L: 132 @@ -291,59 +291,47 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 GameObject var7 = var5.gameObjects[var6]; // L: 138 - long var9 = var7.tag; // L: 140 - boolean var8 = FontName.method5502(var9) == 2; // L: 142 - if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 144 + if (class23.method341(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { // L: 148 + if (this.tiles[0][var1][var2] == null) { // L: 143 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 149 - this.tiles[3][var1][var2] = null; // L: 150 - } // L: 151 + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 + this.tiles[3][var1][var2] = null; // L: 145 + } // L: 146 - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 170 - if (var5 != null) { // L: 171 - this.tiles[var1][var2][var3].minPlane = var4; // L: 172 + Tile var5 = this.tiles[var1][var2][var3]; // L: 165 + if (var5 != null) { // L: 166 + this.tiles[var1][var2][var3].minPlane = var4; // L: 167 } - } // L: 173 + } // L: 168 - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { SceneTilePaint var21; int var22; - if (var4 == 0) { // L: 176 - var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 177 + if (var4 == 0) { // L: 171 + var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 - for (var22 = var1; var22 >= 0; --var22) { // L: 178 + for (var22 = var1; var22 >= 0; --var22) { // L: 173 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; // L: 179 - } else if (var4 != 1) { // L: 182 - SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 188 - - for (var22 = var1; var22 >= 0; --var22) { // L: 189 - if (this.tiles[var22][var2][var3] == null) { - this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); - } - } - - this.tiles[var1][var2][var3].model = var23; // L: 190 - } else { - var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 183 + this.tiles[var1][var2][var3].paint = var21; // L: 174 + } else if (var4 != 1) { // L: 177 + SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183 for (var22 = var1; var22 >= 0; --var22) { // L: 184 if (this.tiles[var22][var2][var3] == null) { @@ -351,616 +339,620 @@ public class Scene { } } - this.tiles[var1][var2][var3].paint = var21; // L: 185 - } - } // L: 180 186 191 + this.tiles[var1][var2][var3].model = var23; // L: 185 + } else { + var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 - @ObfuscatedName("z") + for (var22 = var1; var22 >= 0; --var22) { // L: 179 + if (this.tiles[var22][var2][var3] == null) { + this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); + } + } + + this.tiles[var1][var2][var3].paint = var21; // L: 180 + } + } // L: 175 181 186 + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIILem;JI)V" + descriptor = "(IIIILfm;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) { - if (var5 != null) { // L: 194 - FloorDecoration var9 = new FloorDecoration(); // L: 195 - var9.renderable = var5; // L: 196 - var9.x = var2 * 128 + 64; // L: 197 - var9.y = var3 * 128 + 64; // L: 198 - var9.tileHeight = var4; // L: 199 - var9.tag = var6; // L: 200 - var9.flags = var8; // L: 201 - if (this.tiles[var1][var2][var3] == null) { // L: 202 + if (var5 != null) { // L: 189 + FloorDecoration var9 = new FloorDecoration(); // L: 190 + var9.renderable = var5; // L: 191 + var9.x = var2 * 128 + 64; // L: 192 + var9.y = var3 * 128 + 64; // L: 193 + var9.tileHeight = var4; // L: 194 + var9.tag = var6; // L: 195 + var9.flags = var8; // L: 196 + if (this.tiles[var1][var2][var3] == null) { // L: 197 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; // L: 203 + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 } - } // L: 204 + } // L: 199 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIILem;JLem;Lem;)V" + descriptor = "(IIIILfm;JLfm;Lfm;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) { - ItemLayer var10 = new ItemLayer(); // L: 207 - var10.first = var5; // L: 208 - var10.x = var2 * 128 + 64; // L: 209 - var10.y = var3 * 128 + 64; // L: 210 - var10.tileHeight = var4; // L: 211 - var10.tag = var6; // L: 212 - var10.second = var8; // L: 213 - var10.third = var9; // L: 214 - int var11 = 0; // L: 215 - Tile var12 = this.tiles[var1][var2][var3]; // L: 216 - if (var12 != null) { // L: 217 - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 218 - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 219 - Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 220 - var14.calculateBoundsCylinder(); // L: 221 - if (var14.height > var11) { // L: 222 + ItemLayer var10 = new ItemLayer(); // L: 202 + var10.first = var5; // L: 203 + var10.x = var2 * 128 + 64; // L: 204 + var10.y = var3 * 128 + 64; // L: 205 + var10.tileHeight = var4; // L: 206 + var10.tag = var6; // L: 207 + var10.second = var8; // L: 208 + var10.third = var9; // L: 209 + int var11 = 0; // L: 210 + Tile var12 = this.tiles[var1][var2][var3]; // L: 211 + if (var12 != null) { // L: 212 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214 + Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215 + var14.calculateBoundsCylinder(); // L: 216 + if (var14.height > var11) { // L: 217 var11 = var14.height; } } } } - var10.height = var11; // L: 226 + var10.height = var11; // L: 221 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 227 + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 } - this.tiles[var1][var2][var3].itemLayer = var10; // L: 228 - } // L: 229 + this.tiles[var1][var2][var3].itemLayer = var10; // L: 223 + } // L: 224 - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIILem;Lem;IIJI)V" + descriptor = "(IIIILfm;Lfm;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { // L: 232 - BoundaryObject var12 = new BoundaryObject(); // L: 233 - var12.tag = var9; // L: 234 - var12.flags = var11; // L: 235 - var12.x = var2 * 128 + 64; // L: 236 - var12.y = var3 * 128 + 64; // L: 237 - var12.tileHeight = var4; // L: 238 - var12.renderable1 = var5; // L: 239 - var12.renderable2 = var6; // L: 240 - var12.orientationA = var7; // L: 241 - var12.orientationB = var8; // L: 242 + if (var5 != null || var6 != null) { // L: 227 + BoundaryObject var12 = new BoundaryObject(); // L: 228 + var12.tag = var9; // L: 229 + var12.flags = var11; // L: 230 + var12.x = var2 * 128 + 64; // L: 231 + var12.y = var3 * 128 + 64; // L: 232 + var12.tileHeight = var4; // L: 233 + var12.renderable1 = var5; // L: 234 + var12.renderable2 = var6; // L: 235 + var12.orientationA = var7; // L: 236 + var12.orientationB = var8; // L: 237 for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 243 + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238 } } - this.tiles[var1][var2][var3].boundaryObject = var12; // L: 244 + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239 } - } // L: 245 + } // L: 240 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIILem;Lem;IIIIJI)V" + descriptor = "(IIIILfm;Lfm;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { // L: 248 - WallDecoration var14 = new WallDecoration(); // L: 249 - var14.tag = var11; // L: 250 - var14.flags = var13; // L: 251 - var14.x = var2 * 128 + 64; // L: 252 - var14.y = var3 * 128 + 64; // L: 253 - var14.tileHeight = var4; // L: 254 - var14.renderable1 = var5; // L: 255 - var14.renderable2 = var6; // L: 256 - var14.orientation = var7; // L: 257 - var14.orientation2 = var8; // L: 258 - var14.xOffset = var9; // L: 259 - var14.yOffset = var10; // L: 260 + if (var5 != null) { // L: 243 + WallDecoration var14 = new WallDecoration(); // L: 244 + var14.tag = var11; // L: 245 + var14.flags = var13; // L: 246 + var14.x = var2 * 128 + 64; // L: 247 + var14.y = var3 * 128 + 64; // L: 248 + var14.tileHeight = var4; // L: 249 + var14.renderable1 = var5; // L: 250 + var14.renderable2 = var6; // L: 251 + var14.orientation = var7; // L: 252 + var14.orientation2 = var8; // L: 253 + var14.xOffset = var9; // L: 254 + var14.yOffset = var10; // L: 255 for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 261 + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256 } } - this.tiles[var1][var2][var3].wallDecoration = var14; // L: 262 + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257 } - } // L: 263 + } // L: 258 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIIILem;IJI)Z" + descriptor = "(IIIIIILfm;IJI)Z" ) - public boolean method3400(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { - if (var7 == null) { // L: 266 + public boolean method3445(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 261 return true; } else { - int var12 = var5 * 64 + var2 * 128; // L: 267 - int var13 = var6 * 64 + var3 * 128; // L: 268 - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 269 + int var12 = var5 * 64 + var2 * 128; // L: 262 + int var13 = var6 * 64 + var3 * 128; // L: 263 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264 } } - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIIILem;IJZ)Z" + descriptor = "(IIIIILfm;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) { - if (var6 == null) { // L: 273 + if (var6 == null) { // L: 268 return true; } else { - int var11 = var2 - var5; // L: 274 - int var12 = var3 - var5; // L: 275 - int var13 = var5 + var2; // L: 276 - int var14 = var3 + var5; // L: 277 - if (var10) { // L: 278 - if (var7 > 640 && var7 < 1408) { // L: 279 + int var11 = var2 - var5; // L: 269 + int var12 = var3 - var5; // L: 270 + int var13 = var5 + var2; // L: 271 + int var14 = var3 + var5; // L: 272 + if (var10) { // L: 273 + if (var7 > 640 && var7 < 1408) { // L: 274 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { // L: 280 + if (var7 > 1152 && var7 < 1920) { // L: 275 var13 += 128; } - if (var7 > 1664 || var7 < 384) { // L: 281 + if (var7 > 1664 || var7 < 384) { // L: 276 var12 -= 128; } - if (var7 > 128 && var7 < 896) { // L: 282 + if (var7 > 128 && var7 < 896) { // L: 277 var11 -= 128; } } - var11 /= 128; // L: 284 - var12 /= 128; // L: 285 - var13 /= 128; // L: 286 - var14 /= 128; // L: 287 - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 288 + var11 /= 128; // L: 279 + var12 /= 128; // L: 280 + var13 /= 128; // L: 281 + var14 /= 128; // L: 282 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283 } } - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIIILem;IJIIII)Z" + descriptor = "(IIIIILfm;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) { - return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292 293 + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(IIIIIIIILem;IZJI)Z" + descriptor = "(IIIIIIIILfm;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) { int var16; - for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 297 - for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 298 - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 299 + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294 return false; } - Tile var23 = this.tiles[var1][var15][var16]; // L: 300 - if (var23 != null && var23.gameObjectsCount >= 5) { // L: 301 + Tile var23 = this.tiles[var1][var15][var16]; // L: 295 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 return false; } } } - GameObject var21 = new GameObject(); // L: 304 - var21.tag = var12; // L: 305 - var21.flags = var14; // L: 306 - var21.plane = var1; // L: 307 - var21.centerX = var6; // L: 308 - var21.centerY = var7; // L: 309 - var21.height = var8; // L: 310 - var21.renderable = var9; // L: 311 - var21.orientation = var10; // L: 312 - var21.startX = var2; // L: 313 - var21.startY = var3; // L: 314 - var21.endX = var2 + var4 - 1; // L: 315 - var21.endY = var3 + var5 - 1; // L: 316 + GameObject var21 = new GameObject(); // L: 299 + var21.tag = var12; // L: 300 + var21.flags = var14; // L: 301 + var21.plane = var1; // L: 302 + var21.centerX = var6; // L: 303 + var21.centerY = var7; // L: 304 + var21.height = var8; // L: 305 + var21.renderable = var9; // L: 306 + var21.orientation = var10; // L: 307 + var21.startX = var2; // L: 308 + var21.startY = var3; // L: 309 + var21.endX = var2 + var4 - 1; // L: 310 + var21.endY = var3 + var5 - 1; // L: 311 - for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 317 - for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 318 - int var18 = 0; // L: 319 - if (var16 > var2) { // L: 320 + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313 + int var18 = 0; // L: 314 + if (var16 > var2) { // L: 315 ++var18; } - if (var16 < var2 + var4 - 1) { // L: 321 + if (var16 < var2 + var4 - 1) { // L: 316 var18 += 4; } - if (var17 > var3) { // L: 322 + if (var17 > var3) { // L: 317 var18 += 8; } - if (var17 < var3 + var5 - 1) { // L: 323 + if (var17 < var3 + var5 - 1) { // L: 318 var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 324 + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319 } } - Tile var22 = this.tiles[var1][var16][var17]; // L: 325 - var22.gameObjects[var22.gameObjectsCount] = var21; // L: 326 - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 327 - var22.gameObjectsEdgeMask |= var18; // L: 329 - ++var22.gameObjectsCount; // L: 330 + Tile var22 = this.tiles[var1][var16][var17]; // L: 320 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322 + var22.gameObjectsEdgeMask |= var18; // L: 324 + ++var22.gameObjectsCount; // L: 325 } } - if (var11) { // L: 333 + if (var11) { // L: 328 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; // L: 334 + return true; // L: 329 } - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 338 - GameObject var2 = this.tempGameObjects[var1]; // L: 339 - this.removeGameObject(var2); // L: 340 - this.tempGameObjects[var1] = null; // L: 341 + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 + GameObject var2 = this.tempGameObjects[var1]; // L: 334 + this.removeGameObject(var2); // L: 335 + this.tempGameObjects[var1] = null; // L: 336 } - this.tempGameObjectsCount = 0; // L: 343 - } // L: 344 + this.tempGameObjectsCount = 0; // L: 338 + } // L: 339 - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lej;)V" + descriptor = "(Lgb;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 347 - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 348 - Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 349 - if (var4 != null) { // L: 350 + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344 + if (var4 != null) { // L: 345 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 351 - if (var4.gameObjects[var5] == var1) { // L: 352 - --var4.gameObjectsCount; // L: 353 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 + if (var4.gameObjects[var5] == var1) { // L: 347 + --var4.gameObjectsCount; // L: 348 - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 354 - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 355 - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 356 + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351 } - var4.gameObjects[var4.gameObjectsCount] = null; // L: 358 + var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 break; } } - var4.gameObjectsEdgeMask = 0; // L: 362 + var4.gameObjectsEdgeMask = 0; // L: 357 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 363 - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 365 + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 } } } } - } // L: 370 + } // L: 365 - @ObfuscatedName("x") - public void method3258(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; // L: 373 - if (var5 != null) { // L: 374 - WallDecoration var6 = var5.wallDecoration; // L: 375 - if (var6 != null) { // L: 376 - var6.xOffset = var4 * var6.xOffset / 16; // L: 377 - var6.yOffset = var4 * var6.yOffset / 16; // L: 378 + @ObfuscatedName("q") + public void method3538(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 368 + if (var5 != null) { // L: 369 + WallDecoration var6 = var5.wallDecoration; // L: 370 + if (var6 != null) { // L: 371 + var6.xOffset = var4 * var6.xOffset / 16; // L: 372 + var6.yOffset = var4 * var6.yOffset / 16; // L: 373 } } - } // L: 379 - - @ObfuscatedName("g") - @Export("removeBoundaryObject") - public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 382 - if (var4 != null) { - var4.boundaryObject = null; // L: 384 - } - } // L: 383 385 - - @ObfuscatedName("u") - @Export("removeWallDecoration") - public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 388 - if (var4 != null) { - var4.wallDecoration = null; // L: 390 - } - } // L: 389 391 + } // L: 374 @ObfuscatedName("t") + @Export("removeBoundaryObject") + public void removeBoundaryObject(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 377 + if (var4 != null) { + var4.boundaryObject = null; // L: 379 + } + } // L: 378 380 + + @ObfuscatedName("v") + @Export("removeWallDecoration") + public void removeWallDecoration(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 383 + if (var4 != null) { + var4.wallDecoration = null; // L: 385 + } + } // L: 384 386 + + @ObfuscatedName("x") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 394 - if (var4 != null) { // L: 395 - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 396 - GameObject var6 = var4.gameObjects[var5]; // L: 397 - long var8 = var6.tag; // L: 399 - boolean var7 = FontName.method5502(var8) == 2; // L: 401 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 403 - this.removeGameObject(var6); // L: 404 - return; // L: 405 + Tile var4 = this.tiles[var1][var2][var3]; // L: 389 + if (var4 != null) { // L: 390 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391 + GameObject var6 = var4.gameObjects[var5]; // L: 392 + if (class23.method341(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 + this.removeGameObject(var6); // L: 394 + return; // L: 395 } } } - } // L: 408 + } // L: 398 - @ObfuscatedName("p") + @ObfuscatedName("z") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 411 + Tile var4 = this.tiles[var1][var2][var3]; // L: 401 if (var4 != null) { - var4.floorDecoration = null; // L: 413 + var4.floorDecoration = null; // L: 403 } - } // L: 412 414 + } // L: 402 404 - @ObfuscatedName("o") + @ObfuscatedName("i") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 417 + Tile var4 = this.tiles[var1][var2][var3]; // L: 407 if (var4 != null) { - var4.itemLayer = null; // L: 419 + var4.itemLayer = null; // L: 409 } - } // L: 418 420 + } // L: 408 410 - @ObfuscatedName("ay") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(III)Lee;" + descriptor = "(III)Lgs;" ) - public BoundaryObject method3351(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 423 - return var4 == null ? null : var4.boundaryObject; // L: 424 425 + public BoundaryObject method3457(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 413 + return var4 == null ? null : var4.boundaryObject; // L: 414 415 } - @ObfuscatedName("am") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(III)Leu;" + descriptor = "(III)Lgh;" ) - public WallDecoration method3264(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 429 - return var4 == null ? null : var4.wallDecoration; // L: 430 431 + public WallDecoration method3458(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 419 + return var4 == null ? null : var4.wallDecoration; // L: 420 421 } - @ObfuscatedName("ag") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(III)Lej;" + descriptor = "(III)Lgb;" ) - public GameObject method3385(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 435 - if (var4 == null) { // L: 436 + public GameObject method3459(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 425 + if (var4 == null) { // L: 426 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 437 - GameObject var6 = var4.gameObjects[var5]; // L: 438 - long var8 = var6.tag; // L: 440 - boolean var7 = FontName.method5502(var8) == 2; // L: 442 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 444 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 + GameObject var6 = var4.gameObjects[var5]; // L: 428 + if (class23.method341(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 return var6; } } - return null; // L: 446 + return null; // L: 431 } } - @ObfuscatedName("ae") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(III)Len;" + descriptor = "(III)Lfz;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 450 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 451 452 + Tile var4 = this.tiles[var1][var2][var3]; // L: 435 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 } @ObfuscatedName("ac") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 456 - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 457 458 + Tile var4 = this.tiles[var1][var2][var3]; // L: 441 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 462 - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 463 464 + Tile var4 = this.tiles[var1][var2][var3]; // L: 447 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 } - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 468 - if (var4 == null) { // L: 469 + Tile var4 = this.tiles[var1][var2][var3]; // L: 453 + if (var4 == null) { // L: 454 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 470 - GameObject var6 = var4.gameObjects[var5]; // L: 471 - long var8 = var6.tag; // L: 473 - boolean var7 = FontName.method5502(var8) == 2; // L: 475 - if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 477 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 + GameObject var6 = var4.gameObjects[var5]; // L: 456 + if (class23.method341(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 return var6.tag; } } - return 0L; // L: 479 + return 0L; // L: 459 } } - @ObfuscatedName("ak") + @ObfuscatedName("ag") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; // L: 483 - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 484 485 + Tile var4 = this.tiles[var1][var2][var3]; // L: 463 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 } - @ObfuscatedName("ax") + @ObfuscatedName("aq") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; // L: 489 - if (var6 == null) { // L: 490 + Tile var6 = this.tiles[var1][var2][var3]; // L: 469 + if (var6 == null) { // L: 470 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 491 + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 492 + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 493 + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 494 - if (var6.gameObjects[var7].tag == var4) { // L: 495 + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 + if (var6.gameObjects[var7].tag == var4) { // L: 475 return var6.gameObjects[var7].flags & 255; } } - return -1; // L: 497 + return -1; // L: 477 } } - @ObfuscatedName("ar") - public void method3263(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { // L: 501 - for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 502 - for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 503 - Tile var7 = this.tiles[var4][var5][var6]; // L: 504 - if (var7 != null) { // L: 505 - BoundaryObject var8 = var7.boundaryObject; // L: 506 + @ObfuscatedName("at") + public void method3466(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483 + Tile var7 = this.tiles[var4][var5][var6]; // L: 484 + if (var7 != null) { // L: 485 + BoundaryObject var8 = var7.boundaryObject; // L: 486 ModelData var10; - if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 507 - ModelData var9 = (ModelData)var8.renderable1; // L: 508 - this.method3406(var9, var4, var5, var6, 1, 1); // L: 509 - if (var8.renderable2 instanceof ModelData) { // L: 510 - var10 = (ModelData)var8.renderable2; // L: 511 - this.method3406(var10, var4, var5, var6, 1, 1); // L: 512 - ModelData.method2960(var9, var10, 0, 0, 0, false); // L: 513 - var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 514 + if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487 + ModelData var9 = (ModelData)var8.renderable1; // L: 488 + this.method3468(var9, var4, var5, var6, 1, 1); // L: 489 + if (var8.renderable2 instanceof ModelData) { // L: 490 + var10 = (ModelData)var8.renderable2; // L: 491 + this.method3468(var10, var4, var5, var6, 1, 1); // L: 492 + ModelData.method3343(var9, var10, 0, 0, 0, false); // L: 493 + var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 } - var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 516 + var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 518 - GameObject var14 = var7.gameObjects[var12]; // L: 519 - if (var14 != null && var14.renderable instanceof ModelData) { // L: 520 - ModelData var11 = (ModelData)var14.renderable; // L: 521 - this.method3406(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 522 - var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 523 + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498 + GameObject var14 = var7.gameObjects[var12]; // L: 499 + if (var14 != null && var14.renderable instanceof ModelData) { // L: 500 + ModelData var11 = (ModelData)var14.renderable; // L: 501 + this.method3468(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 + var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503 } } - FloorDecoration var13 = var7.floorDecoration; // L: 526 - if (var13 != null && var13.renderable instanceof ModelData) { // L: 527 - var10 = (ModelData)var13.renderable; // L: 528 - this.method3315(var10, var4, var5, var6); // L: 529 - var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 530 + FloorDecoration var13 = var7.floorDecoration; // L: 506 + if (var13 != null && var13.renderable instanceof ModelData) { // L: 507 + var10 = (ModelData)var13.renderable; // L: 508 + this.method3467(var10, var4, var5, var6); // L: 509 + var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 } } } } } - } // L: 536 + } // L: 516 - @ObfuscatedName("al") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lek;III)V" + descriptor = "(Lfs;III)V" ) - void method3315(ModelData var1, int var2, int var3, int var4) { + void method3467(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { // L: 539 - var5 = this.tiles[var2][var3 + 1][var4]; // L: 540 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 541 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 542 - ModelData.method2960(var1, var6, 128, 0, 0, true); // L: 543 + if (var3 < this.xSize) { // L: 519 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 522 + ModelData.method3343(var1, var6, 128, 0, 0, true); // L: 523 } } - if (var4 < this.xSize) { // L: 546 - var5 = this.tiles[var2][var3][var4 + 1]; // L: 547 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 548 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 549 - ModelData.method2960(var1, var6, 0, 0, 128, true); // L: 550 + if (var4 < this.xSize) { // L: 526 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 527 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 529 + ModelData.method3343(var1, var6, 0, 0, 128, true); // L: 530 } } - if (var3 < this.xSize && var4 < this.ySize) { // L: 553 - var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 554 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 555 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 556 - ModelData.method2960(var1, var6, 128, 0, 128, true); // L: 557 + if (var3 < this.xSize && var4 < this.ySize) { // L: 533 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 536 + ModelData.method3343(var1, var6, 128, 0, 128, true); // L: 537 } } - if (var3 < this.xSize && var4 > 0) { // L: 560 - var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 561 - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 562 - var6 = (ModelData)var5.floorDecoration.renderable; // L: 563 - ModelData.method2960(var1, var6, 128, 0, -128, true); // L: 564 + if (var3 < this.xSize && var4 > 0) { // L: 540 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542 + var6 = (ModelData)var5.floorDecoration.renderable; // L: 543 + ModelData.method3343(var1, var6, 128, 0, -128, true); // L: 544 } } - } // L: 567 + } // L: 547 - @ObfuscatedName("aa") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lek;IIIII)V" + descriptor = "(Lfs;IIIII)V" ) - void method3406(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; // L: 570 - int var8 = var3; // L: 571 - int var9 = var3 + var5; // L: 572 - int var10 = var4 - 1; // L: 573 - int var11 = var4 + var6; // L: 574 + void method3468(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 550 + int var8 = var3; // L: 551 + int var9 = var3 + var5; // L: 552 + int var10 = var4 - 1; // L: 553 + int var11 = var4 + var6; // L: 554 - for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 575 - if (var12 != this.planes) { // L: 576 - for (int var13 = var8; var13 <= var9; ++var13) { // L: 577 - if (var13 >= 0 && var13 < this.xSize) { // L: 578 - for (int var14 = var10; var14 <= var11; ++var14) { // L: 579 - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 580 581 - Tile var15 = this.tiles[var12][var13][var14]; // L: 582 - if (var15 != null) { // L: 583 - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 584 - BoundaryObject var17 = var15.boundaryObject; // L: 585 - if (var17 != null) { // L: 586 + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555 + if (var12 != this.planes) { // L: 556 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 557 + if (var13 >= 0 && var13 < this.xSize) { // L: 558 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 559 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561 + Tile var15 = this.tiles[var12][var13][var14]; // L: 562 + if (var15 != null) { // L: 563 + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564 + BoundaryObject var17 = var15.boundaryObject; // L: 565 + if (var17 != null) { // L: 566 ModelData var18; - if (var17.renderable1 instanceof ModelData) { // L: 587 - var18 = (ModelData)var17.renderable1; // L: 588 - ModelData.method2960(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 589 + if (var17.renderable1 instanceof ModelData) { // L: 567 + var18 = (ModelData)var17.renderable1; // L: 568 + ModelData.method3343(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 } - if (var17.renderable2 instanceof ModelData) { // L: 591 - var18 = (ModelData)var17.renderable2; // L: 592 - ModelData.method2960(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 593 + if (var17.renderable2 instanceof ModelData) { // L: 571 + var18 = (ModelData)var17.renderable2; // L: 572 + ModelData.method3343(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 596 - GameObject var19 = var15.gameObjects[var23]; // L: 597 - if (var19 != null && var19.renderable instanceof ModelData) { // L: 598 - ModelData var20 = (ModelData)var19.renderable; // L: 599 - int var21 = var19.endX - var19.startX + 1; // L: 600 - int var22 = var19.endY - var19.startY + 1; // L: 601 - ModelData.method2960(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 602 + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576 + GameObject var19 = var15.gameObjects[var23]; // L: 577 + if (var19 != null && var19.renderable instanceof ModelData) { // L: 578 + ModelData var20 = (ModelData)var19.renderable; // L: 579 + int var21 = var19.endX - var19.startX + 1; // L: 580 + int var22 = var19.endY - var19.startY + 1; // L: 581 + ModelData.method3343(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 } } } @@ -969,179 +961,179 @@ public class Scene { } } - --var8; // L: 607 - var7 = false; // L: 608 + --var8; // L: 587 + var7 = false; // L: 588 } } - } // L: 610 + } // L: 590 - @ObfuscatedName("as") + @ObfuscatedName("ap") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; // L: 613 - if (var7 != null) { // L: 614 - SceneTilePaint var8 = var7.paint; // L: 615 + Tile var7 = this.tiles[var4][var5][var6]; // L: 593 + if (var7 != null) { // L: 594 + SceneTilePaint var8 = var7.paint; // L: 595 int var10; - if (var8 != null) { // L: 616 - int var18 = var8.rgb; // L: 617 - if (var18 != 0) { // L: 618 - for (var10 = 0; var10 < 4; ++var10) { // L: 619 - var1[var2] = var18; // L: 620 - var1[var2 + 1] = var18; // L: 621 - var1[var2 + 2] = var18; // L: 622 - var1[var2 + 3] = var18; // L: 623 - var2 += var3; // L: 624 + if (var8 != null) { // L: 596 + int var18 = var8.rgb; // L: 597 + if (var18 != 0) { // L: 598 + for (var10 = 0; var10 < 4; ++var10) { // L: 599 + var1[var2] = var18; // L: 600 + var1[var2 + 1] = var18; // L: 601 + var1[var2 + 2] = var18; // L: 602 + var1[var2 + 3] = var18; // L: 603 + var2 += var3; // L: 604 } } } else { - SceneTileModel var9 = var7.model; // L: 628 - if (var9 != null) { // L: 629 - var10 = var9.shape; // L: 630 - int var11 = var9.rotation; // L: 631 - int var12 = var9.underlayRgb; // L: 632 - int var13 = var9.overlayRgb; // L: 633 - int[] var14 = this.tileShape2D[var10]; // L: 634 - int[] var15 = this.tileRotation2D[var11]; // L: 635 - int var16 = 0; // L: 636 + SceneTileModel var9 = var7.model; // L: 608 + if (var9 != null) { // L: 609 + var10 = var9.shape; // L: 610 + int var11 = var9.rotation; // L: 611 + int var12 = var9.underlayRgb; // L: 612 + int var13 = var9.overlayRgb; // L: 613 + int[] var14 = this.tileShape2D[var10]; // L: 614 + int[] var15 = this.tileRotation2D[var11]; // L: 615 + int var16 = 0; // L: 616 int var17; - if (var12 != 0) { // L: 637 - for (var17 = 0; var17 < 4; ++var17) { // L: 638 - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 639 - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 640 - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 641 - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 642 - var2 += var3; // L: 643 + if (var12 != 0) { // L: 617 + for (var17 = 0; var17 < 4; ++var17) { // L: 618 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622 + var2 += var3; // L: 623 } } else { - for (var17 = 0; var17 < 4; ++var17) { // L: 647 - if (var14[var15[var16++]] != 0) { // L: 648 + for (var17 = 0; var17 < 4; ++var17) { // L: 627 + if (var14[var15[var16++]] != 0) { // L: 628 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 649 + if (var14[var15[var16++]] != 0) { // L: 629 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { // L: 650 + if (var14[var15[var16++]] != 0) { // L: 630 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { // L: 651 + if (var14[var15[var16++]] != 0) { // L: 631 var1[var2 + 3] = var13; } - var2 += var3; // L: 652 + var2 += var3; // L: 632 } } } } } - } // L: 626 655 + } // L: 606 635 - @ObfuscatedName("ah") + @ObfuscatedName("ad") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!shouldSendWalk() || var4) { // L: 734 - checkClick = true; // L: 735 - viewportWalking = var4; // L: 736 - Scene_selectedPlane = var1; // L: 737 - Scene_selectedScreenX = var2; // L: 738 - Scene_selectedScreenY = var3; // L: 739 - Scene_selectedX = -1; // L: 740 - Scene_selectedY = -1; // L: 741 + if (!shouldSendWalk() || var4) { // L: 714 + checkClick = true; // L: 715 + viewportWalking = var4; // L: 716 + Scene_selectedPlane = var1; // L: 717 + Scene_selectedScreenX = var2; // L: 718 + Scene_selectedScreenY = var3; // L: 719 + Scene_selectedX = -1; // L: 720 + Scene_selectedY = -1; // L: 721 } - } // L: 742 + } // L: 722 - @ObfuscatedName("ap") + @ObfuscatedName("af") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; // L: 745 - } // L: 746 + viewportWalking = true; // L: 725 + } // L: 726 - @ObfuscatedName("ai") + @ObfuscatedName("av") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { // L: 758 + if (var1 < 0) { // L: 738 var1 = 0; - } else if (var1 >= this.xSize * 128) { // L: 759 + } else if (var1 >= this.xSize * 128) { // L: 739 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { // L: 760 + if (var3 < 0) { // L: 740 var3 = 0; - } else if (var3 >= this.ySize * 128) { // L: 761 + } else if (var3 >= this.ySize * 128) { // L: 741 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { // L: 762 + if (var4 < 128) { // L: 742 var4 = 128; - } else if (var4 > 383) { // L: 763 + } else if (var4 > 383) { // L: 743 var4 = 383; } - ++Scene_drawnCount; // L: 764 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 765 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 766 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 767 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 768 - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 769 - Scene_cameraX = var1; // L: 770 - Scene_cameraY = var2; // L: 771 - Scene_cameraZ = var3; // L: 772 - Scene_cameraXTile = var1 / 128; // L: 773 - Scene_cameraYTile = var3 / 128; // L: 774 - Scene_plane = var6; // L: 775 - Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 776 - if (Scene_cameraXTileMin < 0) { // L: 777 + ++Scene_drawnCount; // L: 744 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749 + Scene_cameraX = var1; // L: 750 + Scene_cameraY = var2; // L: 751 + Scene_cameraZ = var3; // L: 752 + Scene_cameraXTile = var1 / 128; // L: 753 + Scene_cameraYTile = var3 / 128; // L: 754 + Scene_plane = var6; // L: 755 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756 + if (Scene_cameraXTileMin < 0) { // L: 757 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 778 - if (Scene_cameraYTileMin < 0) { // L: 779 + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 + if (Scene_cameraYTileMin < 0) { // L: 759 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 780 - if (Scene_cameraXTileMax > this.xSize) { // L: 781 + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 + if (Scene_cameraXTileMax > this.xSize) { // L: 761 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 782 - if (Scene_cameraYTileMax > this.ySize) { // L: 783 + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 + if (Scene_cameraYTileMax > this.ySize) { // L: 763 Scene_cameraYTileMax = this.ySize; } - this.occlude(); // L: 784 - tileUpdateCount = 0; // L: 785 + this.occlude(); // L: 764 + tileUpdateCount = 0; // L: 765 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 786 - var8 = this.tiles[var7]; // L: 787 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 + var8 = this.tiles[var7]; // L: 767 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 788 - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 789 - Tile var16 = var8[var9][var10]; // L: 790 - if (var16 != null) { // L: 791 - if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 792 - var16.drawPrimary = true; // L: 798 - var16.drawSecondary = true; // L: 799 - if (var16.gameObjectsCount > 0) { // L: 800 + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769 + Tile var16 = var8[var9][var10]; // L: 770 + if (var16 != null) { // L: 771 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772 + var16.drawPrimary = true; // L: 778 + var16.drawSecondary = true; // L: 779 + if (var16.gameObjectsCount > 0) { // L: 780 var16.drawGameObjects = true; } else { - var16.drawGameObjects = false; // L: 801 + var16.drawGameObjects = false; // L: 781 } - ++tileUpdateCount; // L: 802 + ++tileUpdateCount; // L: 782 } else { - var16.drawPrimary = false; // L: 793 - var16.drawSecondary = false; // L: 794 - var16.drawGameObjectEdges = 0; // L: 795 + var16.drawPrimary = false; // L: 773 + var16.drawSecondary = false; // L: 774 + var16.drawGameObjectEdges = 0; // L: 775 } } } @@ -1153,118 +1145,118 @@ public class Scene { int var13; int var14; Tile var15; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 808 - var8 = this.tiles[var7]; // L: 809 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 + var8 = this.tiles[var7]; // L: 789 - for (var9 = -25; var9 <= 0; ++var9) { // L: 810 - var10 = var9 + Scene_cameraXTile; // L: 811 - var11 = Scene_cameraXTile - var9; // L: 812 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 813 - for (var12 = -25; var12 <= 0; ++var12) { // L: 814 - var13 = var12 + Scene_cameraYTile; // L: 815 - var14 = Scene_cameraYTile - var12; // L: 816 - if (var10 >= Scene_cameraXTileMin) { // L: 817 - if (var13 >= Scene_cameraYTileMin) { // L: 818 - var15 = var8[var10][var13]; // L: 819 - if (var15 != null && var15.drawPrimary) { // L: 820 + for (var9 = -25; var9 <= 0; ++var9) { // L: 790 + var10 = var9 + Scene_cameraXTile; // L: 791 + var11 = Scene_cameraXTile - var9; // L: 792 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793 + for (var12 = -25; var12 <= 0; ++var12) { // L: 794 + var13 = var12 + Scene_cameraYTile; // L: 795 + var14 = Scene_cameraYTile - var12; // L: 796 + if (var10 >= Scene_cameraXTileMin) { // L: 797 + if (var13 >= Scene_cameraYTileMin) { // L: 798 + var15 = var8[var10][var13]; // L: 799 + if (var15 != null && var15.drawPrimary) { // L: 800 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 822 - var15 = var8[var10][var14]; // L: 823 - if (var15 != null && var15.drawPrimary) { // L: 824 + if (var14 < Scene_cameraYTileMax) { // L: 802 + var15 = var8[var10][var14]; // L: 803 + if (var15 != null && var15.drawPrimary) { // L: 804 this.drawTile(var15, true); } } } - if (var11 < Scene_cameraXTileMax) { // L: 827 - if (var13 >= Scene_cameraYTileMin) { // L: 828 - var15 = var8[var11][var13]; // L: 829 - if (var15 != null && var15.drawPrimary) { // L: 830 + if (var11 < Scene_cameraXTileMax) { // L: 807 + if (var13 >= Scene_cameraYTileMin) { // L: 808 + var15 = var8[var11][var13]; // L: 809 + if (var15 != null && var15.drawPrimary) { // L: 810 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { // L: 832 - var15 = var8[var11][var14]; // L: 833 - if (var15 != null && var15.drawPrimary) { // L: 834 + if (var14 < Scene_cameraYTileMax) { // L: 812 + var15 = var8[var11][var14]; // L: 813 + if (var15 != null && var15.drawPrimary) { // L: 814 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { // L: 837 - checkClick = false; // L: 838 - return; // L: 839 + if (tileUpdateCount == 0) { // L: 817 + checkClick = false; // L: 818 + return; // L: 819 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 845 - var8 = this.tiles[var7]; // L: 846 + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 + var8 = this.tiles[var7]; // L: 826 - for (var9 = -25; var9 <= 0; ++var9) { // L: 847 - var10 = var9 + Scene_cameraXTile; // L: 848 - var11 = Scene_cameraXTile - var9; // L: 849 - if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 850 - for (var12 = -25; var12 <= 0; ++var12) { // L: 851 - var13 = var12 + Scene_cameraYTile; // L: 852 - var14 = Scene_cameraYTile - var12; // L: 853 - if (var10 >= Scene_cameraXTileMin) { // L: 854 - if (var13 >= Scene_cameraYTileMin) { // L: 855 - var15 = var8[var10][var13]; // L: 856 - if (var15 != null && var15.drawPrimary) { // L: 857 + for (var9 = -25; var9 <= 0; ++var9) { // L: 827 + var10 = var9 + Scene_cameraXTile; // L: 828 + var11 = Scene_cameraXTile - var9; // L: 829 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830 + for (var12 = -25; var12 <= 0; ++var12) { // L: 831 + var13 = var12 + Scene_cameraYTile; // L: 832 + var14 = Scene_cameraYTile - var12; // L: 833 + if (var10 >= Scene_cameraXTileMin) { // L: 834 + if (var13 >= Scene_cameraYTileMin) { // L: 835 + var15 = var8[var10][var13]; // L: 836 + if (var15 != null && var15.drawPrimary) { // L: 837 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { // L: 859 - var15 = var8[var10][var14]; // L: 860 - if (var15 != null && var15.drawPrimary) { // L: 861 + if (var14 < Scene_cameraYTileMax) { // L: 839 + var15 = var8[var10][var14]; // L: 840 + if (var15 != null && var15.drawPrimary) { + this.drawTile(var15, false); // L: 841 + } + } + } + + if (var11 < Scene_cameraXTileMax) { // L: 844 + if (var13 >= Scene_cameraYTileMin) { // L: 845 + var15 = var8[var11][var13]; // L: 846 + if (var15 != null && var15.drawPrimary) { // L: 847 + this.drawTile(var15, false); + } + } + + if (var14 < Scene_cameraYTileMax) { // L: 849 + var15 = var8[var11][var14]; // L: 850 + if (var15 != null && var15.drawPrimary) { // L: 851 this.drawTile(var15, false); } } } - if (var11 < Scene_cameraXTileMax) { // L: 864 - if (var13 >= Scene_cameraYTileMin) { // L: 865 - var15 = var8[var11][var13]; // L: 866 - if (var15 != null && var15.drawPrimary) { // L: 867 - this.drawTile(var15, false); - } - } - - if (var14 < Scene_cameraYTileMax) { // L: 869 - var15 = var8[var11][var14]; // L: 870 - if (var15 != null && var15.drawPrimary) { // L: 871 - this.drawTile(var15, false); - } - } - } - - if (tileUpdateCount == 0) { // L: 874 - checkClick = false; // L: 875 - return; // L: 876 + if (tileUpdateCount == 0) { // L: 854 + checkClick = false; // L: 855 + return; // L: 856 } } } } } - checkClick = false; // L: 882 - } // L: 883 + checkClick = false; // L: 862 + } // L: 863 - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Les;Z)V" + descriptor = "(Lfx;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); // L: 886 + Scene_tilesDeque.addFirst(var1); // L: 866 while (true) { Tile var3; @@ -1296,227 +1288,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 888 - if (var3 == null) { // L: 889 + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 + if (var3 == null) { // L: 869 return; } - } while(!var3.drawSecondary); // L: 890 + } while(!var3.drawSecondary); // L: 870 - var4 = var3.x; // L: 891 - var5 = var3.y; // L: 892 - var6 = var3.plane; // L: 893 - var7 = var3.originalPlane; // L: 894 - var8 = this.tiles[var6]; // L: 895 - if (!var3.drawPrimary) { // L: 896 + var4 = var3.x; // L: 871 + var5 = var3.y; // L: 872 + var6 = var3.plane; // L: 873 + var7 = var3.originalPlane; // L: 874 + var8 = this.tiles[var6]; // L: 875 + if (!var3.drawPrimary) { // L: 876 break; } - if (var2) { // L: 897 - if (var6 > 0) { // L: 898 - var9 = this.tiles[var6 - 1][var4][var5]; // L: 899 - if (var9 != null && var9.drawSecondary) { // L: 900 + if (var2) { // L: 877 + if (var6 > 0) { // L: 878 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 879 + if (var9 != null && var9.drawSecondary) { // L: 880 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 902 - var9 = var8[var4 - 1][var5]; // L: 903 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 904 + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882 + var9 = var8[var4 - 1][var5]; // L: 883 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 906 - var9 = var8[var4 + 1][var5]; // L: 907 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 908 + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886 + var9 = var8[var4 + 1][var5]; // L: 887 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 910 - var9 = var8[var4][var5 - 1]; // L: 911 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 912 + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890 + var9 = var8[var4][var5 - 1]; // L: 891 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 914 - var9 = var8[var4][var5 + 1]; // L: 915 - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 916 + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894 + var9 = var8[var4][var5 + 1]; // L: 895 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896 continue; } } } else { - var2 = true; // L: 919 + var2 = true; // L: 899 } - var3.drawPrimary = false; // L: 920 - if (var3.linkedBelowTile != null) { // L: 921 - var9 = var3.linkedBelowTile; // L: 922 - if (var9.paint != null) { // L: 923 - if (!this.method3245(0, var4, var5)) { // L: 924 + var3.drawPrimary = false; // L: 900 + if (var3.linkedBelowTile != null) { // L: 901 + var9 = var3.linkedBelowTile; // L: 902 + if (var9.paint != null) { // L: 903 + if (!this.method3483(0, var4, var5)) { // L: 904 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3245(0, var4, var5)) { // L: 926 927 + } else if (var9.model != null && !this.method3483(0, var4, var5)) { // L: 906 907 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; // L: 929 - if (var10 != null) { // L: 930 + var10 = var9.boundaryObject; // L: 909 + if (var10 != null) { // L: 910 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931 - var12 = var9.gameObjects[var11]; // L: 932 - if (var12 != null) { // L: 933 + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 + var12 = var9.gameObjects[var11]; // L: 912 + if (var12 != null) { // L: 913 var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; // L: 936 - if (var3.paint != null) { // L: 937 - if (!this.method3245(var7, var4, var5)) { // L: 938 - var20 = true; // L: 939 - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 940 + var20 = false; // L: 916 + if (var3.paint != null) { // L: 917 + if (!this.method3483(var7, var4, var5)) { // L: 918 + var20 = true; // L: 919 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3245(var7, var4, var5)) { // L: 943 944 - var20 = true; // L: 945 - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 946 + } else if (var3.model != null && !this.method3483(var7, var4, var5)) { // L: 923 924 + var20 = true; // L: 925 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926 } - var21 = 0; // L: 949 - var11 = 0; // L: 950 - BoundaryObject var31 = var3.boundaryObject; // L: 951 - WallDecoration var13 = var3.wallDecoration; // L: 952 - if (var31 != null || var13 != null) { // L: 953 - if (var4 == Scene_cameraXTile) { // L: 954 + var21 = 0; // L: 929 + var11 = 0; // L: 930 + BoundaryObject var31 = var3.boundaryObject; // L: 931 + WallDecoration var13 = var3.wallDecoration; // L: 932 + if (var31 != null || var13 != null) { // L: 933 + if (var4 == Scene_cameraXTile) { // L: 934 ++var21; - } else if (Scene_cameraXTile < var4) { // L: 955 + } else if (Scene_cameraXTile < var4) { // L: 935 var21 += 2; } - if (var5 == Scene_cameraYTile) { // L: 956 + if (var5 == Scene_cameraYTile) { // L: 936 var21 += 3; - } else if (Scene_cameraYTile > var5) { // L: 957 + } else if (Scene_cameraYTile > var5) { // L: 937 var21 += 6; } - var11 = field1860[var21]; // L: 958 - var3.field1668 = field1862[var21]; // L: 959 + var11 = field1977[var21]; // L: 938 + var3.field1882 = field1979[var21]; // L: 939 } - if (var31 != null) { // L: 961 - if ((var31.orientationA & field1861[var21]) != 0) { // L: 962 - if (var31.orientationA == 16) { // L: 963 - var3.drawGameObjectEdges = 3; // L: 964 - var3.field1667 = field1863[var21]; // L: 965 - var3.field1680 = 3 - var3.field1667; // L: 966 - } else if (var31.orientationA == 32) { // L: 968 - var3.drawGameObjectEdges = 6; // L: 969 - var3.field1667 = field1864[var21]; // L: 970 - var3.field1680 = 6 - var3.field1667; // L: 971 - } else if (var31.orientationA == 64) { // L: 973 - var3.drawGameObjectEdges = 12; // L: 974 - var3.field1667 = field1845[var21]; // L: 975 - var3.field1680 = 12 - var3.field1667; // L: 976 + if (var31 != null) { // L: 941 + if ((var31.orientationA & field1978[var21]) != 0) { // L: 942 + if (var31.orientationA == 16) { // L: 943 + var3.drawGameObjectEdges = 3; // L: 944 + var3.field1889 = field1980[var21]; // L: 945 + var3.field1890 = 3 - var3.field1889; // L: 946 + } else if (var31.orientationA == 32) { // L: 948 + var3.drawGameObjectEdges = 6; // L: 949 + var3.field1889 = field1981[var21]; // L: 950 + var3.field1890 = 6 - var3.field1889; // L: 951 + } else if (var31.orientationA == 64) { // L: 953 + var3.drawGameObjectEdges = 12; // L: 954 + var3.field1889 = field1982[var21]; // L: 955 + var3.field1890 = 12 - var3.field1889; // L: 956 } else { - var3.drawGameObjectEdges = 9; // L: 979 - var3.field1667 = field1866[var21]; // L: 980 - var3.field1680 = 9 - var3.field1667; // L: 981 + var3.drawGameObjectEdges = 9; // L: 959 + var3.field1889 = field1931[var21]; // L: 960 + var3.field1890 = 9 - var3.field1889; // L: 961 } } else { - var3.drawGameObjectEdges = 0; // L: 984 + var3.drawGameObjectEdges = 0; // L: 964 } - if ((var31.orientationA & var11) != 0 && !this.method3290(var7, var4, var5, var31.orientationA)) { // L: 985 + if ((var31.orientationA & var11) != 0 && !this.method3484(var7, var4, var5, var31.orientationA)) { // L: 965 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.method3290(var7, var4, var5, var31.orientationB)) { // L: 986 + if ((var31.orientationB & var11) != 0 && !this.method3484(var7, var4, var5, var31.orientationB)) { // L: 966 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.method3261(var7, var4, var5, var13.renderable1.height)) { // L: 988 - if ((var13.orientation & var11) != 0) { // L: 989 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 990 - } else if (var13.orientation == 256) { // L: 992 - var14 = var13.x - Scene_cameraX; // L: 993 - var15 = var13.tileHeight - Scene_cameraY; // L: 994 - var16 = var13.y - Scene_cameraZ; // L: 995 - var17 = var13.orientation2; // L: 996 - if (var17 != 1 && var17 != 2) { // L: 998 - var18 = var14; // L: 999 + if (var13 != null && !this.method3485(var7, var4, var5, var13.renderable1.height)) { // L: 968 + if ((var13.orientation & var11) != 0) { // L: 969 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970 + } else if (var13.orientation == 256) { // L: 972 + var14 = var13.x - Scene_cameraX; // L: 973 + var15 = var13.tileHeight - Scene_cameraY; // L: 974 + var16 = var13.y - Scene_cameraZ; // L: 975 + var17 = var13.orientation2; // L: 976 + if (var17 != 1 && var17 != 2) { // L: 978 + var18 = var14; // L: 979 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { // L: 1001 - var19 = var16; // L: 1002 + if (var17 != 2 && var17 != 3) { // L: 981 + var19 = var16; // L: 982 } else { var19 = -var16; } - if (var19 < var18) { // L: 1003 - var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1004 - } else if (var13.renderable2 != null) { // L: 1006 - var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1007 + if (var19 < var18) { // L: 983 + var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984 + } else if (var13.renderable2 != null) { // L: 986 + var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987 } } } - if (var20) { // L: 1011 - FloorDecoration var22 = var3.floorDecoration; // L: 1012 - if (var22 != null) { // L: 1013 + if (var20) { // L: 991 + FloorDecoration var22 = var3.floorDecoration; // L: 992 + if (var22 != null) { // L: 993 var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - ItemLayer var23 = var3.itemLayer; // L: 1014 - if (var23 != null && var23.height == 0) { // L: 1015 - if (var23.second != null) { // L: 1016 + ItemLayer var23 = var3.itemLayer; // L: 994 + if (var23 != null && var23.height == 0) { // L: 995 + if (var23.second != null) { // L: 996 var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { // L: 1017 + if (var23.third != null) { // L: 997 var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { // L: 1018 + if (var23.first != null) { // L: 998 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; // L: 1021 - if (var14 != 0) { // L: 1022 - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1023 - var36 = var8[var4 + 1][var5]; // L: 1024 - if (var36 != null && var36.drawSecondary) { // L: 1025 + var14 = var3.gameObjectsEdgeMask; // L: 1001 + if (var14 != 0) { // L: 1002 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003 + var36 = var8[var4 + 1][var5]; // L: 1004 + if (var36 != null && var36.drawSecondary) { // L: 1005 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1027 - var36 = var8[var4][var5 + 1]; // L: 1028 - if (var36 != null && var36.drawSecondary) { // L: 1029 + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 + var36 = var8[var4][var5 + 1]; // L: 1008 + if (var36 != null && var36.drawSecondary) { // L: 1009 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1031 - var36 = var8[var4 - 1][var5]; // L: 1032 - if (var36 != null && var36.drawSecondary) { // L: 1033 + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 + var36 = var8[var4 - 1][var5]; // L: 1012 + if (var36 != null && var36.drawSecondary) { // L: 1013 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1035 - var36 = var8[var4][var5 - 1]; // L: 1036 - if (var36 != null && var36.drawSecondary) { // L: 1037 + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 + var36 = var8[var4][var5 - 1]; // L: 1016 + if (var36 != null && var36.drawSecondary) { // L: 1017 Scene_tilesDeque.addFirst(var36); } } @@ -1524,264 +1516,264 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { // L: 1041 - var20 = true; // L: 1042 + if (var3.drawGameObjectEdges != 0) { // L: 1021 + var20 = true; // L: 1022 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1043 - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1667) { // L: 1044 - var20 = false; // L: 1045 - break; // L: 1046 + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1889) { // L: 1024 + var20 = false; // L: 1025 + break; // L: 1026 } } - if (var20) { // L: 1049 - var10 = var3.boundaryObject; // L: 1050 - if (!this.method3290(var7, var4, var5, var10.orientationA)) { // L: 1051 + if (var20) { // L: 1029 + var10 = var3.boundaryObject; // L: 1030 + if (!this.method3484(var7, var4, var5, var10.orientationA)) { // L: 1031 var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; // L: 1052 + var3.drawGameObjectEdges = 0; // L: 1032 } } - if (!var3.drawGameObjects) { // L: 1055 + if (!var3.drawGameObjects) { // L: 1035 break; } try { - int var34 = var3.gameObjectsCount; // L: 1057 - var3.drawGameObjects = false; // L: 1058 - var21 = 0; // L: 1059 + int var34 = var3.gameObjectsCount; // L: 1037 + var3.drawGameObjects = false; // L: 1038 + var21 = 0; // L: 1039 label563: - for (var11 = 0; var11 < var34; ++var11) { // L: 1060 - var12 = var3.gameObjects[var11]; // L: 1061 - if (var12.lastDrawn != Scene_drawnCount) { // L: 1062 - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1063 - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1064 - var36 = var8[var24][var14]; // L: 1065 - if (var36.drawPrimary) { // L: 1066 - var3.drawGameObjects = true; // L: 1067 - continue label563; // L: 1068 + for (var11 = 0; var11 < var34; ++var11) { // L: 1040 + var12 = var3.gameObjects[var11]; // L: 1041 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1042 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044 + var36 = var8[var24][var14]; // L: 1045 + if (var36.drawPrimary) { // L: 1046 + var3.drawGameObjects = true; // L: 1047 + continue label563; // L: 1048 } - if (var36.drawGameObjectEdges != 0) { // L: 1070 - var16 = 0; // L: 1071 - if (var24 > var12.startX) { // L: 1072 + if (var36.drawGameObjectEdges != 0) { // L: 1050 + var16 = 0; // L: 1051 + if (var24 > var12.startX) { // L: 1052 ++var16; } - if (var24 < var12.endX) { // L: 1073 + if (var24 < var12.endX) { // L: 1053 var16 += 4; } - if (var14 > var12.startY) { // L: 1074 + if (var14 > var12.startY) { // L: 1054 var16 += 8; } - if (var14 < var12.endY) { // L: 1075 + if (var14 < var12.endY) { // L: 1055 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1680) { // L: 1076 - var3.drawGameObjects = true; // L: 1077 - continue label563; // L: 1078 + if ((var16 & var36.drawGameObjectEdges) == var3.field1890) { // L: 1056 + var3.drawGameObjects = true; // L: 1057 + continue label563; // L: 1058 } } } } - gameObjects[var21++] = var12; // L: 1083 - var24 = Scene_cameraXTile - var12.startX; // L: 1084 - var14 = var12.endX - Scene_cameraXTile; // L: 1085 - if (var14 > var24) { // L: 1086 + gameObjects[var21++] = var12; // L: 1063 + var24 = Scene_cameraXTile - var12.startX; // L: 1064 + var14 = var12.endX - Scene_cameraXTile; // L: 1065 + if (var14 > var24) { // L: 1066 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; // L: 1087 - var16 = var12.endY - Scene_cameraYTile; // L: 1088 - if (var16 > var15) { // L: 1089 - var12.field1947 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1067 + var16 = var12.endY - Scene_cameraYTile; // L: 1068 + if (var16 > var15) { // L: 1069 + var12.field2191 = var24 + var16; } else { - var12.field1947 = var24 + var15; // L: 1090 + var12.field2191 = var24 + var15; // L: 1070 } } } - while (var21 > 0) { // L: 1093 - var11 = -50; // L: 1094 - var25 = -1; // L: 1095 + while (var21 > 0) { // L: 1073 + var11 = -50; // L: 1074 + var25 = -1; // L: 1075 - for (var24 = 0; var24 < var21; ++var24) { // L: 1096 - GameObject var35 = gameObjects[var24]; // L: 1097 - if (var35.lastDrawn != Scene_drawnCount) { // L: 1098 - if (var35.field1947 > var11) { // L: 1099 - var11 = var35.field1947; // L: 1100 - var25 = var24; // L: 1101 - } else if (var11 == var35.field1947) { // L: 1103 - var15 = var35.centerX - Scene_cameraX; // L: 1104 - var16 = var35.centerY - Scene_cameraZ; // L: 1105 - var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1106 - var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1107 - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1108 + for (var24 = 0; var24 < var21; ++var24) { // L: 1076 + GameObject var35 = gameObjects[var24]; // L: 1077 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 + if (var35.field2191 > var11) { // L: 1079 + var11 = var35.field2191; // L: 1080 + var25 = var24; // L: 1081 + } else if (var11 == var35.field2191) { // L: 1083 + var15 = var35.centerX - Scene_cameraX; // L: 1084 + var16 = var35.centerY - Scene_cameraZ; // L: 1085 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088 var25 = var24; } } } } - if (var25 == -1) { // L: 1112 + if (var25 == -1) { // L: 1092 break; } - GameObject var33 = gameObjects[var25]; // L: 1113 - var33.lastDrawn = Scene_drawnCount; // L: 1114 - if (!this.method3292(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115 - var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 + GameObject var33 = gameObjects[var25]; // L: 1093 + var33.lastDrawn = Scene_drawnCount; // L: 1094 + if (!this.method3486(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095 + var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096 } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1118 - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1119 - Tile var26 = var8[var14][var15]; // L: 1120 - if (var26.drawGameObjectEdges != 0) { // L: 1121 + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099 + Tile var26 = var8[var14][var15]; // L: 1100 + if (var26.drawGameObjectEdges != 0) { // L: 1101 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1122 + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { // L: 1126 + if (!var3.drawGameObjects) { // L: 1106 break; } - } catch (Exception var28) { // L: 1128 - var3.drawGameObjects = false; // L: 1129 + } catch (Exception var28) { // L: 1108 + var3.drawGameObjects = false; // L: 1109 break; } } - } while(!var3.drawSecondary); // L: 1132 - } while(var3.drawGameObjectEdges != 0); // L: 1133 + } while(!var3.drawSecondary); // L: 1112 + } while(var3.drawGameObjectEdges != 0); // L: 1113 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1134 + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 break; } - var9 = var8[var4 - 1][var5]; // L: 1135 - } while(var9 != null && var9.drawSecondary); // L: 1136 + var9 = var8[var4 - 1][var5]; // L: 1115 + } while(var9 != null && var9.drawSecondary); // L: 1116 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1138 + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 break; } - var9 = var8[var4 + 1][var5]; // L: 1139 - } while(var9 != null && var9.drawSecondary); // L: 1140 + var9 = var8[var4 + 1][var5]; // L: 1119 + } while(var9 != null && var9.drawSecondary); // L: 1120 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1142 + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 break; } - var9 = var8[var4][var5 - 1]; // L: 1143 - } while(var9 != null && var9.drawSecondary); // L: 1144 + var9 = var8[var4][var5 - 1]; // L: 1123 + } while(var9 != null && var9.drawSecondary); // L: 1124 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1146 + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 break; } - var9 = var8[var4][var5 + 1]; // L: 1147 - } while(var9 != null && var9.drawSecondary); // L: 1148 + var9 = var8[var4][var5 + 1]; // L: 1127 + } while(var9 != null && var9.drawSecondary); // L: 1128 - var3.drawSecondary = false; // L: 1150 - --tileUpdateCount; // L: 1151 - ItemLayer var32 = var3.itemLayer; // L: 1152 - if (var32 != null && var32.height != 0) { // L: 1153 - if (var32.second != null) { // L: 1154 + var3.drawSecondary = false; // L: 1130 + --tileUpdateCount; // L: 1131 + ItemLayer var32 = var3.itemLayer; // L: 1132 + if (var32 != null && var32.height != 0) { // L: 1133 + if (var32.second != null) { // L: 1134 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { // L: 1155 + if (var32.third != null) { // L: 1135 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { // L: 1156 + if (var32.first != null) { // L: 1136 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field1668 != 0) { // L: 1158 - WallDecoration var29 = var3.wallDecoration; // L: 1159 - if (var29 != null && !this.method3261(var7, var4, var5, var29.renderable1.height)) { // L: 1160 - if ((var29.orientation & var3.field1668) != 0) { // L: 1161 - 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: 1162 - } else if (var29.orientation == 256) { // L: 1164 - var11 = var29.x - Scene_cameraX; // L: 1165 - var25 = var29.tileHeight - Scene_cameraY; // L: 1166 - var24 = var29.y - Scene_cameraZ; // L: 1167 - var14 = var29.orientation2; // L: 1168 - if (var14 != 1 && var14 != 2) { // L: 1170 - var15 = var11; // L: 1171 + if (var3.field1882 != 0) { // L: 1138 + WallDecoration var29 = var3.wallDecoration; // L: 1139 + if (var29 != null && !this.method3485(var7, var4, var5, var29.renderable1.height)) { // L: 1140 + if ((var29.orientation & var3.field1882) != 0) { // L: 1141 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142 + } else if (var29.orientation == 256) { // L: 1144 + var11 = var29.x - Scene_cameraX; // L: 1145 + var25 = var29.tileHeight - Scene_cameraY; // L: 1146 + var24 = var29.y - Scene_cameraZ; // L: 1147 + var14 = var29.orientation2; // L: 1148 + if (var14 != 1 && var14 != 2) { // L: 1150 + var15 = var11; // L: 1151 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { // L: 1173 - var16 = var24; // L: 1174 + if (var14 != 2 && var14 != 3) { // L: 1153 + var16 = var24; // L: 1154 } else { var16 = -var24; } - if (var16 >= var15) { // L: 1175 - var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1176 - } else if (var29.renderable2 != null) { // L: 1178 - var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1179 + if (var16 >= var15) { // L: 1155 + var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156 + } else if (var29.renderable2 != null) { // L: 1158 + var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159 } } } - BoundaryObject var27 = var3.boundaryObject; // L: 1183 - if (var27 != null) { // L: 1184 - if ((var27.orientationB & var3.field1668) != 0 && !this.method3290(var7, var4, var5, var27.orientationB)) { // L: 1185 + BoundaryObject var27 = var3.boundaryObject; // L: 1163 + if (var27 != null) { // L: 1164 + if ((var27.orientationB & var3.field1882) != 0 && !this.method3484(var7, var4, var5, var27.orientationB)) { // L: 1165 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.field1668) != 0 && !this.method3290(var7, var4, var5, var27.orientationA)) { // L: 1186 + if ((var27.orientationA & var3.field1882) != 0 && !this.method3484(var7, var4, var5, var27.orientationA)) { // L: 1166 var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { // L: 1189 - var30 = this.tiles[var6 + 1][var4][var5]; // L: 1190 - if (var30 != null && var30.drawSecondary) { // L: 1191 + if (var6 < this.planes - 1) { // L: 1169 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 + if (var30 != null && var30.drawSecondary) { // L: 1171 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { // L: 1193 - var30 = var8[var4 + 1][var5]; // L: 1194 - if (var30 != null && var30.drawSecondary) { // L: 1195 + if (var4 < Scene_cameraXTile) { // L: 1173 + var30 = var8[var4 + 1][var5]; // L: 1174 + if (var30 != null && var30.drawSecondary) { // L: 1175 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { // L: 1197 - var30 = var8[var4][var5 + 1]; // L: 1198 - if (var30 != null && var30.drawSecondary) { // L: 1199 + if (var5 < Scene_cameraYTile) { // L: 1177 + var30 = var8[var4][var5 + 1]; // L: 1178 + if (var30 != null && var30.drawSecondary) { // L: 1179 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { // L: 1201 - var30 = var8[var4 - 1][var5]; // L: 1202 - if (var30 != null && var30.drawSecondary) { // L: 1203 + if (var4 > Scene_cameraXTile) { // L: 1181 + var30 = var8[var4 - 1][var5]; // L: 1182 + if (var30 != null && var30.drawSecondary) { // L: 1183 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { // L: 1205 - var30 = var8[var4][var5 - 1]; // L: 1206 - if (var30 != null && var30.drawSecondary) { // L: 1207 + if (var5 > Scene_cameraYTile) { // L: 1185 + var30 = var8[var4][var5 - 1]; // L: 1186 + if (var30 != null && var30.drawSecondary) { // L: 1187 Scene_tilesDeque.addFirst(var30); } } @@ -1790,106 +1782,106 @@ public class Scene { @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lec;IIIIIII)V" + descriptor = "(Lgr;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; - int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1215 + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1217 + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 int var13; - int var14 = var13 = var10 + 128; // L: 1219 + int var14 = var13 = var10 + 128; // L: 1199 int var15; - int var16 = var15 = var12 + 128; // L: 1221 - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1222 - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1223 - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1224 - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1225 - int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1226 - var12 = var12 * var6 - var5 * var10 >> 16; // L: 1227 - var10 = var21; // L: 1228 - var21 = var17 * var4 - var3 * var12 >> 16; // L: 1229 - var12 = var3 * var17 + var12 * var4 >> 16; // L: 1230 - var17 = var21; // L: 1231 - if (var12 >= 50) { // L: 1232 - var21 = var14 * var6 + var5 * var11 >> 16; // L: 1233 - var11 = var11 * var6 - var5 * var14 >> 16; // L: 1234 - var14 = var21; // L: 1235 - var21 = var18 * var4 - var3 * var11 >> 16; // L: 1236 - var11 = var3 * var18 + var11 * var4 >> 16; // L: 1237 - var18 = var21; // L: 1238 - if (var11 >= 50) { // L: 1239 - var21 = var13 * var6 + var5 * var16 >> 16; // L: 1240 - var16 = var16 * var6 - var5 * var13 >> 16; // L: 1241 - var13 = var21; // L: 1242 - var21 = var19 * var4 - var3 * var16 >> 16; // L: 1243 - var16 = var3 * var19 + var16 * var4 >> 16; // L: 1244 - var19 = var21; // L: 1245 - if (var16 >= 50) { // L: 1246 - var21 = var9 * var6 + var5 * var15 >> 16; // L: 1247 - var15 = var15 * var6 - var5 * var9 >> 16; // L: 1248 - var9 = var21; // L: 1249 - var21 = var20 * var4 - var3 * var15 >> 16; // L: 1250 - var15 = var3 * var20 + var15 * var4 >> 16; // L: 1251 - if (var15 >= 50) { // L: 1253 - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1254 - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1255 - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1256 - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1257 - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1258 - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1259 - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1260 - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1261 - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1262 + int var16 = var15 = var12 + 128; // L: 1201 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207 + var10 = var21; // L: 1208 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210 + var17 = var21; // L: 1211 + if (var12 >= 50) { // L: 1212 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214 + var14 = var21; // L: 1215 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217 + var18 = var21; // L: 1218 + if (var11 >= 50) { // L: 1219 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221 + var13 = var21; // L: 1222 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224 + var19 = var21; // L: 1225 + if (var16 >= 50) { // L: 1226 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228 + var9 = var21; // L: 1229 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231 + if (var15 >= 50) { // L: 1233 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1263 - Rasterizer3D.field1775 = false; // L: 1264 - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1265 - Rasterizer3D.field1775 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 + Rasterizer3D.field1899 = false; // L: 1244 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245 + Rasterizer3D.field1899 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1266 - Scene_selectedX = var7; // L: 1267 - Scene_selectedY = var8; // L: 1268 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 + Scene_selectedX = var7; // L: 1247 + Scene_selectedY = var8; // L: 1248 } - if (var1.texture == -1) { // L: 1270 - if (var1.neColor != 12345678) { // L: 1271 - Rasterizer3D.method3175(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1250 + if (var1.neColor != 12345678) { // L: 1251 + Rasterizer3D.method3383(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { // L: 1273 - if (var1.isFlat) { // L: 1274 + } else if (!Scene_isLowDetail) { // L: 1253 + if (var1.isFlat) { // L: 1254 Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1275 + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1278 - Rasterizer3D.method3175(var27, var29, var25, var26, var28, var24, method3286(var30, var1.neColor), method3286(var30, var1.nwColor), method3286(var30, var1.seColor)); // L: 1279 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 + Rasterizer3D.method3383(var27, var29, var25, var26, var28, var24, method3619(var30, var1.neColor), method3619(var30, var1.nwColor), method3619(var30, var1.seColor)); // L: 1259 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1282 - Rasterizer3D.field1775 = false; // L: 1283 - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1284 - Rasterizer3D.field1775 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 + Rasterizer3D.field1899 = false; // L: 1263 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264 + Rasterizer3D.field1899 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1285 - Scene_selectedX = var7; // L: 1286 - Scene_selectedY = var8; // L: 1287 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 + Scene_selectedX = var7; // L: 1266 + Scene_selectedY = var8; // L: 1267 } - if (var1.texture == -1) { // L: 1289 - if (var1.swColor != 12345678) { // L: 1290 - Rasterizer3D.method3175(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1269 + if (var1.swColor != 12345678) { // L: 1270 + Rasterizer3D.method3383(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { // L: 1292 - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1293 + } else if (!Scene_isLowDetail) { // L: 1272 + Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273 } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1296 - Rasterizer3D.method3175(var23, var25, var29, var22, var24, var28, method3286(var30, var1.swColor), method3286(var30, var1.seColor), method3286(var30, var1.nwColor)); // L: 1297 + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 + Rasterizer3D.method3383(var23, var25, var29, var22, var24, var28, method3619(var30, var1.swColor), method3619(var30, var1.seColor), method3619(var30, var1.nwColor)); // L: 1277 } } @@ -1897,566 +1889,566 @@ public class Scene { } } } - } // L: 1300 + } // L: 1280 - @ObfuscatedName("ad") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Leo;IIIIII)V" + descriptor = "(Lfj;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; // L: 1303 + int var8 = var1.vertexX.length; // L: 1283 int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { // L: 1304 - var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1305 - var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1306 - var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1307 - var13 = var12 * var4 + var5 * var10 >> 16; // L: 1308 - var12 = var5 * var12 - var10 * var4 >> 16; // L: 1309 - var10 = var13; // L: 1310 - var13 = var3 * var11 - var12 * var2 >> 16; // L: 1311 - var12 = var11 * var2 + var3 * var12 >> 16; // L: 1312 - if (var12 < 50) { // L: 1314 + for (var9 = 0; var9 < var8; ++var9) { // L: 1284 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289 + var10 = var13; // L: 1290 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292 + if (var12 < 50) { // L: 1294 return; } - if (var1.triangleTextureId != null) { // L: 1315 - SceneTileModel.field1622[var9] = var10; // L: 1316 - SceneTileModel.field1623[var9] = var13; // L: 1317 - SceneTileModel.field1624[var9] = var12; // L: 1318 + if (var1.triangleTextureId != null) { // L: 1295 + SceneTileModel.field2060[var9] = var10; // L: 1296 + SceneTileModel.field2057[var9] = var13; // L: 1297 + SceneTileModel.field2058[var9] = var12; // L: 1298 } - SceneTileModel.field1620[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1320 - SceneTileModel.field1615[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1321 + SceneTileModel.field2054[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 + SceneTileModel.field2042[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 } - Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1323 - var8 = var1.faceX.length; // L: 1324 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 + var8 = var1.faceX.length; // L: 1304 - for (var9 = 0; var9 < var8; ++var9) { // L: 1325 - var10 = var1.faceX[var9]; // L: 1326 - var11 = var1.faceY[var9]; // L: 1327 - var12 = var1.faceZ[var9]; // L: 1328 - var13 = SceneTileModel.field1620[var10]; // L: 1329 - int var14 = SceneTileModel.field1620[var11]; // L: 1330 - int var15 = SceneTileModel.field1620[var12]; // L: 1331 - int var16 = SceneTileModel.field1615[var10]; // L: 1332 - int var17 = SceneTileModel.field1615[var11]; // L: 1333 - int var18 = SceneTileModel.field1615[var12]; // L: 1334 - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1335 - Rasterizer3D.field1775 = false; // L: 1336 - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1337 - Rasterizer3D.field1775 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1305 + var10 = var1.faceX[var9]; // L: 1306 + var11 = var1.faceY[var9]; // L: 1307 + var12 = var1.faceZ[var9]; // L: 1308 + var13 = SceneTileModel.field2054[var10]; // L: 1309 + int var14 = SceneTileModel.field2054[var11]; // L: 1310 + int var15 = SceneTileModel.field2054[var12]; // L: 1311 + int var16 = SceneTileModel.field2042[var10]; // L: 1312 + int var17 = SceneTileModel.field2042[var11]; // L: 1313 + int var18 = SceneTileModel.field2042[var12]; // L: 1314 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 + Rasterizer3D.field1899 = false; // L: 1316 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317 + Rasterizer3D.field1899 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1338 - Scene_selectedX = var6; // L: 1339 - Scene_selectedY = var7; // L: 1340 + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 + Scene_selectedX = var6; // L: 1319 + Scene_selectedY = var7; // L: 1320 } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1342 - if (!Scene_isLowDetail) { // L: 1346 - if (var1.isFlat) { // L: 1347 - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field1622[0], SceneTileModel.field1622[1], SceneTileModel.field1622[3], SceneTileModel.field1623[0], SceneTileModel.field1623[1], SceneTileModel.field1623[3], SceneTileModel.field1624[0], SceneTileModel.field1624[1], SceneTileModel.field1624[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322 + if (!Scene_isLowDetail) { // L: 1326 + if (var1.isFlat) { // L: 1327 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2060[0], SceneTileModel.field2060[1], SceneTileModel.field2060[3], SceneTileModel.field2057[0], SceneTileModel.field2057[1], SceneTileModel.field2057[3], SceneTileModel.field2058[0], SceneTileModel.field2058[1], SceneTileModel.field2058[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field1622[var10], SceneTileModel.field1622[var11], SceneTileModel.field1622[var12], SceneTileModel.field1623[var10], SceneTileModel.field1623[var11], SceneTileModel.field1623[var12], SceneTileModel.field1624[var10], SceneTileModel.field1624[var11], SceneTileModel.field1624[var12], var1.triangleTextureId[var9]); // L: 1348 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2060[var10], SceneTileModel.field2060[var11], SceneTileModel.field2060[var12], SceneTileModel.field2057[var10], SceneTileModel.field2057[var11], SceneTileModel.field2057[var12], SceneTileModel.field2058[var10], SceneTileModel.field2058[var11], SceneTileModel.field2058[var12], var1.triangleTextureId[var9]); // L: 1328 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1351 - Rasterizer3D.method3175(var16, var17, var18, var13, var14, var15, method3286(var19, var1.triangleColorA[var9]), method3286(var19, var1.triangleColorB[var9]), method3286(var19, var1.triangleColorC[var9])); // L: 1352 + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 + Rasterizer3D.method3383(var16, var17, var18, var13, var14, var15, method3619(var19, var1.triangleColorA[var9]), method3619(var19, var1.triangleColorB[var9]), method3619(var19, var1.triangleColorC[var9])); // L: 1332 } - } else if (var1.triangleColorA[var9] != 12345678) { // L: 1343 - Rasterizer3D.method3175(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 + Rasterizer3D.method3383(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } // L: 1357 + } // L: 1337 - @ObfuscatedName("ao") + @ObfuscatedName("ar") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1384 - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1385 - Scene_currentOccludersCount = 0; // L: 1386 + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 + Scene_currentOccludersCount = 0; // L: 1366 - for (int var3 = 0; var3 < var1; ++var3) { // L: 1387 - Occluder var4 = var2[var3]; // L: 1388 + for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 + Occluder var4 = var2[var3]; // L: 1368 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { // L: 1389 - var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1390 - if (var5 >= 0 && var5 <= 50) { // L: 1391 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1392 - if (var6 < 0) { // L: 1393 + if (var4.type == 1) { // L: 1369 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370 + if (var5 >= 0 && var5 <= 50) { // L: 1371 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372 + if (var6 < 0) { // L: 1373 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1394 - if (var7 > 50) { // L: 1395 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 + if (var7 > 50) { // L: 1375 var7 = 50; } - var13 = false; // L: 1396 + var13 = false; // L: 1376 - while (var6 <= var7) { // L: 1397 - if (visibleTiles[var5][var6++]) { // L: 1398 - var13 = true; // L: 1399 + while (var6 <= var7) { // L: 1377 + if (visibleTiles[var5][var6++]) { // L: 1378 + var13 = true; // L: 1379 break; } } - if (var13) { // L: 1403 - var9 = Scene_cameraX - var4.minX; // L: 1404 - if (var9 > 32) { // L: 1405 - var4.field1918 = 1; + if (var13) { // L: 1383 + var9 = Scene_cameraX - var4.minX; // L: 1384 + if (var9 > 32) { // L: 1385 + var4.field2021 = 1; } else { - if (var9 >= -32) { // L: 1406 + if (var9 >= -32) { // L: 1386 continue; } - var4.field1918 = 2; // L: 1407 - var9 = -var9; // L: 1408 + var4.field2021 = 2; // L: 1387 + var9 = -var9; // L: 1388 } - var4.field1922 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1411 - var4.field1919 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1412 - var4.field1923 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1413 - var4.field1924 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1414 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1415 + var4.field2024 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 + var4.field2016 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 + var4.field2012 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 + var4.field2026 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 } } - } else if (var4.type == 2) { // L: 1418 - var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1419 - if (var5 >= 0 && var5 <= 50) { // L: 1420 - var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1421 - if (var6 < 0) { // L: 1422 + } else if (var4.type == 2) { // L: 1398 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 + if (var5 >= 0 && var5 <= 50) { // L: 1400 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401 + if (var6 < 0) { // L: 1402 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1423 - if (var7 > 50) { // L: 1424 + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 + if (var7 > 50) { // L: 1404 var7 = 50; } - var13 = false; // L: 1425 + var13 = false; // L: 1405 - while (var6 <= var7) { // L: 1426 - if (visibleTiles[var6++][var5]) { // L: 1427 - var13 = true; // L: 1428 + while (var6 <= var7) { // L: 1406 + if (visibleTiles[var6++][var5]) { // L: 1407 + var13 = true; // L: 1408 break; } } - if (var13) { // L: 1432 - var9 = Scene_cameraZ - var4.minZ; // L: 1433 - if (var9 > 32) { // L: 1434 - var4.field1918 = 3; + if (var13) { // L: 1412 + var9 = Scene_cameraZ - var4.minZ; // L: 1413 + if (var9 > 32) { // L: 1414 + var4.field2021 = 3; } else { - if (var9 >= -32) { // L: 1435 + if (var9 >= -32) { // L: 1415 continue; } - var4.field1918 = 4; // L: 1436 - var9 = -var9; // L: 1437 + var4.field2021 = 4; // L: 1416 + var9 = -var9; // L: 1417 } - var4.field1920 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1440 - var4.field1909 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1441 - var4.field1923 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1442 - var4.field1924 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1443 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1444 + var4.field2019 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 + var4.field2023 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 + var4.field2012 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 + var4.field2026 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 } } - } else if (var4.type == 4) { // L: 1447 - var5 = var4.minY - Scene_cameraY; // L: 1448 - if (var5 > 128) { // L: 1449 - var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1450 - if (var6 < 0) { // L: 1451 + } else if (var4.type == 4) { // L: 1427 + var5 = var4.minY - Scene_cameraY; // L: 1428 + if (var5 > 128) { // L: 1429 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430 + if (var6 < 0) { // L: 1431 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1452 - if (var7 > 50) { // L: 1453 + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 + if (var7 > 50) { // L: 1433 var7 = 50; } - if (var6 <= var7) { // L: 1454 - int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1455 - if (var8 < 0) { // L: 1456 + if (var6 <= var7) { // L: 1434 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 + if (var8 < 0) { // L: 1436 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1457 - if (var9 > 50) { // L: 1458 + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 + if (var9 > 50) { // L: 1438 var9 = 50; } - boolean var10 = false; // L: 1459 + boolean var10 = false; // L: 1439 label148: - for (int var11 = var8; var11 <= var9; ++var11) { // L: 1460 - for (int var12 = var6; var12 <= var7; ++var12) { // L: 1461 - if (visibleTiles[var11][var12]) { // L: 1462 - var10 = true; // L: 1463 + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441 + if (visibleTiles[var11][var12]) { // L: 1442 + var10 = true; // L: 1443 break label148; } } } - if (var10) { // L: 1468 - var4.field1918 = 5; // L: 1469 - var4.field1920 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1470 - var4.field1909 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1471 - var4.field1922 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1472 - var4.field1919 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1473 - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1474 + if (var10) { // L: 1448 + var4.field2021 = 5; // L: 1449 + var4.field2019 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 + var4.field2023 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 + var4.field2024 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 + var4.field2016 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 } } } } } - } // L: 1478 + } // L: 1458 - @ObfuscatedName("bj") - boolean method3245(int var1, int var2, int var3) { - int var4 = this.field1820[var1][var2][var3]; // L: 1481 - if (var4 == -Scene_drawnCount) { // L: 1482 + @ObfuscatedName("ak") + boolean method3483(int var1, int var2, int var3) { + int var4 = this.field1940[var1][var2][var3]; // L: 1461 + if (var4 == -Scene_drawnCount) { // L: 1462 return false; - } else if (var4 == Scene_drawnCount) { // L: 1483 + } else if (var4 == Scene_drawnCount) { // L: 1463 return true; } else { - int var5 = var2 << 7; // L: 1484 - int var6 = var3 << 7; // L: 1485 - if (this.method3242(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3242(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3242(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3242(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1486 - this.field1820[var1][var2][var3] = Scene_drawnCount; // L: 1487 - return true; // L: 1488 + int var5 = var2 << 7; // L: 1464 + int var6 = var3 << 7; // L: 1465 + if (this.method3440(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3440(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 + this.field1940[var1][var2][var3] = Scene_drawnCount; // L: 1467 + return true; // L: 1468 } else { - this.field1820[var1][var2][var3] = -Scene_drawnCount; // L: 1491 - return false; // L: 1492 + this.field1940[var1][var2][var3] = -Scene_drawnCount; // L: 1471 + return false; // L: 1472 } } } - @ObfuscatedName("bn") - boolean method3290(int var1, int var2, int var3, int var4) { - if (!this.method3245(var1, var2, var3)) { // L: 1497 + @ObfuscatedName("an") + boolean method3484(int var1, int var2, int var3, int var4) { + if (!this.method3483(var1, var2, var3)) { // L: 1477 return false; } else { - int var5 = var2 << 7; // L: 1498 - int var6 = var3 << 7; // L: 1499 - int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1500 - int var8 = var7 - 120; // L: 1501 - int var9 = var7 - 230; // L: 1502 - int var10 = var7 - 238; // L: 1503 - if (var4 < 16) { // L: 1504 - if (var4 == 1) { // L: 1505 - if (var5 > Scene_cameraX) { // L: 1506 - if (!this.method3242(var5, var7, var6)) { // L: 1507 + int var5 = var2 << 7; // L: 1478 + int var6 = var3 << 7; // L: 1479 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480 + int var8 = var7 - 120; // L: 1481 + int var9 = var7 - 230; // L: 1482 + int var10 = var7 - 238; // L: 1483 + if (var4 < 16) { // L: 1484 + if (var4 == 1) { // L: 1485 + if (var5 > Scene_cameraX) { // L: 1486 + if (!this.method3440(var5, var7, var6)) { // L: 1487 return false; } - if (!this.method3242(var5, var7, var6 + 128)) { // L: 1508 + if (!this.method3440(var5, var7, var6 + 128)) { // L: 1488 return false; } } - if (var1 > 0) { // L: 1510 - if (!this.method3242(var5, var8, var6)) { // L: 1511 + if (var1 > 0) { // L: 1490 + if (!this.method3440(var5, var8, var6)) { // L: 1491 return false; } - if (!this.method3242(var5, var8, var6 + 128)) { // L: 1512 + if (!this.method3440(var5, var8, var6 + 128)) { // L: 1492 return false; } } - if (!this.method3242(var5, var9, var6)) { // L: 1514 + if (!this.method3440(var5, var9, var6)) { // L: 1494 return false; } - if (!this.method3242(var5, var9, var6 + 128)) { // L: 1515 + if (!this.method3440(var5, var9, var6 + 128)) { // L: 1495 return false; } - return true; // L: 1516 + return true; // L: 1496 } - if (var4 == 2) { // L: 1518 - if (var6 < Scene_cameraZ) { // L: 1519 - if (!this.method3242(var5, var7, var6 + 128)) { // L: 1520 + if (var4 == 2) { // L: 1498 + if (var6 < Scene_cameraZ) { // L: 1499 + if (!this.method3440(var5, var7, var6 + 128)) { // L: 1500 return false; } - if (!this.method3242(var5 + 128, var7, var6 + 128)) { // L: 1521 + if (!this.method3440(var5 + 128, var7, var6 + 128)) { // L: 1501 return false; } } - if (var1 > 0) { // L: 1523 - if (!this.method3242(var5, var8, var6 + 128)) { // L: 1524 + if (var1 > 0) { // L: 1503 + if (!this.method3440(var5, var8, var6 + 128)) { // L: 1504 return false; } - if (!this.method3242(var5 + 128, var8, var6 + 128)) { // L: 1525 + if (!this.method3440(var5 + 128, var8, var6 + 128)) { // L: 1505 return false; } } - if (!this.method3242(var5, var9, var6 + 128)) { // L: 1527 + if (!this.method3440(var5, var9, var6 + 128)) { // L: 1507 return false; } - if (!this.method3242(var5 + 128, var9, var6 + 128)) { // L: 1528 + if (!this.method3440(var5 + 128, var9, var6 + 128)) { // L: 1508 return false; } - return true; // L: 1529 + return true; // L: 1509 } - if (var4 == 4) { // L: 1531 - if (var5 < Scene_cameraX) { // L: 1532 - if (!this.method3242(var5 + 128, var7, var6)) { // L: 1533 + if (var4 == 4) { // L: 1511 + if (var5 < Scene_cameraX) { // L: 1512 + if (!this.method3440(var5 + 128, var7, var6)) { // L: 1513 return false; } - if (!this.method3242(var5 + 128, var7, var6 + 128)) { // L: 1534 + if (!this.method3440(var5 + 128, var7, var6 + 128)) { // L: 1514 return false; } } - if (var1 > 0) { // L: 1536 - if (!this.method3242(var5 + 128, var8, var6)) { // L: 1537 + if (var1 > 0) { // L: 1516 + if (!this.method3440(var5 + 128, var8, var6)) { // L: 1517 return false; } - if (!this.method3242(var5 + 128, var8, var6 + 128)) { // L: 1538 + if (!this.method3440(var5 + 128, var8, var6 + 128)) { // L: 1518 return false; } } - if (!this.method3242(var5 + 128, var9, var6)) { // L: 1540 + if (!this.method3440(var5 + 128, var9, var6)) { // L: 1520 return false; } - if (!this.method3242(var5 + 128, var9, var6 + 128)) { // L: 1541 + if (!this.method3440(var5 + 128, var9, var6 + 128)) { // L: 1521 return false; } - return true; // L: 1542 + return true; // L: 1522 } - if (var4 == 8) { // L: 1544 - if (var6 > Scene_cameraZ) { // L: 1545 - if (!this.method3242(var5, var7, var6)) { // L: 1546 + if (var4 == 8) { // L: 1524 + if (var6 > Scene_cameraZ) { // L: 1525 + if (!this.method3440(var5, var7, var6)) { // L: 1526 return false; } - if (!this.method3242(var5 + 128, var7, var6)) { // L: 1547 + if (!this.method3440(var5 + 128, var7, var6)) { // L: 1527 return false; } } - if (var1 > 0) { // L: 1549 - if (!this.method3242(var5, var8, var6)) { // L: 1550 + if (var1 > 0) { // L: 1529 + if (!this.method3440(var5, var8, var6)) { // L: 1530 return false; } - if (!this.method3242(var5 + 128, var8, var6)) { // L: 1551 + if (!this.method3440(var5 + 128, var8, var6)) { // L: 1531 return false; } } - if (!this.method3242(var5, var9, var6)) { // L: 1553 + if (!this.method3440(var5, var9, var6)) { // L: 1533 return false; } - if (!this.method3242(var5 + 128, var9, var6)) { // L: 1554 + if (!this.method3440(var5 + 128, var9, var6)) { // L: 1534 return false; } - return true; // L: 1555 + return true; // L: 1535 } } - if (!this.method3242(var5 + 64, var10, var6 + 64)) { // L: 1558 + if (!this.method3440(var5 + 64, var10, var6 + 64)) { // L: 1538 return false; - } else if (var4 == 16) { // L: 1559 - return this.method3242(var5, var9, var6 + 128); // L: 1560 - } else if (var4 == 32) { // L: 1563 - return this.method3242(var5 + 128, var9, var6 + 128); // L: 1564 - } else if (var4 == 64) { // L: 1567 - return this.method3242(var5 + 128, var9, var6); // L: 1568 - } else if (var4 == 128) { // L: 1571 - return this.method3242(var5, var9, var6); // L: 1572 + } else if (var4 == 16) { // L: 1539 + return this.method3440(var5, var9, var6 + 128); // L: 1540 + } else if (var4 == 32) { // L: 1543 + return this.method3440(var5 + 128, var9, var6 + 128); // L: 1544 + } else if (var4 == 64) { // L: 1547 + return this.method3440(var5 + 128, var9, var6); // L: 1548 + } else if (var4 == 128) { // L: 1551 + return this.method3440(var5, var9, var6); // L: 1552 } else { - return true; // L: 1575 + return true; // L: 1555 } } } - @ObfuscatedName("bi") - boolean method3261(int var1, int var2, int var3, int var4) { - if (!this.method3245(var1, var2, var3)) { // L: 1579 + @ObfuscatedName("ah") + boolean method3485(int var1, int var2, int var3, int var4) { + if (!this.method3483(var1, var2, var3)) { // L: 1559 return false; } else { - int var5 = var2 << 7; // L: 1580 - int var6 = var3 << 7; // L: 1581 - return this.method3242(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3242(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3242(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3242(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1582 + int var5 = var2 << 7; // L: 1560 + int var6 = var3 << 7; // L: 1561 + return this.method3440(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3440(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3440(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 } } - @ObfuscatedName("bp") - boolean method3292(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("ae") + boolean method3486(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { // L: 1587 - if (!this.method3245(var1, var2, var4)) { // L: 1588 + if (var3 == var2 && var5 == var4) { // L: 1567 + if (!this.method3483(var1, var2, var4)) { // L: 1568 return false; } else { - var7 = var2 << 7; // L: 1589 - var8 = var4 << 7; // L: 1590 - return this.method3242(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3242(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3242(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3242(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1591 + var7 = var2 << 7; // L: 1569 + var8 = var4 << 7; // L: 1570 + return this.method3440(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3440(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3440(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3440(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 } } else { - for (var7 = var2; var7 <= var3; ++var7) { // L: 1594 - for (var8 = var4; var8 <= var5; ++var8) { // L: 1595 - if (this.field1820[var1][var7][var8] == -Scene_drawnCount) { // L: 1596 + for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 + if (this.field1940[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 return false; } } } - var7 = (var2 << 7) + 1; // L: 1599 - var8 = (var4 << 7) + 2; // L: 1600 - int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1601 - if (!this.method3242(var7, var9, var8)) { // L: 1602 + var7 = (var2 << 7) + 1; // L: 1579 + var8 = (var4 << 7) + 2; // L: 1580 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 + if (!this.method3440(var7, var9, var8)) { // L: 1582 return false; } else { - int var10 = (var3 << 7) - 1; // L: 1603 - if (!this.method3242(var10, var9, var8)) { // L: 1604 + int var10 = (var3 << 7) - 1; // L: 1583 + if (!this.method3440(var10, var9, var8)) { // L: 1584 return false; } else { - int var11 = (var5 << 7) - 1; // L: 1605 - if (!this.method3242(var7, var9, var11)) { // L: 1606 + int var11 = (var5 << 7) - 1; // L: 1585 + if (!this.method3440(var7, var9, var11)) { // L: 1586 return false; - } else if (!this.method3242(var10, var9, var11)) { // L: 1607 + } else if (!this.method3440(var10, var9, var11)) { // L: 1587 return false; } else { - return true; // L: 1608 + return true; // L: 1588 } } } } } - @ObfuscatedName("br") - boolean method3242(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1612 - Occluder var5 = Scene_currentOccluders[var4]; // L: 1613 + @ObfuscatedName("bh") + boolean method3440(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 int var6; int var7; int var8; int var9; int var10; - if (var5.field1918 == 1) { // L: 1614 - var6 = var5.minX - var1; // L: 1615 - if (var6 > 0) { // L: 1616 - var7 = (var6 * var5.field1922 >> 8) + var5.minZ; // L: 1617 - var8 = (var6 * var5.field1919 >> 8) + var5.maxZ; // L: 1618 - var9 = (var6 * var5.field1923 >> 8) + var5.minY; // L: 1619 - var10 = (var6 * var5.field1924 >> 8) + var5.maxY; // L: 1620 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1621 + if (var5.field2021 == 1) { // L: 1594 + var6 = var5.minX - var1; // L: 1595 + if (var6 > 0) { // L: 1596 + var7 = (var6 * var5.field2024 >> 8) + var5.minZ; // L: 1597 + var8 = (var6 * var5.field2016 >> 8) + var5.maxZ; // L: 1598 + var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1599 + var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1600 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 return true; } } - } else if (var5.field1918 == 2) { // L: 1625 - var6 = var1 - var5.minX; // L: 1626 - if (var6 > 0) { // L: 1627 - var7 = (var6 * var5.field1922 >> 8) + var5.minZ; // L: 1628 - var8 = (var6 * var5.field1919 >> 8) + var5.maxZ; // L: 1629 - var9 = (var6 * var5.field1923 >> 8) + var5.minY; // L: 1630 - var10 = (var6 * var5.field1924 >> 8) + var5.maxY; // L: 1631 - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1632 + } else if (var5.field2021 == 2) { // L: 1605 + var6 = var1 - var5.minX; // L: 1606 + if (var6 > 0) { // L: 1607 + var7 = (var6 * var5.field2024 >> 8) + var5.minZ; // L: 1608 + var8 = (var6 * var5.field2016 >> 8) + var5.maxZ; // L: 1609 + var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1610 + var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1611 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 return true; } } - } else if (var5.field1918 == 3) { // L: 1636 - var6 = var5.minZ - var3; // L: 1637 - if (var6 > 0) { // L: 1638 - var7 = (var6 * var5.field1920 >> 8) + var5.minX; // L: 1639 - var8 = (var6 * var5.field1909 >> 8) + var5.maxX; // L: 1640 - var9 = (var6 * var5.field1923 >> 8) + var5.minY; // L: 1641 - var10 = (var6 * var5.field1924 >> 8) + var5.maxY; // L: 1642 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1643 + } else if (var5.field2021 == 3) { // L: 1616 + var6 = var5.minZ - var3; // L: 1617 + if (var6 > 0) { // L: 1618 + var7 = (var6 * var5.field2019 >> 8) + var5.minX; // L: 1619 + var8 = (var6 * var5.field2023 >> 8) + var5.maxX; // L: 1620 + var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1621 + var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1622 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 return true; } } - } else if (var5.field1918 == 4) { // L: 1647 - var6 = var3 - var5.minZ; // L: 1648 - if (var6 > 0) { // L: 1649 - var7 = (var6 * var5.field1920 >> 8) + var5.minX; // L: 1650 - var8 = (var6 * var5.field1909 >> 8) + var5.maxX; // L: 1651 - var9 = (var6 * var5.field1923 >> 8) + var5.minY; // L: 1652 - var10 = (var6 * var5.field1924 >> 8) + var5.maxY; // L: 1653 - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1654 + } else if (var5.field2021 == 4) { // L: 1627 + var6 = var3 - var5.minZ; // L: 1628 + if (var6 > 0) { // L: 1629 + var7 = (var6 * var5.field2019 >> 8) + var5.minX; // L: 1630 + var8 = (var6 * var5.field2023 >> 8) + var5.maxX; // L: 1631 + var9 = (var6 * var5.field2012 >> 8) + var5.minY; // L: 1632 + var10 = (var6 * var5.field2026 >> 8) + var5.maxY; // L: 1633 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 return true; } } - } else if (var5.field1918 == 5) { // L: 1658 - var6 = var2 - var5.minY; // L: 1659 - if (var6 > 0) { // L: 1660 - var7 = (var6 * var5.field1920 >> 8) + var5.minX; // L: 1661 - var8 = (var6 * var5.field1909 >> 8) + var5.maxX; // L: 1662 - var9 = (var6 * var5.field1922 >> 8) + var5.minZ; // L: 1663 - var10 = (var6 * var5.field1919 >> 8) + var5.maxZ; // L: 1664 - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1665 + } else if (var5.field2021 == 5) { // L: 1638 + var6 = var2 - var5.minY; // L: 1639 + if (var6 > 0) { // L: 1640 + var7 = (var6 * var5.field2019 >> 8) + var5.minX; // L: 1641 + var8 = (var6 * var5.field2023 >> 8) + var5.maxX; // L: 1642 + var9 = (var6 * var5.field2024 >> 8) + var5.minZ; // L: 1643 + var10 = (var6 * var5.field2016 >> 8) + var5.maxZ; // L: 1644 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 return true; } } } } - return false; // L: 1670 + return false; // L: 1650 } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - Occluder var8 = new Occluder(); // L: 154 - var8.minTileX = var2 / 128; // L: 155 - var8.maxTileX = var3 / 128; // L: 156 - var8.minTileY = var4 / 128; // L: 157 - var8.maxTileY = var5 / 128; // L: 158 - var8.type = var1; // L: 159 - var8.minX = var2; // L: 160 - var8.maxX = var3; // L: 161 - var8.minZ = var4; // L: 162 - var8.maxZ = var5; // L: 163 - var8.minY = var6; // L: 164 - var8.maxY = var7; // L: 165 - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 166 - } // L: 167 + Occluder var8 = new Occluder(); // L: 149 + var8.minTileX = var2 / 128; // L: 150 + var8.maxTileX = var3 / 128; // L: 151 + var8.minTileY = var4 / 128; // L: 152 + var8.maxTileY = var5 / 128; // L: 153 + var8.type = var1; // L: 154 + var8.minX = var2; // L: 155 + var8.maxX = var3; // L: 156 + var8.minZ = var4; // L: 157 + var8.maxZ = var5; // L: 158 + var8.minY = var6; // L: 159 + var8.maxY = var7; // L: 160 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 + } // L: 162 - @ObfuscatedName("aw") + @ObfuscatedName("ax") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; // L: 658 - Scene_viewportYMin = 0; // L: 659 - Scene_viewportXMax = var3; // L: 660 - Scene_viewportYMax = var4; // L: 661 - Scene_viewportXCenter = var3 / 2; // L: 662 - Scene_viewportYCenter = var4 / 2; // L: 663 - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 664 + Scene_viewportXMin = 0; // L: 638 + Scene_viewportYMin = 0; // L: 639 + Scene_viewportXMax = var3; // L: 640 + Scene_viewportYMax = var4; // L: 641 + Scene_viewportXCenter = var3 / 2; // L: 642 + Scene_viewportYCenter = var4 / 2; // L: 643 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644 int var6; int var7; @@ -2464,135 +2456,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { // L: 665 - for (var7 = 0; var7 < 2048; var7 += 64) { // L: 666 - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 667 - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 668 - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 669 - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 670 - var8 = (var6 - 128) / 32; // L: 671 - var9 = var7 / 64; // L: 672 + for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650 + var8 = (var6 - 128) / 32; // L: 651 + var9 = var7 / 64; // L: 652 - for (int var10 = -26; var10 < 26; ++var10) { // L: 673 - for (var11 = -26; var11 < 26; ++var11) { // L: 674 - var12 = var10 * 128; // L: 675 - int var13 = var11 * 128; // L: 676 - boolean var14 = false; // L: 677 + for (int var10 = -26; var10 < 26; ++var10) { // L: 653 + for (var11 = -26; var11 < 26; ++var11) { // L: 654 + var12 = var10 * 128; // L: 655 + int var13 = var11 * 128; // L: 656 + boolean var14 = false; // L: 657 - for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 678 - if (method3277(var12, var0[var8] + var15, var13)) { // L: 679 - var14 = true; // L: 680 + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 + if (method3471(var12, var0[var8] + var15, var13)) { // L: 659 + var14 = true; // L: 660 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 684 + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 } } } } - for (var6 = 0; var6 < 8; ++var6) { // L: 689 - for (var7 = 0; var7 < 32; ++var7) { // L: 690 - for (var8 = -25; var8 < 25; ++var8) { // L: 691 - for (var9 = -25; var9 < 25; ++var9) { // L: 692 - boolean var16 = false; // L: 693 + for (var6 = 0; var6 < 8; ++var6) { // L: 669 + for (var7 = 0; var7 < 32; ++var7) { // L: 670 + for (var8 = -25; var8 < 25; ++var8) { // L: 671 + for (var9 = -25; var9 < 25; ++var9) { // L: 672 + boolean var16 = false; // L: 673 - label84: - for (var11 = -1; var11 <= 1; ++var11) { // L: 694 - for (var12 = -1; var12 <= 1; ++var12) { // L: 695 - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 696 - var16 = true; // L: 697 - break label84; + label85: + for (var11 = -1; var11 <= 1; ++var11) { // L: 674 + for (var12 = -1; var12 <= 1; ++var12) { // L: 675 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676 + var16 = true; // L: 677 + break label85; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 700 - var16 = true; // L: 701 - break label84; // L: 702 + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680 + var16 = true; // L: 681 + break label85; // L: 682 } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 704 - var16 = true; // L: 705 - break label84; // L: 706 + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684 + var16 = true; // L: 685 + break label85; // L: 686 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 708 - var16 = true; // L: 709 - break label84; // L: 710 + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688 + var16 = true; // L: 689 + break label85; // L: 690 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 714 + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 } } } } - } // L: 719 + } // L: 699 - @ObfuscatedName("az") - static boolean method3277(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 722 - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 723 - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 724 - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 725 - if (var5 >= 50 && var5 <= 3500) { // L: 726 - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 727 - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 728 - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 729 + @ObfuscatedName("as") + static boolean method3471(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705 + if (var5 >= 50 && var5 <= 3500) { // L: 706 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709 } else { - return false; // L: 730 + return false; // L: 710 } } - @ObfuscatedName("aj") + @ObfuscatedName("ao") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; // L: 749 + return viewportWalking && Scene_selectedX != -1; // L: 729 } - @ObfuscatedName("an") - public static void method3281() { - Scene_selectedX = -1; // L: 753 - viewportWalking = false; // L: 754 - } // L: 755 + @ObfuscatedName("ai") + public static void method3476() { + Scene_selectedX = -1; // L: 733 + viewportWalking = false; // L: 734 + } // L: 735 - @ObfuscatedName("af") - static final int method3286(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; // L: 1360 - if (var1 < 2) { // L: 1361 + @ObfuscatedName("aa") + static final int method3619(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1340 + if (var1 < 2) { // L: 1341 var1 = 2; - } else if (var1 > 126) { // L: 1362 + } else if (var1 > 126) { // L: 1342 var1 = 126; } - return (var0 & 65408) + var1; // L: 1363 + return (var0 & 65408) + var1; // L: 1343 } - @ObfuscatedName("av") + @ObfuscatedName("al") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1367 + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1368 + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1369 + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1370 + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1371 - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1372 - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1373 - if (var8 == 0) { // L: 1374 - if (var9 != 0) { // L: 1377 - return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1378 + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353 + if (var8 == 0) { // L: 1354 + if (var9 != 0) { // L: 1357 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358 } else { - return true; // L: 1380 + return true; // L: 1360 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1375 + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 } } } diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java index 2d9b216908..c28b07bccc 100644 --- a/runescape-client/src/main/java/SceneTileModel.java +++ b/runescape-client/src/main/java/SceneTileModel.java @@ -2,77 +2,77 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("eo") +@ObfuscatedName("fj") @Implements("SceneTileModel") public final class SceneTileModel { - @ObfuscatedName("i") - static int[] field1620; - @ObfuscatedName("x") - static int[] field1615; - @ObfuscatedName("f") - static int[] field1622; - @ObfuscatedName("g") - static int[] field1623; - @ObfuscatedName("u") - static int[] field1624; + @ObfuscatedName("r") + static int[] field2054; + @ObfuscatedName("q") + static int[] field2042; @ObfuscatedName("t") - static final int[][] field1605; - @ObfuscatedName("p") - static final int[][] field1625; - @ObfuscatedName("n") + static int[] field2060; + @ObfuscatedName("v") + static int[] field2057; + @ObfuscatedName("x") + static int[] field2058; + @ObfuscatedName("z") + static final int[][] field2059; + @ObfuscatedName("i") + static final int[][] field2039; + @ObfuscatedName("f") @Export("vertexX") int[] vertexX; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("vertexY") int[] vertexY; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("faceX") int[] faceX; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("faceY") int[] faceY; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("faceZ") int[] faceZ; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("isFlat") boolean isFlat; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("shape") int shape; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("rotation") int rotation; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("overlayRgb") int overlayRgb; static { - field1620 = new int[6]; // L: 21 - field1615 = new int[6]; // L: 22 - field1622 = new int[6]; // L: 23 - field1623 = new int[6]; // L: 24 - field1624 = new int[6]; // L: 25 - field1605 = 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 - field1625 = 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 + field2054 = new int[6]; // L: 21 + field2042 = new int[6]; // L: 22 + field2060 = new int[6]; // L: 23 + field2057 = new int[6]; // L: 24 + field2058 = new int[6]; // L: 25 + field2059 = 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 + field2039 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 } SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { @@ -89,7 +89,7 @@ public final class SceneTileModel { int var21 = var20 / 2; // L: 64 int var22 = var20 / 4; // L: 65 int var23 = var20 * 3 / 4; // L: 66 - int[] var24 = field1605[var1]; // L: 67 + int[] var24 = field2059[var1]; // L: 67 int var25 = var24.length; // L: 68 this.vertexX = new int[var25]; // L: 69 this.vertexY = new int[var25]; // L: 70 @@ -224,7 +224,7 @@ public final class SceneTileModel { var27[var30] = var36; // L: 202 } - int[] var38 = field1625[var1]; // L: 204 + int[] var38 = field2039[var1]; // L: 204 var31 = var38.length / 4; // L: 205 this.faceX = new int[var31]; // L: 206 this.faceY = new int[var31]; // L: 207 diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java index fd31d2d776..e0c4afa80e 100644 --- a/runescape-client/src/main/java/SceneTilePaint.java +++ b/runescape-client/src/main/java/SceneTilePaint.java @@ -3,45 +3,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ec") +@ObfuscatedName("gr") @Implements("SceneTilePaint") public final class SceneTilePaint { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -488531261 + intValue = 66075033 ) @Export("swColor") int swColor; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1556440429 + intValue = 748897211 ) @Export("seColor") int seColor; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -310123299 + intValue = -1854602939 ) @Export("neColor") int neColor; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -614734957 + intValue = -1705653553 ) @Export("nwColor") int nwColor; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -510931047 + intValue = 1737140535 ) @Export("texture") int texture; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("isFlat") boolean isFlat; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 174848381 + intValue = 985231477 ) @Export("rgb") int rgb; diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 791abd8bd4..2fdd45cfad 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,51 +4,59 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cc") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("v") + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("headIconHintSprites") + static SpritePixels[] headIconHintSprites; + @ObfuscatedName("o") + String field1058; + @ObfuscatedName("u") @Export("opcodes") int[] opcodes; - @ObfuscatedName("d") + @ObfuscatedName("p") @Export("intOperands") int[] intOperands; - @ObfuscatedName("c") + @ObfuscatedName("b") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1015685997 + intValue = 1191660215 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 890706765 + intValue = -49303827 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("z") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1256074133 + intValue = 162609675 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("e") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 564204905 + intValue = -1127748469 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Llg;" + descriptor = "[Lme;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -58,15 +66,227 @@ public class Script extends DualNode { } Script() { - } // L: 22 + } // L: 23 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)[Llg;", - garbageValue = "-1286467611" + descriptor = "(IB)[Lme;", + garbageValue = "0" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; // L: 125 + return new IterableNodeHashTable[var1]; // L: 134 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1090805477" + ) + static void method2010() { + Messages.Messages_channels.clear(); // L: 50 + Messages.Messages_hashTable.clear(); // L: 51 + Messages.Messages_queue.clear(); // L: 52 + Messages.Messages_count = 0; // L: 53 + } // L: 54 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1768640956" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 1012 + var1 /= 2; + } + + if (var2 > 192) { // L: 1013 + var1 /= 2; + } + + if (var2 > 217) { // L: 1014 + var1 /= 2; + } + + if (var2 > 243) { // L: 1015 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 1016 + return var3; // L: 1017 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-710644137" + ) + static int method1998(int var0, Script var1, boolean var2) { + if (var0 == 3800) { // L: 2421 + if (ObjectSound.field928 != null) { // L: 2422 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2423 + class19.field154 = ObjectSound.field928; // L: 2424 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2426 + } + + return 1; // L: 2427 + } else { + int var3; + if (var0 == 3801) { // L: 2429 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2430 + if (Client.field831[var3] != null) { // L: 2431 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2432 + class19.field154 = Client.field831[var3]; // L: 2433 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2435 + } + + return 1; // L: 2436 + } else if (var0 == 3802) { // L: 2438 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.field154.field81; // L: 2439 + return 1; // L: 2440 + } else if (var0 == 3803) { // L: 2442 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field90 ? 1 : 0; // L: 2443 + return 1; // L: 2444 + } else if (var0 == 3804) { // L: 2446 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field84; // L: 2447 + return 1; // L: 2448 + } else if (var0 == 3805) { // L: 2450 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field83; // L: 2451 + return 1; // L: 2452 + } else if (var0 == 3806) { // L: 2454 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field86; // L: 2455 + return 1; // L: 2456 + } else if (var0 == 3807) { // L: 2458 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field87; // L: 2459 + return 1; // L: 2460 + } else if (var0 == 3809) { // L: 2462 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field88; // L: 2463 + return 1; // L: 2464 + } else if (var0 == 3810) { // L: 2466 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2467 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.field154.field99[var3]; // L: 2468 + return 1; // L: 2469 + } else if (var0 == 3811) { // L: 2471 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2472 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field76[var3]; // L: 2473 + return 1; // L: 2474 + } else if (var0 == 3812) { // L: 2476 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field97; // L: 2477 + return 1; // L: 2478 + } else if (var0 == 3813) { // L: 2480 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2481 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.field154.field105[var3]; // L: 2482 + return 1; // L: 2483 + } else { + int var5; + int var6; + if (var0 == 3814) { // L: 2485 + class16.Interpreter_intStackSize -= 3; // L: 2486 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2487 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2488 + var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2489 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.method143(var3, var6, var5); // L: 2490 + return 1; // L: 2491 + } else if (var0 == 3815) { // L: 2493 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field100; // L: 2494 + return 1; // L: 2495 + } else if (var0 == 3816) { // L: 2497 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field96; // L: 2498 + return 1; // L: 2499 + } else if (var0 == 3817) { // L: 2501 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.method142(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2502 + return 1; // L: 2503 + } else if (var0 == 3818) { // L: 2505 + Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1] = class19.field154.method159()[Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1]]; // L: 2506 + return 1; // L: 2507 + } else if (var0 == 3819) { // L: 2509 + class16.Interpreter_intStackSize -= 2; // L: 2510 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2511 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2512 + ClientPacket.method3885(var6, var3); // L: 2513 + return 1; // L: 2514 + } else if (var0 == 3820) { // L: 2516 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2517 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field94[var3]; // L: 2518 + return 1; // L: 2519 + } else { + if (var0 == 3821) { // L: 2521 + class16.Interpreter_intStackSize -= 3; // L: 2522 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2523 + boolean var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 2524 + var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2525 + class4.method75(var5, var3, var4); // L: 2526 + } + + if (var0 == 3822) { // L: 2528 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2529 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.field154.field78[var3] ? 1 : 0; // L: 2530 + return 1; // L: 2531 + } else if (var0 == 3850) { // L: 2533 + if (IsaacCipher.field4266 != null) { // L: 2534 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2535 + Interpreter.field941 = IsaacCipher.field4266; // L: 2536 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2538 + } + + return 1; // L: 2539 + } else if (var0 == 3851) { // L: 2541 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2542 + if (Client.field820[var3] != null) { // L: 2543 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2544 + Interpreter.field941 = Client.field820[var3]; // L: 2545 + class25.field197 = var3; // L: 2546 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2548 + } + + return 1; // L: 2549 + } else if (var0 == 3852) { // L: 2551 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.field941.field25; // L: 2552 + return 1; // L: 2553 + } else if (var0 == 3853) { // L: 2555 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.field30; // L: 2556 + return 1; // L: 2557 + } else if (var0 == 3854) { // L: 2559 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.field31; // L: 2560 + return 1; // L: 2561 + } else if (var0 == 3855) { // L: 2563 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.method46(); // L: 2564 + return 1; // L: 2565 + } else if (var0 == 3856) { // L: 2567 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2568 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((class9)Interpreter.field941.field27.get(var3)).field65; // L: 2569 + return 1; // L: 2570 + } else if (var0 == 3857) { // L: 2572 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2573 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((class9)Interpreter.field941.field27.get(var3)).field66; // L: 2574 + return 1; // L: 2575 + } else if (var0 == 3858) { // L: 2577 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2578 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((class9)Interpreter.field941.field27.get(var3)).field64; // L: 2579 + return 1; // L: 2580 + } else if (var0 == 3859) { // L: 2582 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2583 + GraphicsObject.method1913(class25.field197, var3); // L: 2584 + return 1; // L: 2585 + } else if (var0 == 3860) { // L: 2587 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Interpreter.field941.method43(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2588 + return 1; // L: 2589 + } else if (var0 == 3861) { // L: 2591 + Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1] = Interpreter.field941.method44()[Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1]]; // L: 2592 + return 1; // L: 2593 + } else if (var0 == 3890) { // L: 2595 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Coord.field2591 != null ? 1 : 0; // L: 2596 + return 1; // L: 2597 + } else { + return 2; // L: 2599 + } + } + } + } } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 8514405e43..5efa88c8c7 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,74 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("cj") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("args") Object[] args; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhu;" ) @Export("widget") Widget widget; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1697635159 + intValue = 1784296503 ) @Export("mouseX") int mouseX; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 734230281 + intValue = -1719559371 ) @Export("mouseY") int mouseY; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 944694965 + intValue = 770661921 ) @Export("opIndex") int opIndex; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhu;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -905189557 + intValue = 2016047147 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 220260505 + intValue = 1513404237 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("targetName") String targetName; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1071641047 + intValue = -1732094063 ) - int field593; - @ObfuscatedName("b") + int field1154; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1196618585 + intValue = 360823723 ) @Export("type") int type; @@ -80,43 +74,36 @@ public class ScriptEvent extends Node { this.type = 76; // L: 19 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "807576822" + descriptor = "([Ljava/lang/Object;B)V", + garbageValue = "18" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; // L: 22 } // L: 23 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-67" + descriptor = "(II)V", + garbageValue = "1577560500" ) @Export("setType") public void setType(int var1) { this.type = var1; // L: 26 } // L: 27 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(Lir;Lir;ZLkq;B)V", + garbageValue = "15" ) - public static void method1271() { - class105.reflectionChecks = new IterableNodeDeque(); // L: 24 - } // L: 25 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1068960678" - ) - public static void method1272() { - VertexNormal.midiPcmStream.clear(); // L: 44 - class206.musicPlayerStatus = 1; // L: 45 - class206.musicTrackArchive = null; // L: 46 - } // L: 47 + public static void method2101(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + Widget.ItemDefinition_archive = var0; // L: 84 + ItemComposition.ItemDefinition_modelArchive = var1; // L: 85 + class21.ItemDefinition_inMembersWorld = var2; // L: 86 + UserComparator8.ItemDefinition_fileCount = Widget.ItemDefinition_archive.getGroupFileCount(10); // L: 87 + DevicePcmPlayerProvider.ItemDefinition_fontPlain11 = var3; // L: 88 + } // L: 89 } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 4cd55a2b21..25163050ec 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -3,33 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bz") +@ObfuscatedName("bg") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("fl") + @ObfuscatedName("e") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("h") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("jw") @ObfuscatedSignature( - descriptor = "Led;" + descriptor = "Lhu;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("n") + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lcl;" + descriptor = "Lcc;" ) @Export("script") Script script; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1121255489 + intValue = 264975789 ) @Export("pc") int pc; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("intLocals") int[] intLocals; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("stringLocals") String[] stringLocals; @@ -37,64 +42,34 @@ public class ScriptFrame { this.pc = -1; // L: 5 } // L: 9 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Ljz;", - garbageValue = "0" + descriptor = "([BI)[B", + garbageValue = "-13856825" ) - public static HitSplatDefinition method1222(int var0) { - HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52 - if (var1 != null) { // L: 53 - return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 - var1 = new HitSplatDefinition(); // L: 55 - if (var2 != null) { // L: 56 - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 - return var1; // L: 58 - } + public static byte[] method1175(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("al") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "461265882" + descriptor = "(B)Lbu;", + garbageValue = "86" ) - static int method1221(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3196 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.getWindowedMode(); // L: 3197 - return 1; // L: 3198 - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3200 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3201 - if (var3 == 1 || var3 == 2) { // L: 3202 - GameBuild.setWindowedMode(var3); - } - - return 1; // L: 3203 - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3205 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.clientPreferences.windowMode; // L: 3206 - return 1; // L: 3207 - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3209 - if (var0 == 5310) { // L: 3217 - --Interpreter.Interpreter_intStackSize; // L: 3218 - return 1; // L: 3219 - } else { - return 2; // L: 3221 - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3210 - if (var3 == 1 || var3 == 2) { // L: 3211 - WorldMapSectionType.clientPreferences.windowMode = var3; // L: 3212 - class23.savePreferences(); // L: 3213 - } - - return 1; // L: 3215 - } - } + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class9.World_worlds[++World.World_listCount - 1] : null; // L: 252 253 } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(Lcd;II)V", + garbageValue = "-395421228" + ) + static final void method1173(Actor var0, int var1) { + class14.worldToScreen(var0.x, var0.y, var1); // L: 4604 + } // L: 4605 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 59afff9a19..35ade71715 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,203 +1,22 @@ +import java.applet.Applet; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("cq") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lip;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("fp") - @ObfuscatedSignature( - descriptor = "Lkl;" - ) - @Export("fontPlain11") - static Font fontPlain11; + @ObfuscatedName("f") + @Export("RunException_applet") + public static Applet RunException_applet; + @ObfuscatedName("g") + static byte[][][] field1106; SecureRandomCallable() { } // L: 36 public Object call() { - return class39.method643(); // L: 45 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1343548281" - ) - static final int method1226(int var0, int var1) { - if (var0 == -2) { // L: 573 - return 12345678; - } else if (var0 == -1) { // L: 574 - if (var1 < 2) { // L: 575 - var1 = 2; - } else if (var1 > 126) { // L: 576 - var1 = 126; - } - - return var1; // L: 577 - } else { - var1 = (var0 & 127) * var1 / 128; // L: 579 - if (var1 < 2) { // L: 580 - var1 = 2; - } else if (var1 > 126) { // L: 581 - var1 = 126; - } - - return (var0 & 65408) + var1; // L: 582 - } - } - - @ObfuscatedName("fq") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-33" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); // L: 2525 - class228.method4311(); // L: 2527 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2529 - KitDefinition.KitDefinition_cached.clear(); // L: 2532 - ObjectComposition.ObjectDefinition_cached.clear(); // L: 2535 - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2536 - ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2537 - ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2538 - NPCComposition.NpcDefinition_cached.clear(); // L: 2541 - NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2542 - ItemComposition.ItemDefinition_cached.clear(); // L: 2545 - ItemComposition.ItemDefinition_cachedModels.clear(); // L: 2546 - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 2547 - SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2550 - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2551 - WorldMapEvent.method851(); // L: 2553 - VarbitComposition.VarbitDefinition_cached.clear(); // L: 2555 - World.method1924(); // L: 2557 - KeyHandler.method913(); // L: 2558 - Tile.method3032(); // L: 2559 - StructComposition.StructDefinition_cached.clear(); // L: 2561 - ParamComposition.ParamDefinition_cached.clear(); // L: 2564 - ItemLayer.method2938(); // L: 2566 - PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2568 - WorldMapEvent.method850(); // L: 2570 - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2571 - Script.Script_cached.clear(); // L: 2572 - class52.archive0.clearFiles(); // L: 2573 - SpriteMask.archive1.clearFiles(); // L: 2574 - PlayerComposition.archive3.clearFiles(); // L: 2575 - WorldMapCacheName.archive4.clearFiles(); // L: 2576 - class8.archive5.clearFiles(); // L: 2577 - UrlRequester.archive6.clearFiles(); // L: 2578 - WorldMapData_0.archive7.clearFiles(); // L: 2579 - ModeWhere.archive8.clearFiles(); // L: 2580 - ViewportMouse.archive9.clearFiles(); // L: 2581 - LoginScreenAnimation.archive10.clearFiles(); // L: 2582 - WorldMapManager.archive11.clearFiles(); // L: 2583 - WorldMapSection0.archive12.clearFiles(); // L: 2584 - MilliClock.scene.clear(); // L: 2586 - - for (int var0 = 0; var0 < 4; ++var0) { // L: 2587 - Client.collisionMaps[var0].clear(); - } - - System.gc(); // L: 2588 - class206.musicPlayerStatus = 1; // L: 2590 - class206.musicTrackArchive = null; // L: 2591 - class206.musicTrackGroupId = -1; // L: 2592 - SoundSystem.musicTrackFileId = -1; // L: 2593 - DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 2594 - class206.musicTrackBoolean = false; // L: 2595 - class7.pcmSampleLength = 2; // L: 2596 - Client.currentTrackGroupId = -1; // L: 2598 - Client.field899 = false; // L: 2599 - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 2601 - if (var1.stream1 != null) { // L: 2602 - VarbitComposition.pcmStreamMixer.removeSubStream(var1.stream1); // L: 2603 - var1.stream1 = null; // L: 2604 - } - - if (var1.stream2 != null) { // L: 2606 - VarbitComposition.pcmStreamMixer.removeSubStream(var1.stream2); // L: 2607 - var1.stream2 = null; // L: 2608 - } - } - - ObjectSound.objectSounds.clear(); // L: 2611 - ItemContainer.updateGameState(10); // L: 2613 - } // L: 2614 - - @ObfuscatedName("fl") - @ObfuscatedSignature( - descriptor = "(Lhz;III)V", - garbageValue = "860211947" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3409 - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3410 - SpriteMask var3 = var0.getSpriteMask(true); // L: 3411 - if (var3 == null) { // L: 3412 - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3413 - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3414 - if (var3.contains(var4, var5)) { // L: 3415 - var4 -= var3.width / 2; // L: 3416 - var5 -= var3.height / 2; // L: 3417 - int var6 = Client.camAngleY & 2047; // L: 3418 - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3419 - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3420 - int var9 = var4 * var8 + var5 * var7 >> 11; // L: 3421 - int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3422 - int var11 = var9 + UserComparator9.localPlayer.x >> 7; // L: 3423 - int var12 = UserComparator9.localPlayer.y - var10 >> 7; // L: 3424 - PacketBufferNode var13 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); // L: 3426 - var13.packetBuffer.writeByte(18); // L: 3427 - var13.packetBuffer.method5778(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3428 - var13.packetBuffer.writeIntME(var12 + NetCache.baseY); // L: 3429 - var13.packetBuffer.writeShort(var11 + GrandExchangeOfferNameComparator.baseX); // L: 3430 - var13.packetBuffer.writeByte(var4); // L: 3431 - var13.packetBuffer.writeByte(var5); // L: 3432 - var13.packetBuffer.writeShort(Client.camAngleY); // L: 3433 - var13.packetBuffer.writeByte(57); // L: 3434 - var13.packetBuffer.writeByte(0); // L: 3435 - var13.packetBuffer.writeByte(0); // L: 3436 - var13.packetBuffer.writeByte(89); // L: 3437 - var13.packetBuffer.writeShort(UserComparator9.localPlayer.x); // L: 3438 - var13.packetBuffer.writeShort(UserComparator9.localPlayer.y); // L: 3439 - var13.packetBuffer.writeByte(63); // L: 3440 - Client.packetWriter.addNode(var13); // L: 3441 - Client.destinationX = var11; // L: 3442 - Client.destinationY = var12; // L: 3443 - } - } - - } - } // L: 3446 - - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-358852627" - ) - static int method1233(int var0, int var1) { - int var2 = var1 - 334; // L: 4926 - if (var2 < 0) { // L: 4927 - var2 = 0; - } else if (var2 > 100) { // L: 4928 - var2 = 100; - } - - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 4929 - return var0 * var3 / 256; // L: 4930 + return class238.method4380(); // L: 45 } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 8db4ea4c65..5469bcc01e 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,23 +4,16 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("co") +@ObfuscatedName("cz") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("hu") - @ObfuscatedGetter( - intValue = 1859145773 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("executor") ExecutorService executor; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("future") Future future; @@ -29,10 +22,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 } // L: 15 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "767065272" + garbageValue = "1367386525" ) @Export("shutdown") void shutdown() { @@ -40,27 +33,63 @@ public class SecureRandomFuture { this.executor = null; // L: 19 } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "10550" + descriptor = "(I)Z", + garbageValue = "16711680" ) @Export("isDone") boolean isDone() { return this.future.isDone(); // L: 23 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "0" + garbageValue = "-104" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); // L: 28 } catch (Exception var2) { // L: 30 - return class39.method643(); // L: 31 + return class238.method4380(); // L: 31 } } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1485262906" + ) + @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 } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index e0f28b85d3..e00c50f1a0 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -1,103 +1,95 @@ -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("js") +@ObfuscatedName("kw") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("v") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("c") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("SequenceDefinition_cached") - public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("y") + static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("SequenceDefinition_cachedFrames") - public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("h") + static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("e") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1919989745 + intValue = -888681217 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("s") - int[] field3552; - @ObfuscatedName("b") - public boolean field3559; - @ObfuscatedName("a") + @ObfuscatedName("l") + int[] field3716; + @ObfuscatedName("m") + public boolean field3712; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 784302735 + intValue = 1130836393 ) - public int field3560; - @ObfuscatedName("w") + public int field3718; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1358417643 + intValue = 28936023 ) @Export("shield") public int shield; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -625225869 + intValue = -1915786669 ) @Export("weapon") public int weapon; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1105922697 + intValue = -933418559 ) - public int field3563; - @ObfuscatedName("x") + public int field3721; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1806231631 + intValue = -891959581 ) - public int field3564; - @ObfuscatedName("f") + public int field3722; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1659033173 + intValue = 468418513 ) - public int field3565; - @ObfuscatedName("g") + public int field3723; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 674051905 + intValue = 167187007 ) - public int field3548; + public int field3707; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15 @@ -106,311 +98,268 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; // L: 21 - this.field3559 = false; // L: 23 - this.field3560 = 5; // L: 24 + this.field3712 = false; // L: 23 + this.field3718 = 5; // L: 24 this.shield = -1; // L: 25 this.weapon = -1; // L: 26 - this.field3563 = 99; // L: 27 - this.field3564 = -1; // L: 28 - this.field3565 = -1; // L: 29 - this.field3548 = 2; // L: 30 + this.field3721 = 99; // L: 27 + this.field3722 = -1; // L: 28 + this.field3723 = -1; // L: 29 + this.field3707 = 2; // L: 30 } // L: 32 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1298412871" + descriptor = "(Lnu;I)V", + garbageValue = "633278870" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 53 - if (var2 == 0) { // L: 54 - return; // L: 57 + int var2 = var1.readUnsignedByte(); // L: 47 + if (var2 == 0) { // L: 48 + return; // L: 51 } - this.decodeNext(var1, var2); // L: 55 + this.decodeNext(var1, var2); // L: 49 } } - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-1464269067" + descriptor = "(Lnu;IB)V", + garbageValue = "1" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { // L: 60 - var3 = var1.readUnsignedShort(); // L: 61 - this.frameLengths = new int[var3]; // L: 62 + if (var2 == 1) { // L: 54 + var3 = var1.readUnsignedShort(); // L: 55 + this.frameLengths = new int[var3]; // L: 56 - for (var4 = 0; var4 < var3; ++var4) { // L: 63 + for (var4 = 0; var4 < var3; ++var4) { // L: 57 this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; // L: 64 + this.frameIds = new int[var3]; // L: 58 - for (var4 = 0; var4 < var3; ++var4) { // L: 65 + for (var4 = 0; var4 < var3; ++var4) { // L: 59 this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 66 + for (var4 = 0; var4 < var3; ++var4) { // L: 60 this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { // L: 68 + } else if (var2 == 2) { // L: 62 this.frameCount = var1.readUnsignedShort(); - } else if (var2 == 3) { // L: 69 - var3 = var1.readUnsignedByte(); // L: 70 - this.field3552 = new int[var3 + 1]; // L: 71 + } else if (var2 == 3) { // L: 63 + var3 = var1.readUnsignedByte(); // L: 64 + this.field3716 = new int[var3 + 1]; // L: 65 - for (var4 = 0; var4 < var3; ++var4) { // L: 72 - this.field3552[var4] = var1.readUnsignedByte(); + for (var4 = 0; var4 < var3; ++var4) { // L: 66 + this.field3716[var4] = var1.readUnsignedByte(); } - this.field3552[var3] = 9999999; // L: 73 - } else if (var2 == 4) { // L: 75 - this.field3559 = true; - } else if (var2 == 5) { // L: 76 - this.field3560 = var1.readUnsignedByte(); - } else if (var2 == 6) { // L: 77 + this.field3716[var3] = 9999999; // L: 67 + } else if (var2 == 4) { // L: 69 + this.field3712 = true; + } else if (var2 == 5) { // L: 70 + this.field3718 = var1.readUnsignedByte(); + } else if (var2 == 6) { // L: 71 this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { // L: 78 + } else if (var2 == 7) { // L: 72 this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { // L: 79 - this.field3563 = var1.readUnsignedByte(); - } else if (var2 == 9) { // L: 80 - this.field3564 = var1.readUnsignedByte(); - } else if (var2 == 10) { // L: 81 - this.field3565 = var1.readUnsignedByte(); - } else if (var2 == 11) { // L: 82 - this.field3548 = var1.readUnsignedByte(); - } else if (var2 == 12) { // L: 83 - var3 = var1.readUnsignedByte(); // L: 84 - this.chatFrameIds = new int[var3]; // L: 85 + } else if (var2 == 8) { // L: 73 + this.field3721 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 74 + this.field3722 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 75 + this.field3723 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 76 + this.field3707 = 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) { // L: 86 + for (var4 = 0; var4 < var3; ++var4) { // L: 80 this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { // L: 87 + for (var4 = 0; var4 < var3; ++var4) { // L: 81 this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { // L: 89 - var3 = var1.readUnsignedByte(); // L: 90 - this.soundEffects = new int[var3]; // L: 91 + } else if (var2 == 13) { // L: 83 + var3 = var1.readUnsignedByte(); // L: 84 + this.soundEffects = new int[var3]; // L: 85 - for (var4 = 0; var4 < var3; ++var4) { // L: 92 + for (var4 = 0; var4 < var3; ++var4) { // L: 86 this.soundEffects[var4] = var1.readMedium(); } } - } // L: 95 + } // L: 89 - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-49" + garbageValue = "6" ) @Export("postDecode") void postDecode() { - if (this.field3564 == -1) { // L: 98 - if (this.field3552 != null) { // L: 99 - this.field3564 = 2; + if (this.field3722 == -1) { // L: 92 + if (this.field3716 != null) { // L: 93 + this.field3722 = 2; } else { - this.field3564 = 0; // L: 100 + this.field3722 = 0; // L: 94 } } - if (this.field3565 == -1) { // L: 102 - if (this.field3552 != null) { // L: 103 - this.field3565 = 2; + if (this.field3723 == -1) { // L: 96 + if (this.field3716 != null) { // L: 97 + this.field3723 = 2; } else { - this.field3565 = 0; // L: 104 + this.field3723 = 0; // L: 98 } } - } // L: 106 + } // L: 100 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lef;II)Lef;", - garbageValue = "2114263360" + descriptor = "(Lgv;IB)Lgv;", + garbageValue = "96" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { - var2 = this.frameIds[var2]; // L: 109 - Frames var3 = ClientPreferences.getFrames(var2 >> 16); // L: 110 - var2 &= 65535; // L: 111 - if (var3 == null) { // L: 112 + var2 = this.frameIds[var2]; // L: 103 + Frames var3 = AttackOption.getFrames(var2 >> 16); // L: 104 + var2 &= 65535; // L: 105 + if (var3 == null) { // L: 106 return var1.toSharedSequenceModel(true); } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 113 - var4.animate(var3, var2); // L: 114 - return var4; // L: 115 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lef;IIS)Lef;", - garbageValue = "-75" - ) - @Export("transformObjectModel") - Model transformObjectModel(Model var1, int var2, int var3) { - var2 = this.frameIds[var2]; // L: 119 - Frames var4 = ClientPreferences.getFrames(var2 >> 16); // L: 120 - var2 &= 65535; // L: 121 - if (var4 == null) { // L: 122 - return var1.toSharedSequenceModel(true); - } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); // L: 123 - var3 &= 3; // L: 124 - if (var3 == 1) { // L: 125 - var5.rotateY270Ccw(); - } else if (var3 == 2) { // L: 126 - var5.rotateY180(); - } else if (var3 == 3) { // L: 127 - var5.rotateY90Ccw(); - } - - var5.animate(var4, var2); // L: 128 - if (var3 == 1) { // L: 129 - var5.rotateY90Ccw(); - } else if (var3 == 2) { // L: 130 - var5.rotateY180(); - } else if (var3 == 3) { // L: 131 - var5.rotateY270Ccw(); - } - - return var5; // L: 132 + Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 107 + var4.animate(var3, var2); // L: 108 + return var4; // L: 109 } } @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lef;IB)Lef;", - garbageValue = "26" + descriptor = "(Lgv;III)Lgv;", + garbageValue = "2141999408" + ) + @Export("transformObjectModel") + Model transformObjectModel(Model var1, int var2, int var3) { + var2 = this.frameIds[var2]; // L: 113 + Frames var4 = AttackOption.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("k") + @ObfuscatedSignature( + descriptor = "(Lgv;IB)Lgv;", + garbageValue = "17" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { - var2 = this.frameIds[var2]; // L: 136 - Frames var3 = ClientPreferences.getFrames(var2 >> 16); // L: 137 - var2 &= 65535; // L: 138 - if (var3 == null) { // L: 139 - return var1.toSharedSpotAnimationModel(true); + var2 = this.frameIds[var2]; // L: 130 + Frames var3 = AttackOption.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: 140 - var4.animate(var3, var2); // L: 141 - return var4; // L: 142 + Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); // L: 134 + var4.animate(var3, var2); // L: 135 + return var4; // L: 136 } } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lef;ILjs;II)Lef;", - garbageValue = "-1897802113" + descriptor = "(Lgv;ILkw;II)Lgv;", + garbageValue = "-1406133435" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; // L: 146 - Frames var5 = ClientPreferences.getFrames(var2 >> 16); // L: 147 - var2 &= 65535; // L: 148 - if (var5 == null) { // L: 149 + var2 = this.frameIds[var2]; // L: 140 + Frames var5 = AttackOption.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: 150 - Frames var6 = ClientPreferences.getFrames(var4 >> 16); // L: 151 - var4 &= 65535; // L: 152 + var4 = var3.frameIds[var4]; // L: 144 + Frames var6 = AttackOption.getFrames(var4 >> 16); // L: 145 + var4 &= 65535; // L: 146 Model var7; - if (var6 == null) { // L: 153 - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 154 - var7.animate(var5, var2); // L: 155 - return var7; // L: 156 + 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: 158 - var7.animate2(var5, var2, var6, var4, this.field3552); // L: 159 - return var7; // L: 160 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 + var7.animate2(var5, var2, var6, var4, this.field3716); // L: 153 + return var7; // L: 154 } } } - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lef;II)Lef;", - garbageValue = "620650049" + descriptor = "(Lgv;II)Lgv;", + garbageValue = "2014076676" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - int var3 = this.frameIds[var2]; // L: 164 - Frames var4 = ClientPreferences.getFrames(var3 >> 16); // L: 165 - var3 &= 65535; // L: 166 - if (var4 == null) { // L: 167 + int var3 = this.frameIds[var2]; // L: 158 + Frames var4 = AttackOption.getFrames(var3 >> 16); // L: 159 + var3 &= 65535; // L: 160 + if (var4 == null) { // L: 161 return var1.toSharedSequenceModel(true); } else { - Frames var5 = null; // L: 168 - int var6 = 0; // L: 169 - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 170 - var6 = this.chatFrameIds[var2]; // L: 171 - var5 = ClientPreferences.getFrames(var6 >> 16); // L: 172 - var6 &= 65535; // L: 173 + 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 = AttackOption.getFrames(var6 >> 16); // L: 166 + var6 &= 65535; // L: 167 } Model var7; - if (var5 != null && var6 != 65535) { // L: 175 - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 180 - var7.animate(var4, var3); // L: 181 - var7.animate(var5, var6); // L: 182 - return var7; // L: 183 + 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)); // L: 176 - var7.animate(var4, var3); // L: 177 - return var7; // L: 178 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 170 + var7.animate(var4, var3); // L: 171 + return var7; // L: 172 } } } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", - garbageValue = "-109" - ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; // L: 33 - if (var1 != null) { // L: 34 - var2 = class238.method4334(var1); - } - - if (var0 != null) { // L: 35 - if (var1 != null) { // L: 36 - var2 = var2 + " | "; - } - - var2 = var2 + var0; // L: 37 - } - - System.out.println("Error: " + var2); // L: 39 - var2 = var2.replace(':', '.'); // L: 40 - var2 = var2.replace('@', '_'); // L: 41 - var2 = var2.replace('&', '_'); // L: 42 - var2 = var2.replace('#', '_'); // L: 43 - if (RunException.RunException_applet == null) { // L: 44 - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + class1.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class217.clientType + "&e=" + var2); // L: 45 - DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 - var4.read(); // L: 47 - var4.close(); // L: 48 - } catch (Exception var5) { // L: 50 - } - - } - } // L: 51 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 77bab05ef7..15b958dc2c 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -1,581 +1,791 @@ +import java.io.IOException; +import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gg") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2205; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2143; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2144; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2146; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2210; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2149; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2195; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2151; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2141; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2198; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2154; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2157; @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2158; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2160; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2161; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2207; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2152; + public static final ServerPacket field2370; @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2165; + public static final ServerPacket field2351; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2431; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2353; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2354; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2355; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2356; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2357; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2358; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2359; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2432; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2426; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2362; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2363; @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2166; - @ObfuscatedName("ay") + public static final ServerPacket field2422; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2145; - @ObfuscatedName("am") + public static final ServerPacket field2380; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2184; - @ObfuscatedName("ag") + public static final ServerPacket field2366; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2169; - @ObfuscatedName("ae") + public static final ServerPacket field2364; + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2170; + public static final ServerPacket field2368; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2369; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2352; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2433; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2367; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2373; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2374; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2428; @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2188; + public static final ServerPacket field2376; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2377; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2378; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2379; @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2164; + public static final ServerPacket field2393; @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2173; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2174; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2178; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2181; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2182; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2183; + public static final ServerPacket field2392; @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2203; - @ObfuscatedName("an") + public static final ServerPacket field2446; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2185; - @ObfuscatedName("ai") + public static final ServerPacket field2383; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2150; - @ObfuscatedName("ab") + public static final ServerPacket field2384; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2224; - @ObfuscatedName("au") + public static final ServerPacket field2385; + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2221; + public static final ServerPacket field2361; @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2189; + public static final ServerPacket field2387; @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2190; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2216; + public static final ServerPacket field2409; @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2186; - @ObfuscatedName("bj") + public static final ServerPacket field2382; + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2193; - @ObfuscatedName("bn") + public static final ServerPacket field2413; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2194; - @ObfuscatedName("bi") + public static final ServerPacket field2391; + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2202; - @ObfuscatedName("bp") + public static final ServerPacket field2375; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2196; - @ObfuscatedName("br") + public static final ServerPacket field2372; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2197; - @ObfuscatedName("bq") + public static final ServerPacket field2388; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2191; - @ObfuscatedName("bx") + public static final ServerPacket field2436; + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2199; - @ObfuscatedName("bc") + public static final ServerPacket field2396; + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2200; - @ObfuscatedName("bw") + public static final ServerPacket field2390; + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2206; - @ObfuscatedName("bv") + public static final ServerPacket field2398; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2192; - @ObfuscatedName("bt") + public static final ServerPacket field2399; + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2220; - @ObfuscatedName("bl") + public static final ServerPacket field2400; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2204; + public static final ServerPacket field2401; @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2226; - @ObfuscatedName("bz") + public static final ServerPacket field2402; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2167; - @ObfuscatedName("bg") + public static final ServerPacket field2403; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2215; - @ObfuscatedName("bm") + public static final ServerPacket field2394; + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2208; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2209; - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2179; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2211; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2212; + public static final ServerPacket field2405; @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2213; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2214; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lgb;" - ) - public static final ServerPacket field2142; + public static final ServerPacket field2406; @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2148; - @ObfuscatedName("bu") + public static final ServerPacket field2407; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2217; + public static final ServerPacket field2408; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2448; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2410; @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2218; - @ObfuscatedName("cv") + public static final ServerPacket field2411; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2219; - @ObfuscatedName("cd") + public static final ServerPacket field2412; + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2187; - @ObfuscatedName("cq") + public static final ServerPacket field2381; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2201; - @ObfuscatedName("cb") + public static final ServerPacket field2414; + @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2180; + public static final ServerPacket field2415; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2371; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2417; + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2418; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2419; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2395; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2421; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2386; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2423; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2424; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2425; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2416; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2427; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2404; @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2223; + public static final ServerPacket field2350; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2365; + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2434; @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2162; - @ObfuscatedName("ck") + public static final ServerPacket field2430; + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2225; + public static final ServerPacket field2360; + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2397; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2435; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2429; @ObfuscatedName("cn") @ObfuscatedSignature( - descriptor = "Lgb;" + descriptor = "Lgg;" ) - public static final ServerPacket field2222; + public static final ServerPacket field2437; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2438; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2439; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2389; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2441; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2442; + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2443; + @ObfuscatedName("cv") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2444; @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2445; + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "Lgg;" + ) + public static final ServerPacket field2440; + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 2010770863 + intValue = -634167591 ) @Export("id") public final int id; @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -355482847 + intValue = -631403881 ) @Export("length") public final int length; static { - field2172 = new ServerPacket(0, 3); // L: 5 - field2205 = new ServerPacket(1, 6); // L: 6 - field2143 = new ServerPacket(2, -2); // L: 7 - field2144 = new ServerPacket(3, 0); // L: 8 - field2153 = new ServerPacket(4, 5); // L: 9 - field2146 = new ServerPacket(5, -2); // L: 10 - field2147 = new ServerPacket(6, 6); // L: 11 - field2210 = new ServerPacket(7, 8); // L: 12 - field2149 = new ServerPacket(8, 10); // L: 13 - field2195 = new ServerPacket(9, -2); // L: 14 - field2151 = new ServerPacket(10, 0); // L: 15 - field2141 = new ServerPacket(11, 6); // L: 16 - field2198 = new ServerPacket(12, 4); // L: 17 - field2154 = new ServerPacket(13, -2); // L: 18 - field2155 = new ServerPacket(14, 6); // L: 19 - field2156 = new ServerPacket(15, -2); // L: 20 - field2157 = new ServerPacket(16, 6); // L: 21 - field2158 = new ServerPacket(17, 7); // L: 22 - field2159 = new ServerPacket(18, -2); // L: 23 - field2160 = new ServerPacket(19, -2); // L: 24 - field2161 = new ServerPacket(20, 1); // L: 25 - field2207 = new ServerPacket(21, 6); // L: 26 - field2163 = new ServerPacket(22, 5); // L: 27 - field2152 = new ServerPacket(23, 1); // L: 28 - field2165 = new ServerPacket(24, 6); // L: 29 - field2166 = new ServerPacket(25, 8); // L: 30 - field2145 = new ServerPacket(26, 1); // L: 31 - field2184 = new ServerPacket(27, 28); // L: 32 - field2169 = new ServerPacket(28, 6); // L: 33 - field2170 = new ServerPacket(29, 10); // L: 34 - field2188 = new ServerPacket(30, 0); // L: 35 - field2164 = new ServerPacket(31, 6); // L: 36 - field2173 = new ServerPacket(32, -2); // L: 37 - field2174 = new ServerPacket(33, 4); // L: 38 - field2175 = new ServerPacket(34, 7); // L: 39 - field2176 = new ServerPacket(35, -2); // L: 40 - field2177 = new ServerPacket(36, 4); // L: 41 - field2178 = new ServerPacket(37, 0); // L: 42 - field2168 = new ServerPacket(38, 2); // L: 43 - field2171 = new ServerPacket(39, -1); // L: 44 - field2181 = new ServerPacket(40, -2); // L: 45 - field2182 = new ServerPacket(41, 2); // L: 46 - field2183 = new ServerPacket(42, 5); // L: 47 - field2203 = new ServerPacket(43, 2); // L: 48 - field2185 = new ServerPacket(44, 2); // L: 49 - field2150 = new ServerPacket(45, 4); // L: 50 - field2224 = new ServerPacket(46, 2); // L: 51 - field2221 = new ServerPacket(47, -2); // L: 52 - field2189 = new ServerPacket(48, 2); // L: 53 - field2190 = new ServerPacket(49, 6); // L: 54 - field2216 = new ServerPacket(50, 8); // L: 55 - field2186 = new ServerPacket(51, 0); // L: 56 - field2193 = new ServerPacket(52, 1); // L: 57 - field2194 = new ServerPacket(53, -2); // L: 58 - field2202 = new ServerPacket(54, 8); // L: 59 - field2196 = new ServerPacket(55, -1); // L: 60 - field2197 = new ServerPacket(56, 20); // L: 61 - field2191 = new ServerPacket(57, -1); // L: 62 - field2199 = new ServerPacket(58, -2); // L: 63 - field2200 = new ServerPacket(59, -2); // L: 64 - field2206 = new ServerPacket(60, 5); // L: 65 - field2192 = new ServerPacket(61, 4); // L: 66 - field2220 = new ServerPacket(62, 4); // L: 67 - field2204 = new ServerPacket(63, -2); // L: 68 - field2226 = new ServerPacket(64, -2); // L: 69 - field2167 = new ServerPacket(65, 5); // L: 70 - field2215 = new ServerPacket(66, -2); // L: 71 - field2208 = new ServerPacket(67, 0); // L: 72 - field2209 = new ServerPacket(68, 12); // L: 73 - field2179 = new ServerPacket(69, -2); // L: 74 - field2211 = new ServerPacket(70, 0); // L: 75 - field2212 = new ServerPacket(71, 6); // L: 76 - field2213 = new ServerPacket(72, 14); // L: 77 - field2214 = new ServerPacket(73, -1); // L: 78 - field2142 = new ServerPacket(74, -2); // L: 79 - field2148 = new ServerPacket(75, 2); // L: 80 - field2217 = new ServerPacket(76, 4); // L: 81 - field2218 = new ServerPacket(77, 15); // L: 82 - field2219 = new ServerPacket(78, 2); // L: 83 - field2187 = new ServerPacket(79, -1); // L: 84 - field2201 = new ServerPacket(80, 1); // L: 85 - field2180 = new ServerPacket(81, 2); // L: 86 - field2223 = new ServerPacket(82, 1); // L: 87 - field2162 = new ServerPacket(83, -1); // L: 88 - field2225 = new ServerPacket(84, 2); // L: 89 - field2222 = new ServerPacket(85, 3); // L: 90 + field2370 = new ServerPacket(0, 14); // L: 5 + field2351 = new ServerPacket(1, 0); // L: 6 + field2431 = new ServerPacket(2, -2); // L: 7 + field2353 = new ServerPacket(3, 2); // L: 8 + field2354 = new ServerPacket(4, -2); // L: 9 + field2355 = new ServerPacket(5, 3); + field2356 = new ServerPacket(6, 6); // L: 11 + field2357 = new ServerPacket(7, 0); // L: 12 + field2358 = new ServerPacket(8, 1); // L: 13 + field2359 = new ServerPacket(9, 2); // L: 14 + field2432 = new ServerPacket(10, 2); // L: 15 + field2426 = new ServerPacket(11, -2); + field2362 = new ServerPacket(12, -2); // L: 17 + field2363 = new ServerPacket(13, 0); // L: 18 + field2422 = new ServerPacket(14, 1); // L: 19 + field2380 = new ServerPacket(15, -2); // L: 20 + field2366 = new ServerPacket(16, -2); // L: 21 + field2364 = new ServerPacket(17, 8); // L: 22 + field2368 = new ServerPacket(18, -2); // L: 23 + field2369 = new ServerPacket(19, 1); // L: 24 + field2352 = new ServerPacket(20, 6); // L: 25 + field2433 = new ServerPacket(21, 4); // L: 26 + field2367 = new ServerPacket(22, 0); // L: 27 + field2373 = new ServerPacket(23, 7); // L: 28 + field2374 = new ServerPacket(24, 1); // L: 29 + field2428 = new ServerPacket(25, 5); // L: 30 + field2376 = new ServerPacket(26, -2); // L: 31 + field2377 = new ServerPacket(27, -2); // L: 32 + field2378 = new ServerPacket(28, 20); // L: 33 + field2379 = new ServerPacket(29, 6); // L: 34 + field2393 = new ServerPacket(30, -1); // L: 35 + field2392 = new ServerPacket(31, 6); // L: 36 + field2446 = new ServerPacket(32, 2); // L: 37 + field2383 = new ServerPacket(33, 1); // L: 38 + field2384 = new ServerPacket(34, 6); // L: 39 + field2385 = new ServerPacket(35, -1); // L: 40 + field2361 = new ServerPacket(36, -2); // L: 41 + field2387 = new ServerPacket(37, 8); // L: 42 + field2409 = new ServerPacket(38, 6); // L: 43 + field2382 = new ServerPacket(39, -1); // L: 44 + field2413 = new ServerPacket(40, 8); // L: 45 + field2391 = new ServerPacket(41, 4); // L: 46 + field2375 = new ServerPacket(42, 6); // L: 47 + field2372 = new ServerPacket(43, 4); // L: 48 + field2388 = new ServerPacket(44, 2); // L: 49 + field2436 = new ServerPacket(45, 4); // L: 50 + field2396 = new ServerPacket(46, 4); // L: 51 + field2390 = new ServerPacket(47, 12); // L: 52 + field2398 = new ServerPacket(48, -1); // L: 53 + field2399 = new ServerPacket(49, 2); // L: 54 + field2400 = new ServerPacket(50, 6); // L: 55 + field2401 = new ServerPacket(51, 0); // L: 56 + field2402 = new ServerPacket(52, 28); // L: 57 + field2403 = new ServerPacket(53, 10); // L: 58 + field2394 = new ServerPacket(54, 6); // L: 59 + field2405 = new ServerPacket(55, 5); // L: 60 + field2406 = new ServerPacket(56, -2); // L: 61 + field2407 = new ServerPacket(57, 2); // L: 62 + field2408 = new ServerPacket(58, -2); // L: 63 + field2448 = new ServerPacket(59, 7); // L: 64 + field2410 = new ServerPacket(60, 0); // L: 65 + field2411 = new ServerPacket(61, 3); // L: 66 + field2412 = new ServerPacket(62, 4); // L: 67 + field2381 = new ServerPacket(63, -2); // L: 68 + field2414 = new ServerPacket(64, 2); // L: 69 + field2415 = new ServerPacket(65, 6); // L: 70 + field2371 = new ServerPacket(66, -1); // L: 71 + field2417 = new ServerPacket(67, 6); // L: 72 + field2418 = new ServerPacket(68, -2); // L: 73 + field2419 = new ServerPacket(69, 0); // L: 74 + field2395 = new ServerPacket(70, 10); // L: 75 + field2421 = new ServerPacket(71, -2); // L: 76 + field2386 = new ServerPacket(72, 4); // L: 77 + field2423 = new ServerPacket(73, 8); // L: 78 + field2424 = new ServerPacket(74, -2); // L: 79 + field2425 = new ServerPacket(75, 5); // L: 80 + field2416 = new ServerPacket(76, -2); // L: 81 + field2427 = new ServerPacket(77, 15); // L: 82 + field2404 = new ServerPacket(78, 5); // L: 83 + field2350 = new ServerPacket(79, 2); // L: 84 + field2365 = new ServerPacket(80, 1); // L: 85 + field2434 = new ServerPacket(81, -1); // L: 86 + field2430 = new ServerPacket(82, 5); // L: 87 + field2360 = new ServerPacket(83, 2); // L: 88 + field2397 = new ServerPacket(84, -2); // L: 89 + field2435 = new ServerPacket(85, -2); // L: 90 + field2429 = new ServerPacket(86, -2); // L: 91 + field2437 = new ServerPacket(87, -2); // L: 92 + field2438 = new ServerPacket(88, -1); // L: 93 + field2439 = new ServerPacket(89, -1); // L: 94 + field2389 = new ServerPacket(90, -1); // L: 95 + field2441 = new ServerPacket(91, 0); // L: 96 + field2442 = new ServerPacket(92, 0); // L: 97 + field2443 = new ServerPacket(93, -2); // L: 98 + field2444 = new ServerPacket(94, -2); // L: 99 + field2445 = new ServerPacket(95, -2); // L: 100 + field2440 = new ServerPacket(96, -2); // L: 101 } ServerPacket(int var1, int var2) { - this.id = var1; // L: 99 - this.length = var2; // L: 100 - } // L: 101 + this.id = var1; // L: 110 + this.length = var2; // L: 111 + } // L: 112 - @ObfuscatedName("w") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "6" + descriptor = "(CI)Z", + garbageValue = "-1347419990" ) - public static int method3810(int var0) { - if (var0 > 0) { // L: 195 - return 1; - } else { - return var0 < 0 ? -1 : 0; // L: 196 197 - } + static final boolean method3902(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 16 } - @ObfuscatedName("kc") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(Lkx;IB)V", - garbageValue = "-58" + descriptor = "(Ljava/net/Socket;IIB)Lli;", + garbageValue = "37" ) - static void method3809(Buffer var0, int var1) { - byte[] var2 = var0.array; // L: 11586 - if (Client.randomDatData == null) { // L: 11588 - Client.randomDatData = new byte[24]; + public static AbstractSocket method3901(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); // L: 10 + } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1900201533" + ) + static final void method3903(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; // L: 4504 + boolean var4 = false; // L: 4505 + int var5 = -1; // L: 4506 + int var6 = -1; // L: 4507 + int var7 = Players.Players_count; // L: 4508 + int[] var8 = Players.Players_indices; // L: 4509 + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4510 + Object var20; + if (var9 < var7) { // L: 4512 + var20 = Client.players[var8[var9]]; // L: 4513 + if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4514 + var4 = true; // L: 4515 + var5 = var9; // L: 4516 + continue; + } + + if (var20 == Varcs.localPlayer) { // L: 4519 + var6 = var9; // L: 4520 + continue; // L: 4521 + } + } else { + var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4524 + } + + class311.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4525 } - class311.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 11589 - if (JagexCache.JagexCache_randomDat != null) { // L: 11592 - try { - JagexCache.JagexCache_randomDat.seek(0L); // L: 11594 - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11595 - } catch (Exception var4) { // L: 11597 + if (Client.renderSelf && var6 != -1) { // L: 4527 + class311.drawActor2d(Varcs.localPlayer, var6, var0, var1, var2, var3); // L: 4528 + } + + if (var4) { // L: 4530 + class311.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4531 + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4533 + int var10 = Client.overheadTextXs[var9]; // L: 4534 + int var11 = Client.overheadTextYs[var9]; // L: 4535 + int var12 = Client.overheadTextXOffsets[var9]; // L: 4536 + int var13 = Client.overheadTextAscents[var9]; // L: 4537 + boolean var14 = true; // L: 4538 + + while (var14) { + var14 = false; // L: 4540 + + for (int var19 = 0; var19 < var9; ++var19) { // L: 4541 + if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var10 + var12 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4542 4543 + var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4544 + var14 = true; // L: 4545 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4550 + Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4551 + String var15 = Client.overheadText[var9]; // L: 4552 + if (Client.chatEffects == 0) { // L: 4553 + int var16 = 16776960; // L: 4554 + if (Client.overheadTextColors[var9] < 6) { // L: 4555 + var16 = Client.field821[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { // L: 4556 + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { // L: 4557 + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { // L: 4558 + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { // L: 4559 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4560 + if (var17 < 50) { // L: 4561 + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { // L: 4562 + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4563 + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { // L: 4565 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4566 + if (var17 < 50) { // L: 4567 + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { // L: 4568 + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4569 + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { // L: 4571 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4572 + if (var17 < 50) { // L: 4573 + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { // L: 4574 + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { // L: 4575 + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { // L: 4577 + class368.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { // L: 4578 + class368.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { // L: 4579 + class368.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { // L: 4580 + class368.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { // L: 4581 + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class368.fontBold12.stringWidth(var15) + 100) / 150; // L: 4582 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4583 + class368.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4584 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4585 + } + + if (Client.overheadTextEffects[var9] == 5) { // L: 4587 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4588 + int var18 = 0; // L: 4589 + if (var17 < 25) { // L: 4590 + var18 = var17 - 25; + } else if (var17 > 125) { // L: 4591 + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class368.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4592 + class368.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4593 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4594 + } + } else { + class368.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4598 } } - } // L: 11600 + } // L: 4601 } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index d1bc672b1c..a8c3a618ed 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -2,31 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("fa") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("rb") + @ObfuscatedName("ro") @ObfuscatedGetter( - intValue = -517711137 + intValue = 49328929 ) - static int field1809; - @ObfuscatedName("n") + static int field1927; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1957617641 + intValue = -1569878469 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -246210253 + intValue = 1560016173 ) @Export("count") int count; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("labels") int[][] labels; @@ -53,4 +60,62 @@ public class Skeleton extends Node { } } // L: 23 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1482747310" + ) + public static int method3431(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 + if ((var1 & 1) != 0) { + var2 = var0 * var2; // L: 26 + } + + var0 *= var0; // L: 27 + } + + if (var1 == 1) { // L: 30 + return var0 * var2; + } else { + return var2; // L: 31 + } + } + + @ObfuscatedName("iu") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-259166904" + ) + static final int method3433() { + return Client.menuOptionsCount - 1; // L: 9018 + } + + @ObfuscatedName("iz") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "353587604" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (class15.loadInterface(var0)) { // L: 9407 + WallDecoration.field2179 = null; // L: 9414 + class2.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9415 + if (WallDecoration.field2179 != null) { // L: 9416 + class2.drawInterface(WallDecoration.field2179, -1412584499, var1, var2, var3, var4, class11.field106, class235.field2843, var7); // L: 9417 + WallDecoration.field2179 = null; // L: 9418 + } + + } else { + if (var7 != -1) { // L: 9408 + Client.field811[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 9410 + Client.field811[var8] = true; + } + } + + } + } // L: 9412 9420 } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 885222cf52..acd8318b5d 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -3,20 +3,15 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("ie") @Implements("Skills") public class Skills { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Liu;" - ) - static GameBuild field2774; static { Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5 @@ -32,220 +27,15 @@ public class Skills { } // L: 16 - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkd;ILbk;IB)V", - garbageValue = "4" + descriptor = "(I)V", + garbageValue = "1387857562" ) - static final void method4320(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; // L: 455 - if ((var3 & 4096) != 0) { // L: 456 - var2.field992 = var0.method5721(); // L: 457 - var2.field952 = var0.readByte(); // L: 458 - var2.field996 = var0.method5747(); // L: 459 - var2.field998 = var0.method5747(); // L: 460 - var2.field999 = var0.readUnsignedShort() + Client.cycle; // L: 461 - var2.field1000 = var0.readUnsignedShort() + Client.cycle; // L: 462 - var2.field1001 = var0.readUnsignedShort(); // L: 463 - if (var2.field652) { // L: 464 - var2.field992 += var2.tileX; // L: 465 - var2.field952 += var2.tileY; // L: 466 - var2.field996 += var2.tileX; // L: 467 - var2.field998 += var2.tileY; // L: 468 - var2.pathLength = 0; // L: 469 - } else { - var2.field992 += var2.pathX[0]; // L: 472 - var2.field952 += var2.pathY[0]; // L: 473 - var2.field996 += var2.pathX[0]; // L: 474 - var2.field998 += var2.pathY[0]; // L: 475 - var2.pathLength = 1; // L: 476 - } - - var2.field1012 = 0; // L: 478 + public static void method4377() { + if (class303.NetCache_socket != null) { // L: 271 + class303.NetCache_socket.close(); } - int var5; - if ((var3 & 1024) != 0) { // L: 480 - var2.spotAnimation = var0.method5729(); // L: 481 - var5 = var0.method5739(); // L: 482 - var2.field994 = var5 >> 16; // L: 483 - var2.field993 = (var5 & 65535) + Client.cycle; // L: 484 - var2.spotAnimationFrame = 0; // L: 485 - var2.spotAnimationFrameCycle = 0; // L: 486 - if (var2.field993 > Client.cycle) { // L: 487 - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { // L: 488 - var2.spotAnimation = -1; - } - } - - int var8; - int var9; - int var12; - if ((var3 & 32) != 0) { // L: 490 - var5 = var0.method5729(); // L: 491 - PlayerType var6 = (PlayerType)InterfaceParent.findEnumerated(class69.PlayerType_values(), var0.method5720()); // L: 492 - boolean var7 = var0.method5776() == 1; // L: 493 - var8 = var0.method5776(); // L: 494 - var9 = var0.offset; // L: 495 - if (var2.username != null && var2.appearance != null) { // L: 496 - boolean var10 = false; // L: 497 - if (var6.isUser && InterfaceParent.friendSystem.isIgnored(var2.username)) { // L: 498 499 - var10 = true; - } - - if (!var10 && Client.field778 == 0 && !var2.isHidden) { // L: 501 - Players.field1279.offset = 0; // L: 502 - var0.method5740(Players.field1279.array, 0, var8); // L: 503 - Players.field1279.offset = 0; // L: 504 - String var11 = AbstractFont.escapeBrackets(UrlRequester.method3467(JagexCache.method3683(Players.field1279))); // L: 505 - var2.overheadText = var11.trim(); // L: 506 - var2.overheadTextColor = var5 >> 8; // L: 507 - var2.overheadTextEffect = var5 & 255; // L: 508 - var2.overheadTextCyclesRemaining = 150; // L: 509 - var2.isAutoChatting = var7; // L: 510 - var2.field968 = var2 != UserComparator9.localPlayer && var6.isUser && "" != Client.field882 && var11.toLowerCase().indexOf(Client.field882) == -1; // L: 511 - if (var6.isPrivileged) { // L: 513 - var12 = var7 ? 91 : 1; - } else { - var12 = var7 ? 90 : 2; // L: 514 - } - - if (var6.modIcon != -1) { // L: 515 - AbstractWorldMapData.addGameMessage(var12, UserComparator10.method3580(var6.modIcon) + var2.username.getName(), var11); - } else { - AbstractWorldMapData.addGameMessage(var12, var2.username.getName(), var11); // L: 516 - } - } - } - - var0.offset = var9 + var8; // L: 519 - } - - if ((var3 & 256) != 0) { // L: 521 - for (var5 = 0; var5 < 3; ++var5) { // L: 522 - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 2048) != 0) { // L: 524 - Players.field1274[var1] = var0.method5721(); // L: 525 - } - - if ((var3 & 8) != 0) { // L: 527 - var2.targetIndex = var0.readUnsignedShort(); // L: 528 - if (var2.targetIndex == 65535) { // L: 529 - var2.targetIndex = -1; - } - } - - int var13; - if ((var3 & 128) != 0) { // L: 531 - var5 = var0.readUnsignedByte(); // L: 532 - int var15; - int var17; - int var19; - if (var5 > 0) { // L: 533 - for (var13 = 0; var13 < var5; ++var13) { // L: 534 - var8 = -1; // L: 536 - var9 = -1; // L: 537 - var19 = -1; // L: 538 - var17 = var0.readUShortSmart(); // L: 539 - if (var17 == 32767) { // L: 540 - var17 = var0.readUShortSmart(); // L: 541 - var9 = var0.readUShortSmart(); // L: 542 - var8 = var0.readUShortSmart(); // L: 543 - var19 = var0.readUShortSmart(); // L: 544 - } else if (var17 != 32766) { // L: 546 - var9 = var0.readUShortSmart(); // L: 547 - } else { - var17 = -1; // L: 549 - } - - var15 = var0.readUShortSmart(); // L: 550 - var2.addHitSplat(var17, var9, var8, var19, Client.cycle, var15); // L: 551 - } - } - - var13 = var0.method5776(); // L: 554 - if (var13 > 0) { // L: 555 - for (var17 = 0; var17 < var13; ++var17) { // L: 556 - var8 = var0.readUShortSmart(); // L: 557 - var9 = var0.readUShortSmart(); // L: 558 - if (var9 != 32767) { // L: 559 - var19 = var0.readUShortSmart(); // L: 560 - var15 = var0.method5717(); // L: 561 - var12 = var9 > 0 ? var0.method5776() : var15; // L: 562 - var2.addHealthBar(var8, Client.cycle, var9, var19, var15, var12); // L: 563 - } else { - var2.removeHealthBar(var8); // L: 565 - } - } - } - } - - if ((var3 & 512) != 0) { // L: 569 - var4 = var0.method5721(); // L: 570 - } - - if ((var3 & 64) != 0) { // L: 572 - var5 = var0.readUnsignedShort(); // L: 573 - if (var5 == 65535) { // L: 574 - var5 = -1; - } - - var13 = var0.method5720(); // L: 575 - UserComparator7.performPlayerAnimation(var2, var5, var13); // L: 576 - } - - if ((var3 & 1) != 0) { // L: 578 - var2.field981 = var0.method5729(); // L: 579 - if (var2.pathLength == 0) { // L: 580 - var2.orientation = var2.field981; // L: 581 - var2.field981 = -1; // L: 582 - } - } - - if ((var3 & 16) != 0) { // L: 585 - var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 586 - if (var2.overheadText.charAt(0) == '~') { // L: 587 - var2.overheadText = var2.overheadText.substring(1); // L: 588 - AbstractWorldMapData.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 589 - } else if (var2 == UserComparator9.localPlayer) { // L: 591 - AbstractWorldMapData.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 592 - } - - var2.isAutoChatting = false; // L: 594 - var2.overheadTextColor = 0; // L: 595 - var2.overheadTextEffect = 0; // L: 596 - var2.overheadTextCyclesRemaining = 150; // L: 597 - } - - if ((var3 & 2) != 0) { // L: 599 - var5 = var0.method5776(); // L: 600 - byte[] var16 = new byte[var5]; // L: 601 - Buffer var14 = new Buffer(var16); // L: 602 - var0.method5740(var16, 0, var5); // L: 603 - Players.field1269[var1] = var14; // L: 604 - var2.read(var14); // L: 605 - } - - if (var2.field652) { // L: 607 - if (var4 == 127) { // L: 608 - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var18; - if (var4 != -1) { // L: 611 - var18 = var4; - } else { - var18 = Players.field1274[var1]; // L: 612 - } - - var2.method1327(var2.tileX, var2.tileY, var18); // L: 613 - } - } - - } // L: 617 + } // L: 272 } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 0ed0d04534..134297b5e8 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ft") +@ObfuscatedName("gz") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); // L: 11 } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("get") Object get() { return this.ref.get(); // L: 15 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isSoft") boolean isSoft() { return true; // L: 19 diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index 35724fd87d..9cdaab3037 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -2,37 +2,38 @@ 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("dy") +@ObfuscatedName("bi") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llq;" + descriptor = "Lmg;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - descriptor = "(Lig;Lig;)V" + descriptor = "(Lir;Lir;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); // L: 9 @@ -41,10 +42,10 @@ public class SoundCache { this.musicSampleIndex = var2; // L: 14 } // L: 15 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II[II)Ldm;", - garbageValue = "-166733310" + descriptor = "(II[II)Lah;", + garbageValue = "1896632187" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -72,10 +73,10 @@ public class SoundCache { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II[IS)Ldm;", - garbageValue = "-10083" + descriptor = "(II[IB)Lah;", + garbageValue = "-1" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -109,10 +110,10 @@ public class SoundCache { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I[IB)Ldm;", - garbageValue = "15" + descriptor = "(I[II)Lah;", + garbageValue = "-1575700242" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -125,10 +126,10 @@ public class SoundCache { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I[II)Ldm;", - garbageValue = "-1589130009" + descriptor = "(I[II)Lah;", + garbageValue = "1575999128" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -141,26 +142,77 @@ public class SoundCache { } } - @ObfuscatedName("b") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1989438161" + descriptor = "(ILcc;ZB)I", + garbageValue = "5" ) - @Export("inventoryQuantityFormat") - static final String inventoryQuantityFormat(int var0) { - if (var0 < 100000) { // L: 413 - return "" + var0 + ""; + static int method883(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1171 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1172 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.itemId; // L: 1173 + return 1; // L: 1174 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1176 + if (var3.itemId != -1) { // L: 1177 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1178 + } + + return 1; // L: 1179 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1181 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1182 + return 1; // L: 1183 } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 414 415 + return 2; // L: 1185 } } - @ObfuscatedName("gh") + @ObfuscatedName("hz") @ObfuscatedSignature( - descriptor = "(Lcv;II)V", - garbageValue = "-701578069" + descriptor = "(ILjava/lang/String;B)V", + garbageValue = "-7" ) - static final void method2689(Actor var0, int var1) { - ParamComposition.worldToScreen(var0.x, var0.y, var1); // L: 4879 - } // L: 4880 + static void method889(int var0, String var1) { + int var2 = Players.Players_count; // L: 8781 + int[] var3 = Players.Players_indices; // L: 8782 + boolean var4 = false; // L: 8783 + Username var5 = new Username(var1, AbstractUserComparator.loginType); // L: 8784 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 8785 + Player var7 = Client.players[var3[var6]]; // L: 8786 + if (var7 != null && var7 != Varcs.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8787 + PacketBufferNode var8; + if (var0 == 1) { // L: 8788 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); // L: 8790 + var8.packetBuffer.method6639(0); // L: 8791 + var8.packetBuffer.method6614(var3[var6]); // L: 8792 + Client.packetWriter.addNode(var8); // L: 8793 + } else if (var0 == 4) { // L: 8795 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 8797 + var8.packetBuffer.writeShortLE(0); // L: 8798 + var8.packetBuffer.method6771(var3[var6]); // L: 8799 + Client.packetWriter.addNode(var8); // L: 8800 + } else if (var0 == 6) { // L: 8802 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8804 + var8.packetBuffer.method6614(var3[var6]); // L: 8805 + var8.packetBuffer.method6606(0); // L: 8806 + Client.packetWriter.addNode(var8); // L: 8807 + } else if (var0 == 7) { // L: 8809 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); // L: 8811 + var8.packetBuffer.writeShortLE(0); // L: 8812 + var8.packetBuffer.method6614(var3[var6]); // L: 8813 + Client.packetWriter.addNode(var8); // L: 8814 + } + + var4 = true; // L: 8816 + break; + } + } + + if (!var4) { // L: 8820 + class69.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 8821 } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 88b343000c..f96a3b8eef 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("an") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Ldg;" + descriptor = "[Lbf;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("start") int start; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; // L: 10 @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); // L: 29 } // L: 30 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Ldm;" + descriptor = "()Lah;" ) @Export("toRawSound") public RawSound toRawSound() { @@ -48,7 +48,7 @@ public class SoundEffect { return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; // L: 38 @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("mix") final byte[] mix() { int var1 = 0; // L: 57 @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;II)Ldb;" + descriptor = "(Lir;II)Lan;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 8fc081e6ab..2f44d722e4 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,42 +3,42 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("br") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("segments") int segments; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("durations") int[] durations; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("phases") int[] phases; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("start") int start; - @ObfuscatedName("y") - @Export("max") - int max; - @ObfuscatedName("h") + @ObfuscatedName("b") @Export("end") int end; - @ObfuscatedName("z") + @ObfuscatedName("e") @Export("form") int form; - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("ticks") int ticks; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("l") + @ObfuscatedName("h") @Export("step") int step; - @ObfuscatedName("s") + @ObfuscatedName("n") @Export("amplitude") int amplitude; + @ObfuscatedName("l") + @Export("max") + int max; SoundEnvelope() { this.segments = 2; // L: 21 @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; // L: 27 } // L: 28 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); // L: 34 } // L: 35 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } // L: 45 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("reset") final void reset() { this.ticks = 0; // L: 48 @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; // L: 52 } // L: 53 - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("doStep") final int doStep(int var1) { if (this.max >= this.ticks) { // L: 56 diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index f7a0d6b0ac..c5f2fe263d 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,33 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("bn") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("sl") + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Lmf;" + descriptor = "Lig;" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -2100372523 - ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("u") + @Export("archive8") + static Archive archive8; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkx;" - ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "[Ldh;" + descriptor = "[Lbh;" ) @Export("players") volatile PcmPlayer[] players; @@ -45,33 +32,56 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { // L: 17 - SequenceDefinition.RunException_sendStackTrace((String)null, var4); // L: 18 + class223.RunException_sendStackTrace((String)null, var4); } - } // L: 20 + } - @ObfuscatedName("an") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-422098598" + descriptor = "(I[BLlp;I)V", + garbageValue = "2116323284" ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { // L: 3920 - if (WorldMapCacheName.loadInterface(var0)) { // L: 3921 - Widget[] var1 = DefaultsGroup.Widget_interfaceComponents[var0]; // L: 3922 + static void method872(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 + var3.type = 0; // L: 19 + var3.key = (long)var0; // L: 20 + var3.data = var1; // L: 21 + var3.archiveDisk = var2; // L: 22 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 + } // L: 25 - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 3923 - Widget var3 = var1[var2]; // L: 3924 - if (var3.onLoad != null) { // L: 3925 - ScriptEvent var4 = new ScriptEvent(); // L: 3926 - var4.widget = var3; // L: 3927 - var4.args = var3.onLoad; // L: 3928 - GrandExchangeOfferWorldComparator.runScript(var4, 5000000); // L: 3929 + ItemLayer.method3271(); // L: 26 + } // L: 27 + + @ObfuscatedName("gr") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-92" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3956 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 3957 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 3958 + int var3 = var2.x >> 7; // L: 3959 + int var4 = var2.y >> 7; // L: 3960 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 3961 + if (var2.field1258 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 3962 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 3963 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 3964 } - } + long var5 = AttackOption.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 3966 + var2.playerCycle = Client.cycle; // L: 3967 + WorldMapArea.scene.drawEntity(class26.Client_plane, var2.x, var2.y, UserComparator7.getTileHeight(var2.field1258 * 64 - 64 + var2.x, var2.field1258 * 64 - 64 + var2.y, class26.Client_plane), var2.field1258 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 3968 + } } } - } // L: 3932 + + } // L: 3972 } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 43c70d29c3..553a0b5622 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("kb") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("SpotAnimationDefinition_modelArchive") public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("c") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -248085657 + intValue = -1763837413 ) @Export("id") int id; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 854487695 + intValue = -680345807 ) @Export("archive") int archive; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1665782571 + intValue = -1398815435 ) @Export("sequence") public int sequence; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1815263859 + intValue = 91063733 ) @Export("widthScale") int widthScale; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 159463565 + intValue = -1248170611 ) @Export("heightScale") int heightScale; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1598330455 + intValue = -211246217 ) @Export("orientation") int orientation; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1067846437 + intValue = 87174687 ) @Export("ambient") int ambient; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1731372495 + intValue = -477885717 ) @Export("contrast") int contrast; @@ -106,10 +106,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; // L: 27 } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "123" + descriptor = "(Lnu;B)V", + garbageValue = "29" ) @Export("decode") void decode(Buffer var1) { @@ -123,10 +123,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "74583909" + descriptor = "(Lnu;II)V", + garbageValue = "1730148365" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -170,10 +170,10 @@ public class SpotAnimationDefinition extends DualNode { } // L: 77 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)Lef;", - garbageValue = "1" + descriptor = "(II)Lgv;", + garbageValue = "-1890190190" ) @Export("getModel") public final Model getModel(int var1) { @@ -203,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { // L: 98 - var5 = InterfaceParent.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = class225.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); // L: 99 } @@ -231,4 +231,36 @@ public class SpotAnimationDefinition extends DualNode { return var5; // L: 113 } + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILcc;ZB)I", + garbageValue = "3" + ) + static int method5048(int var0, Script var1, boolean var2) { + if (var0 >= 7200 && var0 < 7204) { // L: 4240 + class16.Interpreter_intStackSize -= 5; // L: 4241 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4242 + return 1; // L: 4243 + } else if (var0 == 7204) { // L: 4245 + class16.Interpreter_intStackSize -= 6; // L: 4246 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4247 + return 1; // L: 4248 + } else if (var0 >= 7205 && var0 < 7209) { // L: 4250 + Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize - 1] = -1; // L: 4251 + return 1; // L: 4252 + } else if (var0 == 7209) { // L: 4254 + class16.Interpreter_intStackSize -= 2; // L: 4255 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4256 + return 1; // L: 4257 + } else if (var0 >= 7210 && var0 < 7214) { // L: 4259 + --class16.Interpreter_intStackSize; // L: 4260 + return 1; // L: 4261 + } else if (var0 == 7214) { // L: 4263 + class16.Interpreter_intStackSize -= 2; // L: 4264 + return 1; // L: 4265 + } else { + return 2; // L: 4267 + } + } } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 2a0e539028..bc621f8393 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -3,438 +3,268 @@ 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("ht") +@ObfuscatedName("hh") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("eo") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -305616951 + intValue = 1925008229 ) @Export("width") public final int width; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1125441395 + intValue = 101057139 ) @Export("height") public final int height; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; // L: 744 - this.height = var2; // L: 745 - this.xWidths = var3; // L: 746 - this.xStarts = var4; // L: 747 - } // L: 748 + this.width = var1; // L: 714 + this.height = var2; // L: 715 + this.xWidths = var3; // L: 716 + this.xStarts = var4; // L: 717 + } // L: 718 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-290220203" + garbageValue = "862387576" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { // L: 751 - int var3 = this.xStarts[var2]; // L: 752 - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 753 + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 721 + int var3 = this.xStarts[var2]; // L: 722 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 723 return true; } } - return false; // L: 755 + return false; // L: 725 } - @ObfuscatedName("hh") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)V", + descriptor = "(IB)Ljq;", garbageValue = "55" ) - @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: 7316 - if (Client.isLowDetail && var0 != class90.Client_plane) { // L: 7317 - return; + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27 + if (var1 != null) { // L: 28 + return var1; + } else { + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 29 + var1 = new KitDefinition(); // L: 30 + if (var2 != null) { // L: 31 + var1.decode(new Buffer(var2)); } - long var7 = 0L; // L: 7318 - boolean var9 = true; // L: 7319 - boolean var10 = false; // L: 7320 - boolean var11 = false; // L: 7321 - if (var1 == 0) { // L: 7322 - var7 = MilliClock.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { // L: 7323 - var7 = MilliClock.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { // L: 7324 - var7 = MilliClock.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { // L: 7325 - var7 = MilliClock.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { // L: 7326 - var12 = MilliClock.scene.getObjectFlags(var0, var2, var3, var7); // L: 7327 - int var38 = class25.Entity_unpackID(var7); // L: 7328 - int var39 = var12 & 31; // L: 7329 - int var40 = var12 >> 6 & 3; // L: 7330 - ObjectComposition var13; - if (var1 == 0) { // L: 7331 - MilliClock.scene.removeBoundaryObject(var0, var2, var3); // L: 7332 - var13 = WorldMapAreaData.getObjectDefinition(var38); // L: 7333 - if (var13.interactType != 0) { // L: 7334 - Client.collisionMaps[var0].method3755(var2, var3, var39, var40, var13.boolean1); - } - } - - if (var1 == 1) { // L: 7336 - MilliClock.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { // L: 7337 - MilliClock.scene.removeGameObject(var0, var2, var3); // L: 7338 - var13 = WorldMapAreaData.getObjectDefinition(var38); // L: 7339 - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7340 - return; - } - - if (var13.interactType != 0) { // L: 7341 - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); - } - } - - if (var1 == 3) { // L: 7343 - MilliClock.scene.removeFloorDecoration(var0, var2, var3); // L: 7344 - var13 = WorldMapAreaData.getObjectDefinition(var38); // L: 7345 - if (var13.interactType == 1) { // L: 7346 - Client.collisionMaps[var0].method3758(var2, var3); - } - } - } - - if (var4 >= 0) { // L: 7349 - var12 = var0; // L: 7350 - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7351 - var12 = var0 + 1; - } - - Scene var41 = MilliClock.scene; // L: 7352 - CollisionMap var14 = Client.collisionMaps[var0]; // L: 7353 - ObjectComposition var15 = WorldMapAreaData.getObjectDefinition(var4); // L: 7355 - int var16; - int var17; - if (var5 != 1 && var5 != 3) { // L: 7358 - var16 = var15.sizeX; // L: 7363 - var17 = var15.sizeY; // L: 7364 - } else { - var16 = var15.sizeY; // L: 7359 - var17 = var15.sizeX; // L: 7360 - } - - int var18; - int var19; - if (var16 + var2 <= 104) { // L: 7370 - var18 = (var16 >> 1) + var2; // L: 7371 - var19 = var2 + (var16 + 1 >> 1); // L: 7372 - } else { - var18 = var2; // L: 7375 - var19 = var2 + 1; // L: 7376 - } - - int var20; - int var21; - if (var3 + var17 <= 104) { // L: 7378 - var20 = var3 + (var17 >> 1); // L: 7379 - var21 = var3 + (var17 + 1 >> 1); // L: 7380 - } else { - var20 = var3; // L: 7383 - var21 = var3 + 1; // L: 7384 - } - - int[][] var22 = Tiles.Tiles_heights[var12]; // L: 7386 - int var23 = var22[var19][var21] + var22[var18][var21] + var22[var19][var20] + var22[var18][var20] >> 2; // L: 7387 - int var24 = (var2 << 7) + (var16 << 6); // L: 7388 - int var25 = (var3 << 7) + (var17 << 6); // L: 7389 - long var26 = TextureProvider.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 7390 - int var28 = (var5 << 6) + var6; // L: 7391 - if (var15.int3 == 1) { // L: 7392 - var28 += 256; - } - - Object var36; - if (var6 == 22) { // L: 7393 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7395 - var36 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7396 - } - - var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 7397 - if (var15.interactType == 1) { // L: 7398 - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { // L: 7401 - if (var6 >= 12) { // L: 7409 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7411 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7412 - } - - var41.method3400(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7413 - if (var15.interactType != 0) { // L: 7414 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { // L: 7417 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7419 - var36 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7420 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field521[var5], 0, var26, var28); // L: 7421 - if (var15.interactType != 0) { // L: 7422 - var14.method3749(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { // L: 7425 - if (var15.animationId == -1 && var15.transforms == null) { - var36 = var15.getModel(1, var5, var22, var24, var23, var25); // L: 7427 - } else { - var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7428 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field514[var5], 0, var26, var28); // L: 7429 - if (var15.interactType != 0) { // L: 7430 - var14.method3749(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var29; - if (var6 == 2) { // L: 7433 - var29 = var5 + 1 & 3; // L: 7434 - Object var31; - Object var37; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7437 - var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7438 - var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7439 - } else { - var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7442 - var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7443 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field521[var5], Tiles.field521[var29], var26, var28); // L: 7445 - if (var15.interactType != 0) { // L: 7446 - var14.method3749(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { // L: 7449 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7451 - var36 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7452 - } - - var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field514[var5], 0, var26, var28); // L: 7453 - if (var15.interactType != 0) { // L: 7454 - var14.method3749(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { // L: 7457 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7459 - var36 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7460 - } - - var41.method3400(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7461 - if (var15.interactType != 0) { // L: 7462 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { // L: 7465 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7467 - var36 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7468 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field521[var5], 0, 0, 0, var26, var28); // L: 7469 - } else { - long var30; - Object var32; - if (var6 == 5) { // L: 7472 - var29 = 16; // L: 7473 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7474 - if (0L != var30) { // L: 7475 - var29 = WorldMapAreaData.getObjectDefinition(class25.Entity_unpackID(var30)).int2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7477 - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7478 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field521[var5], 0, var29 * Tiles.field523[var5], var29 * Tiles.field527[var5], var26, var28); // L: 7479 - } else if (var6 == 6) { // L: 7482 - var29 = 8; // L: 7483 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7484 - if (var30 != 0L) { // L: 7485 - var29 = WorldMapAreaData.getObjectDefinition(class25.Entity_unpackID(var30)).int2 / 2; - } - - if (var15.animationId == -1 && var15.transforms == null) { // L: 7487 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7488 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field525[var5], var29 * Tiles.field526[var5], var26, var28); // L: 7489 - } else if (var6 == 7) { // L: 7492 - int var35 = var5 + 2 & 3; // L: 7494 - if (var15.animationId == -1 && var15.transforms == null) { // L: 7495 - var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7496 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7497 - } else if (var6 == 8) { // L: 7500 - var29 = 8; // L: 7501 - var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7502 - if (var30 != 0L) { // L: 7503 - var29 = WorldMapAreaData.getObjectDefinition(class25.Entity_unpackID(var30)).int2 / 2; - } - - int var34 = var5 + 2 & 3; // L: 7506 - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { // L: 7507 - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7508 - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7509 - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7512 - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7513 - } - - var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field525[var5], var29 * Tiles.field526[var5], var26, var28); // L: 7515 - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { // L: 7403 - var36 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.field3429, (Renderable)null); // L: 7404 - } - - if (var36 != null) { // L: 7405 - var41.method3400(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { // L: 7406 - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } - } - } - - } // L: 7520 - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(ZLkd;B)V", - garbageValue = "100" - ) - static final void method4174(boolean var0, PacketBuffer var1) { - while (true) { - if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7755 - int var2 = var1.readBits(15); // L: 7756 - if (var2 != 32767) { // L: 7757 - boolean var3 = false; // L: 7758 - if (Client.npcs[var2] == null) { // L: 7759 - Client.npcs[var2] = new NPC(); // L: 7760 - var3 = true; // L: 7761 - } - - NPC var4 = Client.npcs[var2]; // L: 7763 - Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7764 - var4.npcCycle = Client.cycle; // L: 7765 - int var5; - if (var0) { // L: 7767 - var5 = var1.readBits(8); // L: 7768 - if (var5 > 127) { // L: 7769 - var5 -= 256; - } - } else { - var5 = var1.readBits(5); // L: 7772 - if (var5 > 15) { // L: 7773 - var5 -= 32; - } - } - - var4.definition = class90.getNpcDefinition(var1.readBits(14)); // L: 7775 - int var6 = Client.defaultRotations[var1.readBits(3)]; // L: 7776 - if (var3) { // L: 7777 - var4.orientation = var4.rotation = var6; - } - - int var7 = var1.readBits(1); // L: 7778 - if (var7 == 1) { // L: 7779 - Client.field697[++Client.field725 - 1] = var2; - } - - int var8 = var1.readBits(1); // L: 7780 - int var9; - if (var0) { // L: 7782 - var9 = var1.readBits(8); // L: 7783 - if (var9 > 127) { // L: 7784 - var9 -= 256; - } - } else { - var9 = var1.readBits(5); // L: 7787 - if (var9 > 15) { // L: 7788 - var9 -= 32; - } - } - - var4.field1007 = var4.definition.size; // L: 7790 - var4.field1006 = var4.definition.rotation; // L: 7791 - if (var4.field1006 == 0) { // L: 7792 - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; // L: 7793 - var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7794 - var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7795 - var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7796 - var4.idleSequence = var4.definition.idleSequence; // L: 7797 - var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7798 - var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7799 - var4.method2181(UserComparator9.localPlayer.pathX[0] + var5, UserComparator9.localPlayer.pathY[0] + var9, var8 == 1); // L: 7800 - continue; // L: 7801 - } - } - - var1.exportIndex(); // L: 7802 - return; // L: 7803 + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 } } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1072788075" + ) + static int method4173(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1854 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.cycle; // L: 1855 + return 1; // L: 1856 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1858 + class16.Interpreter_intStackSize -= 2; // L: 1859 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1860 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1861 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class82.method1923(var3, var4); // L: 1862 + return 1; // L: 1863 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1865 + class16.Interpreter_intStackSize -= 2; // L: 1866 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1867 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1868 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Language.ItemContainer_getCount(var3, var4); // L: 1869 + return 1; // L: 1870 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1872 + class16.Interpreter_intStackSize -= 2; // L: 1873 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1874 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1875 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameBuild.method4386(var3, var4); // L: 1876 + return 1; // L: 1877 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1879 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1880 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameObject.getInvDefinition(var3).size; // L: 1881 + return 1; // L: 1882 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1884 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1885 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1886 + return 1; // L: 1887 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1889 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1890 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1891 + return 1; // L: 1892 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1894 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1895 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1896 + return 1; // L: 1897 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1899 + var3 = class26.Client_plane; // L: 1900 + var4 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 1901 + var5 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 1902 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1903 + return 1; // L: 1904 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1906 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1907 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1908 + return 1; // L: 1909 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1911 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1912 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1913 + return 1; // L: 1914 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1916 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 1917 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1918 + return 1; // L: 1919 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1921 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1922 + return 1; // L: 1923 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1925 + class16.Interpreter_intStackSize -= 2; // L: 1926 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] + 32768; // L: 1927 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1928 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class82.method1923(var3, var4); // L: 1929 + return 1; // L: 1930 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1932 + class16.Interpreter_intStackSize -= 2; // L: 1933 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] + 32768; // L: 1934 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1935 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Language.ItemContainer_getCount(var3, var4); // L: 1936 + return 1; // L: 1937 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1939 + class16.Interpreter_intStackSize -= 2; // L: 1940 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize] + 32768; // L: 1941 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1942 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GameBuild.method4386(var3, var4); // L: 1943 + return 1; // L: 1944 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1946 + if (Client.staffModLevel >= 2) { // L: 1947 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1948 + } + + return 1; // L: 1949 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1951 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1952 + return 1; // L: 1953 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1955 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.worldId; // L: 1956 + return 1; // L: 1957 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1959 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1960 + return 1; // L: 1961 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1963 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.weight; // L: 1964 + return 1; // L: 1965 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1967 + if (Client.playerMod) { // L: 1968 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 1969 + } + + return 1; // L: 1970 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1972 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1973 + return 1; // L: 1974 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1976 + class16.Interpreter_intStackSize -= 4; // L: 1977 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 1978 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 1979 + var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 1980 + int var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 1981 + var3 += var4 << 14; // L: 1982 + var3 += var5 << 28; // L: 1983 + var3 += var6; // L: 1984 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3; // L: 1985 + return 1; // L: 1986 + } else if (var0 == 3326) { // L: 1988 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.field875; // L: 1989 + return 1; // L: 1990 + } else if (var0 == 3327) { // L: 1992 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.field759; // L: 1993 + return 1; // L: 1994 + } else { + return 2; // L: 1996 + } + } + } + } + + @ObfuscatedName("hu") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "53" + ) + static void method4172(int var0, int var1) { + int var2 = class368.fontBold12.stringWidth("Choose Option"); // L: 7948 + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7949 + var4 = class368.fontBold12.stringWidth(class69.method1164(var3)); // L: 7950 + if (var4 > var2) { // L: 7951 + var2 = var4; + } + } + + var2 += 8; // L: 7953 + var3 = Client.menuOptionsCount * 15 + 22; // L: 7954 + var4 = var0 - var2 / 2; // L: 7955 + if (var2 + var4 > InterfaceParent.canvasWidth) { // L: 7956 + var4 = InterfaceParent.canvasWidth - var2; + } + + if (var4 < 0) { // L: 7957 + var4 = 0; + } + + int var5 = var1; // L: 7958 + if (var1 + var3 > GameEngine.canvasHeight) { // L: 7959 + var5 = GameEngine.canvasHeight - var3; + } + + if (var5 < 0) { // L: 7960 + var5 = 0; + } + + class16.menuX = var4; // L: 7961 + FontName.menuY = var5; // L: 7962 + Player.menuWidth = var2; // L: 7963 + class11.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7964 + } // L: 7965 + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", + garbageValue = "121" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + AbstractByteArrayCopier.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 9000 + } // L: 9001 } diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java index 8896d5550d..0128310cb5 100644 --- a/runescape-client/src/main/java/SpritePixels.java +++ b/runescape-client/src/main/java/SpritePixels.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("oh") @Implements("SpritePixels") public final class SpritePixels extends Rasterizer2D { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("pixels") public int[] pixels; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("subWidth") public int subWidth; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("subHeight") public int subHeight; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("xOffset") public int xOffset; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("yOffset") int yOffset; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("width") public int width; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class SpritePixels extends Rasterizer2D { SpritePixels() { } // L: 19 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "()Llm;" + descriptor = "()Loh;" ) @Export("mirrorHorizontally") public SpritePixels mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 44 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Llm;" + descriptor = "()Loh;" ) @Export("copyNormalized") public SpritePixels copyNormalized() { @@ -81,13 +81,13 @@ public final class SpritePixels extends Rasterizer2D { return var1; // L: 54 } - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 } // L: 59 - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 @@ -107,7 +107,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 74 - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 @@ -149,7 +149,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 99 - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 @@ -165,7 +165,7 @@ public final class SpritePixels extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 } // L: 109 - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 @@ -181,7 +181,7 @@ public final class SpritePixels extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 } // L: 119 - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 @@ -195,8 +195,8 @@ public final class SpritePixels extends Rasterizer2D { var6 = var1; } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 var6 = var1; - } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; // L: 130 + } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { // L: 130 + var6 = var1; } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131 var6 = var1; } @@ -209,22 +209,22 @@ public final class SpritePixels extends Rasterizer2D { this.pixels = var2; // L: 136 } // L: 137 - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 int var3 = var2 * this.subWidth; // L: 141 for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 - if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { // L: 143 - this.pixels[var4 + var3] = var1; + if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { + this.pixels[var4 + var3] = var1; // L: 143 } } } } // L: 146 - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; // L: 149 @@ -270,7 +270,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 182 - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; // L: 203 @@ -316,7 +316,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 236 - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { if (var3 > 0 && var4 > 0) { // L: 267 @@ -381,7 +381,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 310 - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { // L: 329 @@ -431,7 +431,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 331 366 - @ObfuscatedName("g") + @ObfuscatedName("t") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; // L: 389 @@ -477,7 +477,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 422 - @ObfuscatedName("t") + @ObfuscatedName("x") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { if (var3 > 0 && var4 > 0) { // L: 441 @@ -542,8 +542,8 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 484 - @ObfuscatedName("o") - public void method6426(int var1, int var2, int var3) { + @ObfuscatedName("i") + public void method6991(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 @@ -584,16 +584,16 @@ public final class SpritePixels extends Rasterizer2D { if (var7 > 0 && var6 > 0) { // L: 538 if (var3 == 256) { - method6345(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 + method6992(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method6356(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 + method6993(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } } // L: 541 - @ObfuscatedName("ag") - public void method6347(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("s") + public void method7010(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 @@ -653,16 +653,16 @@ public final class SpritePixels extends Rasterizer2D { } if (var5 == 256) { // L: 624 - method6360(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6995(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6418(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 + method6978(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("aq") - public void method6350(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("ay") + public void method7056(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 @@ -709,7 +709,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 700 - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -744,8 +744,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 729 - @ObfuscatedName("ak") - public void method6393(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("ag") + public void method6999(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { int var10 = -var3 / 2; // L: 733 int var11 = -var4 / 2; // L: 734 @@ -783,13 +783,13 @@ public final class SpritePixels extends Rasterizer2D { } // L: 759 - @ObfuscatedName("ax") - public void method6425(int var1, int var2, int var3, int var4) { - this.method6369(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + @ObfuscatedName("aq") + public void method7000(int var1, int var2, int var3, int var4) { + this.method6994(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 } // L: 763 - @ObfuscatedName("ar") - void method6369(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("at") + void method6994(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 @@ -1257,7 +1257,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1076 - @ObfuscatedName("al") + @ObfuscatedName("aj") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { if (var3 <= this.width && var4 <= this.height) { // L: 1079 @@ -1380,7 +1380,7 @@ public final class SpritePixels extends Rasterizer2D { } } // L: 1094 1151 - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { for (int var8 = -var5; var8 < 0; ++var8) { // L: 185 @@ -1400,7 +1400,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 200 - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); // L: 239 @@ -1453,7 +1453,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 264 - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; // L: 313 @@ -1479,7 +1479,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 326 - @ObfuscatedName("x") + @ObfuscatedName("q") @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 @@ -1505,7 +1505,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 386 - @ObfuscatedName("u") + @ObfuscatedName("v") @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 @@ -1527,7 +1527,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 438 - @ObfuscatedName("p") + @ObfuscatedName("z") @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 @@ -1555,8 +1555,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 504 - @ObfuscatedName("ay") - static void method6345(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + @ObfuscatedName("a") + static void method6992(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 @@ -1577,8 +1577,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 559 - @ObfuscatedName("am") - static void method6356(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + @ObfuscatedName("w") + static void method6993(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 @@ -1601,8 +1601,8 @@ public final class SpritePixels extends Rasterizer2D { } // L: 579 - @ObfuscatedName("ae") - static void method6360(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + @ObfuscatedName("y") + static void method6995(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 @@ -1629,7 +1629,7 @@ public final class SpritePixels extends Rasterizer2D { } // L: 648 @ObfuscatedName("ac") - static void method6418(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) { + static void method6978(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { for (int var17 = var3; var8 < 0; ++var8) { // L: 651 652 var7 = var15 * (var9 >> 16); // L: 653 diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 613877337e..ce50dcdde1 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -2,305 +2,116 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hi") +@ObfuscatedName("ih") @Implements("Strings") public class Strings { - @ObfuscatedName("bp") - public static String field2841; - @ObfuscatedName("cy") - public static String field2918; - @ObfuscatedName("jd") - public static String field3056; - @ObfuscatedName("jv") - public static String field3057; - @ObfuscatedName("ji") - public static String field3058; + @ObfuscatedName("bi") + public static String field2966; + @ObfuscatedName("cv") + public static String field3005; + @ObfuscatedName("jo") + public static String field2961; + @ObfuscatedName("ju") + public static String field2955; + @ObfuscatedName("jx") + public static String field3183; static { - field2841 = "Please visit the support page for assistance."; - field2918 = "Please visit the support page for assistance."; // L: 99 - field3056 = ""; // L: 275 - field3057 = "Page has opened in a new window."; // L: 276 - field3058 = "(Please check your popup blocker.)"; // L: 277 + field2966 = "Please visit the support page for assistance."; // L: 60 + field3005 = "Please visit the support page for assistance."; // L: 99 + field2961 = ""; // L: 275 + field2955 = "Page has opened in a new window."; // L: 276 + field3183 = "(Please check your popup blocker.)"; // L: 277 } // L: 307 - @ObfuscatedName("n") + @ObfuscatedName("hs") @ObfuscatedSignature( - descriptor = "([I[II)V", - garbageValue = "-894693523" + descriptor = "(I)V", + garbageValue = "1090221079" ) - public static void method4329(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { // L: 19 - TriBool.ByteArrayPool_alternativeSizes = var0; - class225.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; - ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; - - for (int var2 = 0; var2 < TriBool.ByteArrayPool_alternativeSizes.length; ++var2) { - ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + static final void method4404() { + PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7285 + var0.importIndex(); // L: 7286 + int var1 = var0.readBits(8); // L: 7287 + int var2; + if (var1 < Client.npcCount) { // L: 7288 + for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7289 + Client.field724[++Client.field723 - 1] = Client.npcIndices[var2]; } + } + if (var1 > Client.npcCount) { // L: 7291 + throw new RuntimeException(""); } else { - TriBool.ByteArrayPool_alternativeSizes = null; // L: 20 - class225.ByteArrayPool_altSizeArrayCounts = null; // L: 21 - ByteArrayPool.ByteArrayPool_arrays = null; // L: 22 - } - } // L: 23 + Client.npcCount = 0; // L: 7292 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "9" - ) - static void method4324() { - Coord.field2560 = 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 = class231.method4321((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var0 / 16.0F)); - Coord.field2560[var0] = var3; - ++var0; // L: 29 - } - - var1 = 48; - - for (int var5 = var1 / 6; var0 < Coord.field2560.length; var1 -= var5) { - var3 = var0 * 2; // L: 36 - - for (int var4 = class231.method4321((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < Coord.field2560.length; ++var0) { - Coord.field2560[var0] = var4; - } - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-983754831" - ) - public static String method4327(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 30 - int var4 = 0; // L: 31 - int var5 = var1; // L: 32 - - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { // L: 33 34 65 - int var7 = var0[var5++] & 255; // L: 35 - if (var7 < 128) { // L: 37 - if (var7 == 0) { // L: 38 - var8 = 65533; + for (var2 = 0; var2 < var1; ++var2) { // L: 7293 + int var3 = Client.npcIndices[var2]; // L: 7294 + NPC var4 = Client.npcs[var3]; // L: 7295 + int var5 = var0.readBits(1); // L: 7296 + if (var5 == 0) { // L: 7297 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7298 + var4.npcCycle = Client.cycle; // L: 7299 } else { - var8 = var7; // L: 39 - } - } else if (var7 < 192) { // L: 41 - var8 = 65533; - } else if (var7 < 224) { // L: 42 - if (var5 < var6 && (var0[var5] & 192) == 128) { // L: 43 - var8 = (var7 & 31) << 6 | var0[var5++] & 63; // L: 44 - if (var8 < 128) { // L: 45 - var8 = 65533; - } - } else { - var8 = 65533; // L: 47 - } - } else if (var7 < 240) { // L: 49 - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { // L: 50 - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 51 - if (var8 < 2048) { // L: 52 - var8 = 65533; - } - } else { - var8 = 65533; // L: 54 - } - } else if (var7 < 248) { // L: 56 - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { // L: 57 - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; // L: 58 - if (var8 >= 65536 && var8 <= 1114111) { // L: 59 - var8 = 65533; // L: 60 + int var6 = var0.readBits(2); // L: 7302 + if (var6 == 0) { // L: 7303 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7304 + var4.npcCycle = Client.cycle; // L: 7305 + Client.field646[++Client.field645 - 1] = var3; // L: 7306 } else { - var8 = 65533; + int var7; + int var8; + if (var6 == 1) { // L: 7309 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7310 + var4.npcCycle = Client.cycle; // L: 7311 + var7 = var0.readBits(3); // L: 7312 + var4.method2235(var7, (byte)1); // L: 7313 + var8 = var0.readBits(1); // L: 7314 + if (var8 == 1) { // L: 7315 + Client.field646[++Client.field645 - 1] = var3; + } + } else if (var6 == 2) { // L: 7318 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7319 + var4.npcCycle = Client.cycle; // L: 7320 + var7 = var0.readBits(3); // L: 7321 + var4.method2235(var7, (byte)2); // L: 7322 + var8 = var0.readBits(3); // L: 7323 + var4.method2235(var8, (byte)2); // L: 7324 + int var9 = var0.readBits(1); // L: 7325 + if (var9 == 1) { + Client.field646[++Client.field645 - 1] = var3; // L: 7326 + } + } else if (var6 == 3) { // L: 7329 + Client.field724[++Client.field723 - 1] = var3; // L: 7330 + } } - } else { - var8 = 65533; // L: 62 - } - } else { - var8 = 65533; // L: 64 - } - } - - return new String(var3, 0, var4); // L: 67 - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-570785562" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; // L: 151 - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "580078079" - ) - static int method4326(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1782 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; // L: 1783 - return 1; // L: 1784 - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1786 - Interpreter.Interpreter_intStackSize -= 2; // L: 1787 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1788 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1789 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1375(var3, var4); // L: 1790 - return 1; // L: 1791 - } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1793 - Interpreter.Interpreter_intStackSize -= 2; // L: 1794 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1795 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1796 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.ItemContainer_getCount(var3, var4); // L: 1797 - return 1; // L: 1798 - } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1800 - Interpreter.Interpreter_intStackSize -= 2; // L: 1801 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1802 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1803 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class232.method4322(var3, var4); // L: 1804 - return 1; // L: 1805 - } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1807 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1808 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBarUpdate.getInvDefinition(var3).size; // L: 1809 - return 1; // L: 1810 - } else if (var0 == ScriptOpcodes.STAT) { // L: 1812 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1813 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1814 - return 1; // L: 1815 - } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1817 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1818 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1819 - return 1; // L: 1820 - } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1822 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1823 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1824 - return 1; // L: 1825 - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { // L: 1827 - var3 = class90.Client_plane; // L: 1828 - var4 = (UserComparator9.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; // L: 1829 - var5 = (UserComparator9.localPlayer.y >> 7) + NetCache.baseY; // L: 1830 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1831 - return 1; // L: 1832 - } else if (var0 == ScriptOpcodes.COORDX) { // L: 1834 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1835 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1836 - return 1; // L: 1837 - } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1839 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1840 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1841 - return 1; // L: 1842 - } else if (var0 == ScriptOpcodes.COORDY) { // L: 1844 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1845 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1846 - return 1; // L: 1847 - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1849 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1850 - return 1; // L: 1851 - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1853 - Interpreter.Interpreter_intStackSize -= 2; // L: 1854 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1855 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1856 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.method1375(var3, var4); // L: 1857 - return 1; // L: 1858 - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1860 - Interpreter.Interpreter_intStackSize -= 2; // L: 1861 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1862 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1863 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapID.ItemContainer_getCount(var3, var4); // L: 1864 - return 1; // L: 1865 - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1867 - Interpreter.Interpreter_intStackSize -= 2; // L: 1868 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1869 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1870 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class232.method4322(var3, var4); // L: 1871 - return 1; // L: 1872 - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1874 - if (Client.staffModLevel >= 2) { // L: 1875 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1876 - } - - return 1; // L: 1877 - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1879 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1880 - return 1; // L: 1881 - } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1883 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; // L: 1884 - return 1; // L: 1885 - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1887 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1888 - return 1; // L: 1889 - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1891 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; // L: 1892 - return 1; // L: 1893 - } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1895 - if (Client.playerMod) { // L: 1896 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1897 - } - - return 1; // L: 1898 - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1900 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1901 - return 1; // L: 1902 - } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1904 - Interpreter.Interpreter_intStackSize -= 4; // L: 1905 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1906 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1907 - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1908 - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 1909 - var3 += var4 << 14; // L: 1910 - var3 += var5 << 28; // L: 1911 - var3 += var6; // L: 1912 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 1913 - return 1; // L: 1914 - } else { - return 2; // L: 1916 - } - } - } - } - - @ObfuscatedName("kz") - @ObfuscatedSignature( - descriptor = "(Lhz;B)Lhz;", - garbageValue = "-45" - ) - static Widget method4325(Widget var0) { - int var2 = class60.getWidgetFlags(var0); // L: 11489 - int var1 = var2 >> 17 & 7; // L: 11491 - int var3 = var1; // L: 11493 - if (var1 == 0) { // L: 11494 - return null; - } else { - for (int var4 = 0; var4 < var3; ++var4) { // L: 11495 - var0 = class237.getWidget(var0.parentId); // L: 11496 - if (var0 == null) { // L: 11497 - return null; } } - return var0; // L: 11499 } - } + } // L: 7334 + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "54" + ) + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = class231.getWidgetChild(var0, var1); // L: 8824 + if (var4 != null && var4.onTargetEnter != null) { // L: 8825 + ScriptEvent var5 = new ScriptEvent(); // L: 8826 + var5.widget = var4; // L: 8827 + var5.args = var4.onTargetEnter; // L: 8828 + class19.runScriptEvent(var5); // L: 8829 + } + + Client.field874 = var3; // L: 8831 + Client.isSpellSelected = true; // L: 8832 + class148.selectedSpellWidget = var0; // L: 8833 + Client.selectedSpellChildIndex = var1; // L: 8834 + UserComparator10.selectedSpellFlags = var2; // L: 8835 + class29.invalidateWidget(var4); // L: 8836 + } // L: 8837 } diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java index 143ce4e39d..8855c14df8 100644 --- a/runescape-client/src/main/java/StructComposition.java +++ b/runescape-client/src/main/java/StructComposition.java @@ -1,32 +1,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("ka") @Implements("StructComposition") public class StructComposition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("StructDefinition_archive") - static AbstractArchive StructDefinition_archive; - @ObfuscatedName("v") + public static AbstractArchive StructDefinition_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("StructDefinition_cached") - public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1581798947 - ) - public static int field3338; - @ObfuscatedName("d") + static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Llg;" + descriptor = "Lme;" ) @Export("params") IterableNodeHashTable params; @@ -38,86 +32,75 @@ public class StructComposition extends DualNode { StructComposition() { } // L: 16 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-61" + descriptor = "(I)V", + garbageValue = "-51783205" ) @Export("postDecode") void postDecode() { - } // L: 33 + } // L: 29 - @ObfuscatedName("c") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1222397412" + descriptor = "(Lnu;I)V", + garbageValue = "1597477180" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 37 - if (var2 == 0) { // L: 38 - return; // L: 41 + int var2 = var1.readUnsignedByte(); // L: 33 + if (var2 == 0) { // L: 34 + return; // L: 37 } - this.decodeNext(var1, var2); // L: 39 + this.decodeNext(var1, var2); // L: 35 } } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "1068696099" + descriptor = "(Lnu;II)V", + garbageValue = "414960674" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = TextureProvider.readStringIntParameters(var1, this.params); // L: 44 + this.params = class105.readStringIntParameters(var1, this.params); // L: 40 } - } + } // L: 42 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "1838065399" + garbageValue = "-981552906" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; // L: 50 + IterableNodeHashTable var4 = this.params; // L: 46 int var3; - if (var4 == null) { // L: 52 - var3 = var2; // L: 53 + if (var4 == null) { // L: 48 + var3 = var2; // L: 49 } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 56 - if (var5 == null) { // L: 57 - var3 = var2; // L: 58 + IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 52 + if (var5 == null) { // L: 53 + var3 = var2; // L: 54 } else { - var3 = var5.integer; // L: 61 + var3 = var5.integer; // L: 57 } } - return var3; // L: 63 + return var3; // L: 59 } - @ObfuscatedName("z") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "-15071" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "429267652" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class69.method1258(this.params, var1, var2); // L: 67 + return MouseHandler.method725(this.params, var1, var2); // L: 63 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;Lig;Lig;B)V", - garbageValue = "76" - ) - public static void method4734(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 - Frames.field1904 = var1; // L: 47 - HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48 - } // L: 49 } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index ca028ced05..d9185f8eeb 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,68 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("ij") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lij;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lij;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lij;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lij;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lij;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lim;" + descriptor = "Lij;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("name") public final String name; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1009925305 + intValue = 136753843 ) @Export("id") final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; // L: 21 - this.id = var5; // L: 22 - } // L: 23 + this.name = var3; // L: 17 + this.id = var5; // L: 18 + } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 26 + return this.id; // L: 22 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lkt;", + garbageValue = "830101671" + ) + public static HitSplatDefinition method4391(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52 + if (var1 != null) { // L: 53 + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54 + var1 = new HitSplatDefinition(); // L: 55 + if (var2 != null) { // L: 56 + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57 + return var1; // L: 58 + } } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 288057c3dd..1bd68968f2 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("ep") @Implements("Task") public class Task { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lep;" ) @Export("next") Task next; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("status") public volatile int status; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -710231709 + intValue = -576884369 ) @Export("type") int type; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("intArgument") public int intArgument; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("result") public volatile Object result; diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index 67231d1a0f..a4a882b5e8 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -7,42 +7,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("dt") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("e") - static byte[][][] field2045; - @ObfuscatedName("a") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("dl") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lfl;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lep;" ) @Export("current") Task current; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lfl;" + descriptor = "Lep;" ) @Export("task") Task task; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("thread") Thread thread; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("isClosed") boolean isClosed; @@ -66,10 +55,10 @@ public class TaskHandler implements Runnable { this.thread.start(); // L: 31 } // L: 32 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1153020803" + garbageValue = "732898192" ) @Export("close") public final void close() { @@ -85,10 +74,10 @@ public class TaskHandler implements Runnable { } // L: 43 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lfl;", - garbageValue = "1365505014" + descriptor = "(IIILjava/lang/Object;I)Lep;", + garbageValue = "743067634" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -109,20 +98,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lfl;", - garbageValue = "-1223563808" + descriptor = "(Ljava/lang/String;IB)Lep;", + garbageValue = "-31" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lfl;", - garbageValue = "-1832147507" + descriptor = "(Ljava/lang/Runnable;IB)Lep;", + garbageValue = "-100" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -177,178 +166,37 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lhz;I[B[BI)V", - garbageValue = "-944892435" + descriptor = "(I)V", + garbageValue = "1532861557" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2668 == null) { // L: 905 - if (var2 == null) { // L: 906 - return; // L: 912 - } + static void method2524() { + Players.Players_count = 0; // L: 616 - var0.field2668 = new byte[11][]; // L: 907 - var0.field2669 = new byte[11][]; // L: 908 - var0.field2686 = new int[11]; // L: 909 - var0.field2599 = new int[11]; // L: 910 + for (int var0 = 0; var0 < 2048; ++var0) { // L: 617 + Players.field1352[var0] = null; // L: 618 + Players.field1351[var0] = 1; // L: 619 } - var0.field2668[var1] = var2; // L: 914 - if (var2 != null) { - var0.field2667 = true; // L: 915 - } else { - var0.field2667 = false; // L: 917 + } // L: 621 - for (int var4 = 0; var4 < var0.field2668.length; ++var4) { // L: 918 - if (var0.field2668[var4] != null) { // L: 919 - var0.field2667 = true; // L: 920 - break; - } - } - } - - var0.field2669[var1] = var3; // L: 925 - } // L: 926 - - @ObfuscatedName("s") + @ObfuscatedName("lx") @ObfuscatedSignature( - descriptor = "(IIIIIZI)Llm;", - garbageValue = "1451657661" + descriptor = "(I)V", + garbageValue = "800079546" ) - @Export("getItemSprite") - public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { // L: 345 - var4 = 0; - } else if (var4 == 2 && var1 != 1) { // L: 346 - var4 = 1; - } + static void method2523() { + if (class105.field1331 != null) { // L: 11737 + Client.field623 = Client.cycle; // L: 11738 + class105.field1331.method4657(); // L: 11739 - long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38); // L: 347 - SpritePixels var8; - if (!var5) { // L: 349 - var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 350 - if (var8 != null) { // L: 351 - return var8; - } - } - - ItemComposition var9 = class281.ItemDefinition_get(var0); // L: 353 - if (var1 > 1 && var9.countobj != null) { // L: 354 - int var10 = -1; // L: 355 - - for (int var11 = 0; var11 < 10; ++var11) { // L: 356 - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 357 - var10 = var9.countobj[var11]; + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11740 + if (Client.players[var0] != null) { // L: 11741 + class105.field1331.method4656((Client.players[var0].x >> 7) + ItemLayer.baseX, (Client.players[var0].y >> 7) + Tile.baseY); // L: 11742 } } - - if (var10 != -1) { // L: 359 - var9 = class281.ItemDefinition_get(var10); - } } - Model var19 = var9.getModel(1); // L: 361 - if (var19 == null) { // L: 362 - return null; - } else { - SpritePixels var20 = null; // L: 363 - if (var9.noteTemplate != -1) { // L: 364 - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 365 - if (var20 == null) { // L: 366 - return null; - } - } else if (var9.notedId != -1) { // L: 368 - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 369 - if (var20 == null) { // L: 370 - return null; - } - } else if (var9.placeholderTemplate != -1) { // L: 372 - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 373 - if (var20 == null) { // L: 374 - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 376 - int var13 = Rasterizer2D.Rasterizer2D_width; // L: 377 - int var14 = Rasterizer2D.Rasterizer2D_height; // L: 378 - int[] var15 = new int[4]; // L: 379 - Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 380 - var8 = new SpritePixels(36, 32); // L: 381 - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 382 - Rasterizer2D.Rasterizer2D_clear(); // L: 383 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 384 - Rasterizer3D.method3169(16, 16); // L: 385 - Rasterizer3D.field1777 = false; // L: 386 - if (var9.placeholderTemplate != -1) { // L: 387 - var20.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; // L: 388 - if (var5) { // L: 389 - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { // L: 390 - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 391 - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 392 - var19.calculateBoundsCylinder(); // L: 393 - var19.method3106(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 394 - if (var9.notedId != -1) { // L: 395 - var20.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { // L: 396 - var8.outline(1); - } - - if (var2 >= 2) { // L: 397 - var8.outline(16777215); - } - - if (var3 != 0) { // L: 398 - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 399 - if (var9.noteTemplate != -1) { // L: 400 - var20.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 401 - ItemComposition.ItemDefinition_fontPlain11.draw(SoundCache.inventoryQuantityFormat(var1), 0, 9, 16776960, 1); // L: 402 - } - - if (!var5) { // L: 404 - ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 405 - Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 406 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 407 - Rasterizer3D.field1777 = true; // L: 408 - return var8; // L: 409 - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1388427542" - ) - static final boolean method3673(int var0, int var1) { - ObjectComposition var2 = WorldMapAreaData.getObjectDefinition(var0); // L: 595 - if (var1 == 11) { // L: 596 - var1 = 10; - } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; // L: 597 - } - - return var2.method4806(var1); // L: 598 - } + } // L: 11746 } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 5cffb14d9c..e397ac0a19 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("fc") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("averageRGB") int averageRGB; - @ObfuscatedName("h") - boolean field1639; - @ObfuscatedName("z") + @ObfuscatedName("e") + boolean field1849; + @ObfuscatedName("k") @Export("fileIds") int[] fileIds; - @ObfuscatedName("e") - int[] field1641; - @ObfuscatedName("q") - int[] field1642; + @ObfuscatedName("g") + int[] field1851; + @ObfuscatedName("h") + int[] field1852; + @ObfuscatedName("n") + int[] field1844; @ObfuscatedName("l") - int[] field1648; - @ObfuscatedName("s") @Export("animationDirection") int animationDirection; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("pixels") int[] pixels; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lnu;)V" ) Texture(Buffer var1) { this.isLoaded = false; // L: 25 this.averageRGB = var1.readUnsignedShort(); // L: 29 - this.field1639 = var1.readUnsignedByte() == 1; // L: 30 + this.field1849 = var1.readUnsignedByte() == 1; // L: 30 int var2 = var1.readUnsignedByte(); // L: 31 if (var2 >= 1 && var2 <= 4) { // L: 32 this.fileIds = new int[var2]; // L: 35 @@ -53,25 +53,25 @@ public class Texture extends Node { } if (var2 > 1) { // L: 37 - this.field1641 = new int[var2 - 1]; // L: 38 + this.field1851 = new int[var2 - 1]; // L: 38 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 - this.field1641[var3] = var1.readUnsignedByte(); + this.field1851[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { // L: 41 - this.field1642 = new int[var2 - 1]; // L: 42 + this.field1852 = new int[var2 - 1]; // L: 42 for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 - this.field1642[var3] = var1.readUnsignedByte(); + this.field1852[var3] = var1.readUnsignedByte(); } } - this.field1648 = new int[var2]; // L: 45 + this.field1844 = new int[var2]; // L: 45 for (var3 = 0; var3 < var2; ++var3) { // L: 46 - this.field1648[var3] = var1.readInt(); + this.field1844[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); // L: 47 @@ -82,9 +82,9 @@ public class Texture extends Node { } } // L: 50 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(DILig;)Z" + descriptor = "(DILir;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,102 +99,95 @@ public class Texture extends Node { this.pixels = new int[var5]; // L: 57 for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 - int var8 = this.fileIds[var6]; // L: 60 - IndexedSprite var7; - if (!GrandExchangeOfferNameComparator.method212(var4, var8)) { // L: 62 - var7 = null; // L: 63 - } else { - var7 = ApproximateRouteStrategy.method1304(); // L: 66 + IndexedSprite var7 = VertexNormal.method3783(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.field1844[var6]; // L: 63 + if ((var10 & -16777216) == 16777216) { // L: 64 } - var7.normalize(); // L: 69 - byte[] var10 = var7.pixels; // L: 70 - int[] var11 = var7.palette; // L: 71 - int var12 = this.field1648[var6]; // L: 72 - if ((var12 & -16777216) == 16777216) { // L: 73 - } - - if ((var12 & -16777216) == 33554432) { // L: 74 + if ((var10 & -16777216) == 33554432) { // L: 65 } + int var11; + int var12; int var13; int var14; - int var15; - int var16; - if ((var12 & -16777216) == 50331648) { // L: 75 - var13 = var12 & 16711935; // L: 76 - var14 = var12 >> 8 & 255; // L: 77 + if ((var10 & -16777216) == 50331648) { // L: 66 + var11 = var10 & 16711935; // L: 67 + var12 = var10 >> 8 & 255; // L: 68 - for (var15 = 0; var15 < var11.length; ++var15) { // L: 78 - var16 = var11[var15]; // L: 79 - if (var16 >> 8 == (var16 & 65535)) { // L: 80 - var16 &= 255; // L: 81 - var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; // L: 82 + for (var13 = 0; var13 < var9.length; ++var13) { // L: 69 + var14 = var9[var13]; // L: 70 + if (var14 >> 8 == (var14 & 65535)) { // L: 71 + var14 &= 255; // L: 72 + var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; // L: 73 } } } - for (var13 = 0; var13 < var11.length; ++var13) { // L: 86 - var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); + for (var11 = 0; var11 < var9.length; ++var11) { // L: 77 + var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); } - if (var6 == 0) { // L: 88 - var13 = 0; + if (var6 == 0) { // L: 79 + var11 = 0; } else { - var13 = this.field1641[var6 - 1]; // L: 89 + var11 = this.field1851[var6 - 1]; // L: 80 } - if (var13 == 0) { // L: 90 - if (var3 == var7.subWidth) { // L: 91 - for (var14 = 0; var14 < var5; ++var14) { // L: 92 - this.pixels[var14] = var11[var10[var14] & 255]; + if (var11 == 0) { // L: 81 + if (var3 == var7.subWidth) { // L: 82 + for (var12 = 0; var12 < var5; ++var12) { // L: 83 + this.pixels[var12] = var9[var8[var12] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { // L: 94 - var14 = 0; // L: 95 + } else if (var7.subWidth == 64 && var3 == 128) { // L: 85 + var12 = 0; // L: 86 - for (var15 = 0; var15 < var3; ++var15) { // L: 96 - for (var16 = 0; var16 < var3; ++var16) { // L: 97 - this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; + for (var13 = 0; var13 < var3; ++var13) { // L: 87 + for (var14 = 0; var14 < var3; ++var14) { // L: 88 + this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { // L: 100 - throw new RuntimeException(); // L: 107 + if (var7.subWidth != 128 || var3 != 64) { // L: 91 + throw new RuntimeException(); // L: 98 } - var14 = 0; // L: 101 + var12 = 0; // L: 92 - for (var15 = 0; var15 < var3; ++var15) { // L: 102 - for (var16 = 0; var16 < var3; ++var16) { // L: 103 - this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; + for (var13 = 0; var13 < var3; ++var13) { // L: 93 + for (var14 = 0; var14 < var3; ++var14) { // L: 94 + this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; } } } } - if (var13 == 1) { // L: 110 + if (var11 == 1) { // L: 101 } - if (var13 == 2) { // L: 111 + if (var11 == 2) { // L: 102 } - if (var13 == 3) { // L: 112 + if (var11 == 3) { // L: 103 } } - return true; // L: 114 + return true; // L: 105 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("reset") void reset() { - this.pixels = null; // L: 118 - } // L: 119 + this.pixels = null; // L: 109 + } // L: 110 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("animate") void animate(int var1) { - if (this.pixels != null) { // L: 122 + if (this.pixels != null) { // L: 113 short var2; int var3; int var4; @@ -202,65 +195,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 123 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 124 + if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 114 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 115 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 126 + if (this.pixels.length == 4096) { // L: 117 var2 = 64; } else { - var2 = 128; // L: 127 + var2 = 128; // L: 118 } - var3 = this.pixels.length; // L: 128 - var4 = var2 * this.animationSpeed * var1; // L: 129 - var5 = var3 - 1; // L: 130 - if (this.animationDirection == 1) { // L: 131 + var3 = this.pixels.length; // L: 119 + var4 = var2 * this.animationSpeed * var1; // L: 120 + var5 = var3 - 1; // L: 121 + if (this.animationDirection == 1) { // L: 122 var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { // L: 132 - var7 = var6 + var4 & var5; // L: 133 - Texture_animatedPixels[var6] = this.pixels[var7]; // L: 134 + for (var6 = 0; var6 < var3; ++var6) { // L: 123 + var7 = var6 + var4 & var5; // L: 124 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 125 } - var10 = this.pixels; // L: 136 - this.pixels = Texture_animatedPixels; // L: 137 - Texture_animatedPixels = var10; // L: 138 + var10 = this.pixels; // L: 127 + this.pixels = Texture_animatedPixels; // L: 128 + Texture_animatedPixels = var10; // L: 129 } - if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 140 - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 141 + if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 131 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 132 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { // L: 143 + if (this.pixels.length == 4096) { // L: 134 var2 = 64; } else { - var2 = 128; // L: 144 + var2 = 128; // L: 135 } - var3 = this.pixels.length; // L: 145 - var4 = this.animationSpeed * var1; // L: 146 - var5 = var2 - 1; // L: 147 - if (this.animationDirection == 2) { // L: 148 + var3 = this.pixels.length; // L: 136 + var4 = this.animationSpeed * var1; // L: 137 + var5 = var2 - 1; // L: 138 + if (this.animationDirection == 2) { // L: 139 var4 = -var4; } - for (var6 = 0; var6 < var3; var6 += var2) { // L: 149 - for (var7 = 0; var7 < var2; ++var7) { // L: 150 - int var8 = var6 + var7; // L: 151 - int var9 = var6 + (var7 + var4 & var5); // L: 152 - Texture_animatedPixels[var8] = this.pixels[var9]; // L: 153 + for (var6 = 0; var6 < var3; var6 += var2) { // L: 140 + for (var7 = 0; var7 < var2; ++var7) { // L: 141 + int var8 = var6 + var7; // L: 142 + int var9 = var6 + (var7 + var4 & var5); // L: 143 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 144 } } - var10 = this.pixels; // L: 156 - this.pixels = Texture_animatedPixels; // L: 157 - Texture_animatedPixels = var10; // L: 158 + var10 = this.pixels; // L: 147 + this.pixels = Texture_animatedPixels; // L: 148 + Texture_animatedPixels = var10; // L: 149 } } - } // L: 160 + } // L: 151 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 2d14418136..b81881d0d0 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("ew") +@ObfuscatedName("gn") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1068759988" + garbageValue = "1311269963" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(II)I", + garbageValue = "-897876205" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1400851651" + garbageValue = "1352590845" ) - boolean vmethod3432(int var1); + boolean vmethod3790(int var1); - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1467632569" + garbageValue = "306645378" ) @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 e538126560..03a3f1f97f 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -4,93 +4,99 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("fn") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("n") + @ObfuscatedName("oz") @ObfuscatedSignature( - descriptor = "[Lep;" + descriptor = "Ldl;" + ) + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "[Lfc;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lji;" + descriptor = "Lju;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1670453341 + intValue = 1298178757 ) @Export("capacity") int capacity; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1122848717 + intValue = -453535345 ) @Export("remaining") int remaining; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("brightness") double brightness; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 705511283 + intValue = 412099007 ) @Export("textureSize") int textureSize; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - descriptor = "(Lig;Lig;IDI)V" + descriptor = "(Lir;Lir;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); // L: 9 this.remaining = 0; // L: 11 this.brightness = 1.0D; // L: 12 this.textureSize = 128; // L: 13 - this.archive = var2; - this.capacity = var3; - this.remaining = this.capacity; - this.brightness = var4; - this.textureSize = var6; - int[] var7 = var1.getGroupFileIds(0); - int var8 = var7.length; + 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("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2013656553" + descriptor = "(B)I", + garbageValue = "-11" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { int var1 = 0; // L: 32 int var2 = 0; // L: 33 - Texture[] var3 = this.textures; + Texture[] var3 = this.textures; // L: 35 - for (int var4 = 0; var4 < var3.length; ++var4) { - Texture var5 = var3[var4]; + 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) { // L: 43 int var8 = var6[var7]; // L: 44 - if (this.archive.method4366(var8)) { // L: 46 + if (this.archive.method4479(var8)) { // L: 46 ++var2; // L: 47 } } @@ -104,17 +110,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; // L: 60 this.clear(); // L: 61 } // L: 62 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1068759988" + garbageValue = "1311269963" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -144,39 +150,39 @@ public class TextureProvider implements TextureLoader { return null; // L: 84 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "1" + descriptor = "(II)I", + garbageValue = "-897876205" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { - return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-1400851651" + garbageValue = "1352590845" ) - public boolean vmethod3432(int var1) { - return this.textures[var1].field1639; // L: 93 + public boolean vmethod3790(int var1) { + return this.textures[var1].field1849; // L: 93 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1467632569" + garbageValue = "306645378" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; // L: 97 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1656047073" + descriptor = "(B)V", + garbageValue = "-74" ) @Export("clear") public void clear() { @@ -190,10 +196,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; // L: 105 } // L: 106 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-39" + descriptor = "(II)V", + garbageValue = "2035230902" ) @Export("animate") public void animate(int var1) { @@ -206,76 +212,4 @@ public class TextureProvider implements TextureLoader { } } // L: 116 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lkx;Llg;I)Llg;", - garbageValue = "-2095404981" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); // L: 16 - int var3; - if (var1 == null) { - var3 = GameObject.method3452(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { // L: 21 - boolean var4 = var0.readUnsignedByte() == 1; // L: 22 - int var5 = var0.readMedium(); // L: 23 - Object var6; - if (var4) { // L: 25 - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); // L: 26 - } - - var1.put((Node)var6, (long)var5); // L: 27 - } - - return var1; // L: 29 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;Lig;Lig;I)V", - garbageValue = "-729858984" - ) - public static void method2935(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - SequenceDefinition.SequenceDefinition_archive = var0; // L: 35 - SequenceDefinition.SequenceDefinition_animationsArchive = var1; // L: 36 - SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; // L: 37 - } // L: 38 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIIS)I", - garbageValue = "-4181" - ) - public static int method2914(int var0, int var1, int var2) { - var2 &= 3; // L: 17 - if (var2 == 0) { // L: 18 - return var1; - } else if (var2 == 1) { // L: 19 - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; // L: 20 - } - } - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "-32" - ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 88 - if (var3) { // L: 89 - var5 |= 65536L; - } - - return var5; // L: 90 - } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 1f73ee4c3b..cd329cd695 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -1,132 +1,146 @@ +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("es") +@ObfuscatedName("fx") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("n") + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("worldSelectBackSprites") + static SpritePixels[] worldSelectBackSprites; + @ObfuscatedName("gj") @ObfuscatedGetter( - intValue = -1603227235 + intValue = 290208105 + ) + @Export("baseY") + static int baseY; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1592009021 ) @Export("plane") int plane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1514983275 + intValue = 1758245997 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 110553161 + intValue = 528170581 ) @Export("y") int y; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1594248765 + intValue = 1400903317 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lgr;" ) @Export("paint") SceneTilePaint paint; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Leo;" + descriptor = "Lfj;" ) @Export("model") SceneTileModel model; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Lgs;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Leu;" + descriptor = "Lgh;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Len;" + descriptor = "Lfz;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Lfk;" ) @Export("itemLayer") ItemLayer itemLayer; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -539721401 + intValue = -1333584157 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "[Lej;" + descriptor = "[Lgb;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -173130829 + intValue = 710748349 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -547792493 + intValue = 1452251067 ) @Export("minPlane") int minPlane; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("f") + @ObfuscatedName("t") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1512202233 + intValue = 551470887 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -14103435 + intValue = -1164753335 ) - int field1667; - @ObfuscatedName("t") + int field1889; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1037835833 + intValue = 210470001 ) - int field1680; - @ObfuscatedName("p") + int field1890; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2140292419 + intValue = 1446822029 ) - int field1668; - @ObfuscatedName("m") + int field1882; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Les;" + descriptor = "Lfx;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -140,13 +154,103 @@ public final class Tile extends Node { this.y = var3; // L: 33 } // L: 34 - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(B)[B", + garbageValue = "-20" ) - public static void method3032() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 82 - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 83 - } // L: 84 + public static byte[] method3356() { + byte[] var0 = new byte[24]; // L: 275 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 277 + JagexCache.JagexCache_randomDat.readFully(var0); // L: 278 + + int var1; + for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 279 280 281 + } + + if (var1 >= 24) { // L: 283 + throw new IOException(); + } + } catch (Exception var4) { + for (int var2 = 0; var2 < 24; ++var2) { // L: 286 + var0[var2] = -1; + } + } + + return var0; // L: 288 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-860783313" + ) + static int method3358(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1809 + class16.Interpreter_intStackSize -= 3; // L: 1810 + ArchiveDiskAction.queueSoundEffect(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]); // L: 1811 + return 1; // L: 1812 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1814 + class4.playSong(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1815 + return 1; // L: 1816 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1818 + class16.Interpreter_intStackSize -= 2; // L: 1819 + HealthBarUpdate.method2175(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 1820 + return 1; // L: 1821 + } else { + int var3; + if (var0 == 3203) { // L: 1823 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1824 + Messages.method2367(Math.round(2.55F * (float)var3)); // L: 1825 + return 1; // L: 1826 + } else if (var0 == 3204) { // L: 1828 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Math.round((float)Login.clientPreferences.musicVolume / 2.55F); // L: 1829 + return 1; // L: 1830 + } else if (var0 == 3205) { // L: 1832 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1833 + Canvas.updateSoundEffectVolume(Math.round((float)var3 * 1.27F)); // L: 1834 + return 1; // L: 1835 + } else if (var0 == 3206) { // L: 1837 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Math.round((float)Login.clientPreferences.soundEffectsVolume / 1.27F); // L: 1838 + return 1; // L: 1839 + } else if (var0 == 3207) { // L: 1841 + var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize], 0), 100); // L: 1842 + MusicPatchPcmStream.method4126(Math.round((float)var3 * 1.27F)); // L: 1843 + return 1; // L: 1844 + } else if (var0 == 3208) { // L: 1846 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Math.round((float)Login.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1847 + return 1; // L: 1848 + } else { + return 2; // L: 1850 + } + } + } + + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "149089395" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field819 = 0L; // L: 3599 + if (var0 >= 2) { // L: 3600 + Client.isResizable = true; + } else { + Client.isResizable = false; // L: 3601 + } + + if (WorldMapScaleHandler.getWindowedMode() == 1) { // L: 3602 + class10.client.setMaxCanvasSize(765, 503); // L: 3603 + } else { + class10.client.setMaxCanvasSize(7680, 2160); // L: 3606 + } + + if (Client.gameState >= 25) { // L: 3608 + ItemContainer.method2093(); + } + + } // L: 3609 } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index f75b533630..2131853262 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -4,18 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("dg") @Implements("TileItem") public final class TileItem extends Renderable { - @ObfuscatedName("n") + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -315361579 + intValue = -52258563 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -555496093 + intValue = -438803775 ) @Export("quantity") int quantity; @@ -23,18 +35,22 @@ public final class TileItem extends Renderable { TileItem() { } // L: 11 - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lef;", - garbageValue = "127" + descriptor = "(I)Lgv;", + garbageValue = "1835906978" ) @Export("getModel") protected final Model getModel() { - return class281.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 + return class23.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } - @ObfuscatedName("v") - public static boolean method2265(long var0) { - return 0L != var0 && !class225.method4239(var0); // L: 48 + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "936749737" + ) + static int method2266(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3461 } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index f212c0349d..3adc4ee4cb 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,280 +3,109 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bh") +@ObfuscatedName("ch") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -968243809 + intValue = -725804883 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("c") - static byte[][][] field517; - @ObfuscatedName("h") - static byte[][][] field530; - @ObfuscatedName("s") + @ObfuscatedName("b") + static byte[][][] field1092; + @ObfuscatedName("e") + static byte[][][] field1091; + @ObfuscatedName("n") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("l") @Export("Tiles_saturation") static int[] Tiles_saturation; - @ObfuscatedName("g") - static final int[] field521; - @ObfuscatedName("u") - static final int[] field514; - @ObfuscatedName("t") - static final int[] field523; - @ObfuscatedName("p") - static final int[] field527; @ObfuscatedName("m") - static final int[] field525; - @ObfuscatedName("r") - static final int[] field526; - @ObfuscatedName("o") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("v") + static final int[] field1094; + @ObfuscatedName("x") + static final int[] field1098; + @ObfuscatedName("z") + static final int[] field1097; + @ObfuscatedName("i") + static final int[] field1100; + @ObfuscatedName("a") + static final int[] field1101; + @ObfuscatedName("w") + static final int[] field1099; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1953607333 + intValue = 1418652947 ) - static int field518; - @ObfuscatedName("j") + static int field1103; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2108936291 + intValue = 4127251 ) - static int field528; - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive14") - static Archive archive14; + static int field1104; static { - Tiles_heights = new int[4][105][105]; + Tiles_heights = new int[4][105][105]; // L: 16 Tiles_renderFlags = new byte[4][104][104]; // L: 17 - Tiles_minPlane = 99; - field521 = new int[]{1, 2, 4, 8}; - field514 = new int[]{16, 32, 64, 128}; // L: 35 - field523 = new int[]{1, 0, -1, 0}; // L: 36 - field527 = new int[]{0, -1, 0, 1}; - field525 = new int[]{1, -1, -1, 1}; // L: 38 - field526 = new int[]{-1, -1, 1, 1}; // L: 39 - field518 = (int)(Math.random() * 17.0D) - 8; // L: 40 - field528 = (int)(Math.random() * 33.0D) - 16; // L: 41 + Tiles_minPlane = 99; // L: 18 + field1094 = new int[]{1, 2, 4, 8}; // L: 34 + field1098 = new int[]{16, 32, 64, 128}; // L: 35 + field1097 = new int[]{1, 0, -1, 0}; // L: 36 + field1100 = new int[]{0, -1, 0, 1}; // L: 37 + field1101 = new int[]{1, -1, -1, 1}; + field1099 = new int[]{-1, -1, 1, 1}; + field1103 = (int)(Math.random() * 17.0D) - 8; + field1104 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-1552906826" + descriptor = "(IIII)Lcc;", + garbageValue = "-560076270" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); // L: 14 - if (var0 < class307.field3734) { // L: 15 - class307.field3735 += class307.field3734 - var0; // L: 16 + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class137.method2654(var1, var0); // L: 38 + Script var4 = Widget.method4292(var3, var0); // L: 39 + if (var4 != null) { // L: 40 + return var4; // L: 41 + } else { + var3 = class124.method2489(var2, var0); // L: 43 + var4 = Widget.method4292(var3, var0); // L: 44 + return var4 != null ? var4 : null; // L: 45 48 } - - class307.field3734 = var0; - return class307.field3735 + var0; } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Lih;", - garbageValue = "-2101793788" + descriptor = "(II)Lky;", + garbageValue = "-2019872849" ) - public static VarbitComposition method1219(int var0) { - VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); - if (var1 != null) { + public static FloorUnderlayDefinition method2035(int var0) { + FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 return var1; } else { - byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); - var1 = new VarbitComposition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 25 + var1 = new FloorUnderlayDefinition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2), var0); } - VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); - return var1; + var1.postDecode(); // L: 28 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 29 + return var1; // L: 30 } } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(ILlu;Liy;B)V", - garbageValue = "1" - ) - static void method1218(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; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 - } // L: 25 - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 27 - if (ArchiveDiskActionHandler.field3187 == 0) { // L: 28 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 29 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 30 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 31 - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 32 - } - - ArchiveDiskActionHandler.field3187 = 600; // L: 34 - } - } // L: 37 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Lgv;", - garbageValue = "-2100535609" - ) - static LoginPacket[] method1217() { - return new LoginPacket[]{LoginPacket.field2340, LoginPacket.field2339, LoginPacket.field2342, LoginPacket.field2338, LoginPacket.field2336, LoginPacket.field2337}; // L: 22 - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1993341504" - ) - static final void method1209(String var0) { - class300.method5473("Please remove " + var0 + " from your friend list first"); // L: 158 - } // L: 159 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1872094164" - ) - static int method1215(int var0, Script var1, boolean var2) { - int var6; - if (var0 == ScriptOpcodes.OC_NAME) { // L: 2808 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2809 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class281.ItemDefinition_get(var6).name; // L: 2810 - return 1; // L: 2811 - } else { - int var4; - ItemComposition var5; - if (var0 == ScriptOpcodes.OC_OP) { // L: 2813 - Interpreter.Interpreter_intStackSize -= 2; // L: 2814 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2815 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2816 - var5 = class281.ItemDefinition_get(var6); // L: 2817 - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 2818 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2819 - } - - return 1; // L: 2820 - } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 2822 - Interpreter.Interpreter_intStackSize -= 2; // L: 2823 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2824 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2825 - var5 = class281.ItemDefinition_get(var6); // L: 2826 - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 2827 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2828 - } - - return 1; // L: 2829 - } else if (var0 == ScriptOpcodes.OC_COST) { // L: 2831 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2832 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class281.ItemDefinition_get(var6).price; // L: 2833 - return 1; // L: 2834 - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 2836 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2837 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class281.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 2838 - return 1; // L: 2839 - } else { - ItemComposition var7; - if (var0 == ScriptOpcodes.OC_CERT) { // L: 2841 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2842 - var7 = class281.ItemDefinition_get(var6); // L: 2843 - if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 2844 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2845 - } - - return 1; // L: 2846 - } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 2848 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2849 - var7 = class281.ItemDefinition_get(var6); // L: 2850 - if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 2851 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2852 - } - - return 1; // L: 2853 - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 2855 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2856 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class281.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 2857 - return 1; // L: 2858 - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 2860 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2861 - var7 = class281.ItemDefinition_get(var6); // L: 2862 - if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 2863 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2864 - } - - return 1; // L: 2865 - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 2867 - var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2868 - var7 = class281.ItemDefinition_get(var6); // L: 2869 - if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 2870 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2871 - } - - return 1; // L: 2872 - } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 2874 - String var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2875 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2876 - PendingSpawn.findItemDefinitions(var3, var4 == 1); // L: 2877 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NPC.foundItemIdCount; // L: 2878 - return 1; // L: 2879 - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 2881 - if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 2886 - WorldMapLabelSize.foundItemIndex = 0; // L: 2887 - return 1; // L: 2888 - } else { - return 2; // L: 2890 - } - } else { - if (class52.foundItemIds != null && WorldMapLabelSize.foundItemIndex < NPC.foundItemIdCount) { // L: 2882 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class52.foundItemIds[++WorldMapLabelSize.foundItemIndex - 1] & '\uffff'; // L: 2883 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; // L: 2884 - } - } - } - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "739507935" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; // L: 10361 - } // L: 10362 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 08bf4d9b90..fb7b91a363 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,147 +4,144 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("kh") @Implements("Timer") public class Timer { @ObfuscatedName("f") - @Export("cacheSubPaths") - static String[] cacheSubPaths; - @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -2999131098664295081L + longValue = -2229775801046207963L ) - long field3620; - @ObfuscatedName("v") + long field3776; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 8703508403484672025L + longValue = -2890453841099618337L ) - long field3611; - @ObfuscatedName("d") - public boolean field3616; - @ObfuscatedName("c") + long field3772; + @ObfuscatedName("u") + public boolean field3773; + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 6712649404077510219L + longValue = -7962001912981584977L ) - long field3614; - @ObfuscatedName("y") + long field3774; + @ObfuscatedName("b") @ObfuscatedGetter( - longValue = 6713522721722477663L + longValue = 8981361987879773313L ) - long field3612; - @ObfuscatedName("h") - @ObfuscatedGetter( - longValue = 4706314381784357345L - ) - long field3615; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 231611023 - ) - int field3617; + long field3771; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 764593875 + longValue = 329501522501233997L ) - int field3618; - @ObfuscatedName("q") + long field3778; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -941214579 + intValue = 1107893853 ) - int field3613; - @ObfuscatedName("l") + int field3775; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1615778673 + intValue = 1705593105 ) - int field3619; + int field3777; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 825874723 + ) + int field3779; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 2111113097 + ) + int field3780; public Timer() { - this.field3620 = -1L; // L: 7 - this.field3611 = -1L; // L: 8 - this.field3616 = false; // L: 9 - this.field3614 = 0L; // L: 10 - this.field3612 = 0L; // L: 11 - this.field3615 = 0L; // L: 12 - this.field3617 = 0; // L: 13 - this.field3618 = 0; // L: 14 - this.field3613 = 0; // L: 15 - this.field3619 = 0; // L: 16 + this.field3776 = -1L; // L: 7 + this.field3772 = -1L; // L: 8 + this.field3773 = false; // L: 9 + this.field3774 = 0L; // L: 10 + this.field3771 = 0L; // L: 11 + this.field3778 = 0L; // L: 12 + this.field3775 = 0; // L: 13 + this.field3777 = 0; // L: 14 + this.field3779 = 0; // L: 15 + this.field3780 = 0; // L: 16 } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - public void method5212() { - this.field3620 = Tiles.currentTimeMillis(); // L: 19 - } // L: 20 - - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-86650625" + garbageValue = "-2125552653" ) - public void method5206() { - if (-1L != this.field3620) { // L: 23 - this.field3612 = Tiles.currentTimeMillis() - this.field3620; // L: 24 - this.field3620 = -1L; // L: 25 + public void method5577() { + this.field3776 = ObjectSound.currentTimeMillis(); // L: 19 + } // L: 20 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1077201550" + ) + public void method5578() { + if (this.field3776 != -1L) { // L: 23 + this.field3771 = ObjectSound.currentTimeMillis() - this.field3776; // L: 24 + this.field3776 = -1L; // L: 25 } } // L: 27 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-330894833" + descriptor = "(IB)V", + garbageValue = "20" ) - public void method5211(int var1) { - this.field3611 = Tiles.currentTimeMillis(); // L: 30 - this.field3617 = var1; // L: 31 + public void method5579(int var1) { + this.field3772 = ObjectSound.currentTimeMillis(); // L: 30 + this.field3775 = var1; // L: 31 } // L: 32 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "40" + descriptor = "(I)V", + garbageValue = "-44027989" ) - public void method5198() { - if (this.field3611 != -1L) { // L: 35 - this.field3614 = Tiles.currentTimeMillis() - this.field3611; // L: 36 - this.field3611 = -1L; // L: 37 + public void method5587() { + if (-1L != this.field3772) { // L: 35 + this.field3774 = ObjectSound.currentTimeMillis() - this.field3772; // L: 36 + this.field3772 = -1L; // L: 37 } - ++this.field3613; // L: 39 - this.field3616 = true; // L: 40 + ++this.field3779; // L: 39 + this.field3773 = true; // L: 40 } // L: 41 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1966837629" + descriptor = "(B)V", + garbageValue = "13" ) - public void method5199() { - this.field3616 = false; // L: 44 - this.field3618 = 0; // L: 45 + public void method5581() { + this.field3773 = false; // L: 44 + this.field3777 = 0; // L: 45 } // L: 46 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "435711064" + garbageValue = "-170289943" ) - public void method5200() { - this.method5198(); // L: 49 + public void method5582() { + this.method5587(); // L: 49 } // L: 50 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkx;S)V", - garbageValue = "-14322" + descriptor = "(Lnu;B)V", + garbageValue = "114" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3612; // L: 53 + long var2 = this.field3771; // L: 53 var2 /= 10L; // L: 55 if (var2 < 0L) { // L: 56 var2 = 0L; @@ -153,7 +150,7 @@ public class Timer { } var1.writeShort((int)var2); // L: 58 - long var4 = this.field3614; // L: 60 + long var4 = this.field3774; // L: 60 var4 /= 10L; // L: 62 if (var4 < 0L) { // L: 63 var4 = 0L; @@ -162,7 +159,7 @@ public class Timer { } var1.writeShort((int)var4); // L: 65 - long var6 = this.field3615; // L: 67 + long var6 = this.field3778; // L: 67 var6 /= 10L; // L: 69 if (var6 < 0L) { // L: 70 var6 = 0L; @@ -171,9 +168,9 @@ public class Timer { } var1.writeShort((int)var6); // L: 72 - var1.writeShort(this.field3617); // L: 74 - var1.writeShort(this.field3618); // L: 75 - var1.writeShort(this.field3613); // L: 76 - var1.writeShort(this.field3619); // L: 77 + var1.writeShort(this.field3775); // L: 74 + var1.writeShort(this.field3777); // L: 75 + var1.writeShort(this.field3779); // L: 76 + var1.writeShort(this.field3780); // L: 77 } // L: 78 -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 36a445fa02..bc3b9119a5 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,32 +1,36 @@ +import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("ls") @Implements("TriBool") public class TriBool { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lka;" + descriptor = "Lls;" ) @Export("TriBool_false") public static final TriBool TriBool_false; - @ObfuscatedName("z") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive0") + static Archive archive0; static { TriBool_unknown = new TriBool(); // L: 4 @@ -37,12 +41,35 @@ public class TriBool { TriBool() { } // L: 8 - @ObfuscatedName("kx") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-107" + descriptor = "(IIB)Z", + garbageValue = "-45" ) - public static boolean method5372() { - return Client.staffModLevel >= 2; // L: 11616 + static boolean method5817(int var0, int var1) { + return var0 != 4 || var1 < 8; // L: 26 } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-17" + ) + static final void method5818(boolean var0) { + if (var0) { // L: 2449 + Client.field636 = Login.field1005 ? class125.field1456 : class125.field1457; // L: 2450 + } else { + LinkedHashMap var1 = Login.clientPreferences.parameters; // L: 2453 + String var3 = Login.Login_username; // L: 2455 + int var4 = var3.length(); // L: 2457 + int var5 = 0; // L: 2458 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 2459 + var5 = (var5 << 5) - var5 + var3.charAt(var6); + } + + Client.field636 = var1.containsKey(var5) ? class125.field1459 : class125.field1458; // L: 2462 + } + + } // L: 2464 } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 232332a90c..b059a03408 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -4,16 +4,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("da") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("n") + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lfp;" + ) + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("f") @Export("url") final URL url; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("response0") volatile byte[] response0; @@ -21,32 +33,23 @@ public class UrlRequest { this.url = var1; // L: 96 } // L: 97 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1827433673" + garbageValue = "-1850686662" ) @Export("isDone") public boolean isDone() { return this.isDone0; // L: 100 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)[B", - garbageValue = "124" + garbageValue = "79" ) @Export("getResponse") public byte[] getResponse() { return this.response0; // L: 104 } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ZZI)Lly;", - garbageValue = "-2105187304" - ) - static IndexedSprite method3476(boolean var0, boolean var1) { - return var0 ? (var1 ? WorldMapDecoration.field237 : Login.options_buttons_2Sprite) : (var1 ? UrlRequester.field1956 : class69.options_buttons_0Sprite); // L: 198 - } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 7fc70dbf31..8283630a41 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -10,27 +10,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("de") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "Low;" ) - static IndexedSprite field1956; - @ObfuscatedName("dt") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("n") + static IndexedSprite field1400; + @ObfuscatedName("f") @Export("thread") final Thread thread; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("requests") Queue requests; @@ -41,10 +35,10 @@ public class UrlRequester implements Runnable { this.thread.start(); // L: 20 } // L: 21 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Lei;", - garbageValue = "1847135895" + descriptor = "(Ljava/net/URL;I)Lda;", + garbageValue = "-1899831036" ) @Export("request") public UrlRequest request(URL var1) { @@ -56,10 +50,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-158100516" + garbageValue = "-1618502581" ) @Export("close") public void close() { @@ -91,8 +85,8 @@ public class UrlRequester implements Runnable { } } - DataInputStream var2 = null; - URLConnection var3 = null; + DataInputStream var2 = null; // L: 37 + URLConnection var3 = null; // L: 38 try { var3 = var1.url.openConnection(); // L: 40 @@ -122,59 +116,18 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { // L: 64 - SequenceDefinition.RunException_sendStackTrace((String)null, var17); // L: 65 + class223.RunException_sendStackTrace((String)null, var17); // L: 65 } } } // L: 68 - @ObfuscatedName("d") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "833500111" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-694005791" ) - static byte[] method3460(byte[] var0) { - int var1 = var0.length; // L: 35 - byte[] var2 = new byte[var1]; // L: 36 - System.arraycopy(var0, 0, var2, 0, var1); // L: 37 - return var2; // L: 38 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-630790234" - ) - public static String method3467(String var0) { - int var1 = var0.length(); // L: 159 - char[] var2 = new char[var1]; // L: 160 - byte var3 = 2; // L: 161 - - for (int var4 = 0; var4 < var1; ++var4) { // L: 162 - char var5 = var0.charAt(var4); // L: 163 - if (var3 == 0) { // L: 164 - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 165 - var5 = LoginScreenAnimation.method1927(var5); - } - - if (Character.isLetter(var5)) { // L: 166 - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 167 - if (Character.isSpaceChar(var5)) { // L: 168 - if (var3 != 2) { // L: 169 - var3 = 1; - } - } else { - var3 = 1; // L: 171 - } - } else { - var3 = 2; - } - - var2[var4] = var5; // L: 172 - } - - return new String(var2); // L: 174 + public static int method2388(String var0) { + return var0.length() + 2; // L: 126 } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 391c4dde2a..f1058df42d 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("lt") @Implements("User") public class User implements Comparable { - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Llw;" ) @Export("username") Username username; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Llw;" ) @Export("previousUsername") Username previousUsername; @@ -22,184 +22,62 @@ public class User implements Comparable { User() { } // L: 7 - @ObfuscatedName("ag") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)Lkk;", - garbageValue = "-24" + descriptor = "(Llt;I)I", + garbageValue = "1200801892" + ) + @Export("compareTo_user") + public int compareTo_user(User var1) { + return this.username.compareToTyped(var1.username); // L: 30 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)Llw;", + garbageValue = "46" ) @Export("getUsername") public Username getUsername() { return this.username; // L: 10 } - @ObfuscatedName("ae") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-2090571369" + garbageValue = "125310743" ) @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); + return this.username == null ? "" : this.username.getName(); // L: 14 15 } - @ObfuscatedName("ac") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(B)Ljava/lang/String;", - garbageValue = "-71" + garbageValue = "-43" ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); + return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 } - @ObfuscatedName("aq") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "(Lkk;Lkk;B)V", - garbageValue = "0" + descriptor = "(Llw;Llw;B)V", + garbageValue = "-36" ) @Export("set") void set(Username var1, Username var2) { - if (var1 == null) { + if (var1 == null) { // L: 24 throw new NullPointerException(); } else { - this.username = var1; + this.username = var1; // L: 25 this.previousUsername = var2; // L: 26 } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Ljn;I)I", - garbageValue = "642739557" - ) - @Export("compareTo_user") - public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); - } + } // L: 27 public int compareTo(Object var1) { return this.compareTo_user((User)var1); // L: 34 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgp;I)I", - garbageValue = "-1977368915" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); // L: 11 - int var4 = var1.length(); // L: 12 - int var5 = 0; // L: 13 - int var6 = 0; // L: 14 - byte var7 = 0; // L: 15 - byte var8 = 0; // L: 16 - - while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 - if (var5 - var7 >= var3) { // L: 19 - return -1; - } - - if (var6 - var8 >= var4) { // L: 20 - return 1; - } - - char var9; - if (var7 != 0) { // L: 23 - var9 = (char)var7; // L: 24 - boolean var14 = false; // L: 25 - } else { - var9 = var0.charAt(var5++); // L: 27 - } - - char var10; - if (var8 != 0) { // L: 28 - var10 = (char)var8; // L: 29 - boolean var15 = false; // L: 30 - } else { - var10 = var1.charAt(var6++); // L: 32 - } - - byte var11; - if (var9 == 198) { // L: 35 - var11 = 69; // L: 36 - } else if (var9 == 230) { // L: 39 - var11 = 101; // L: 40 - } else if (var9 == 223) { // L: 43 - var11 = 115; // L: 44 - } else if (var9 == 338) { // L: 47 - var11 = 69; // L: 48 - } else if (var9 == 339) { // L: 51 - var11 = 101; // L: 52 - } else { - var11 = 0; // L: 55 - } - - var7 = var11; // L: 57 - byte var12; - if (var10 == 198) { // L: 60 - var12 = 69; // L: 61 - } else if (var10 == 230) { // L: 64 - var12 = 101; // L: 65 - } else if (var10 == 223) { // L: 68 - var12 = 115; // L: 69 - } else if (var10 == 338) { // L: 72 - var12 = 69; // L: 73 - } else if (var10 == 339) { // L: 76 - var12 = 101; // L: 77 - } else { - var12 = 0; // L: 80 - } - - var8 = var12; // L: 82 - var9 = ItemContainer.standardizeChar(var9, var2); // L: 83 - var10 = ItemContainer.standardizeChar(var10, var2); // L: 84 - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85 - var9 = Character.toLowerCase(var9); // L: 86 - var10 = Character.toLowerCase(var10); // L: 87 - if (var9 != var10) { // L: 88 - return EnumComposition.lowercaseChar(var9, var2) - EnumComposition.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); // L: 91 - - int var17; - char var20; - for (var17 = 0; var17 < var16; ++var17) { // L: 92 - if (var2 == Language.Language_FR) { // L: 93 - var5 = var3 - 1 - var17; // L: 94 - var6 = var4 - 1 - var17; // L: 95 - } else { - var6 = var17; // L: 97 - var5 = var17; - } - - char var18 = var0.charAt(var5); // L: 98 - var20 = var1.charAt(var6); // L: 99 - if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { // L: 100 - var18 = Character.toLowerCase(var18); // L: 101 - var20 = Character.toLowerCase(var20); // L: 102 - if (var18 != var20) { - return EnumComposition.lowercaseChar(var18, var2) - EnumComposition.lowercaseChar(var20, var2); // L: 103 - } - } - } - - var17 = var3 - var4; // L: 106 - if (var17 != 0) { // L: 107 - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { // L: 108 - var20 = var0.charAt(var19); // L: 109 - char var13 = var1.charAt(var19); // L: 110 - if (var20 != var13) { // L: 111 - return EnumComposition.lowercaseChar(var20, var2) - EnumComposition.lowercaseChar(var13, var2); - } - } - - return 0; // L: 113 - } - } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index e2b1cb7713..d9942d87df 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("nw") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -15,21 +15,21 @@ public class UserComparator1 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljn;Ljn;I)I", - garbageValue = "1322603376" + descriptor = "(Llt;Llt;I)I", + garbageValue = "-2039031306" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 22 } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); // L: 18 + } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 491c4ea996..3d356dc401 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,12 +1,24 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("db") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("n") + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1931551411 + ) + static int field1439; + @ObfuscatedName("mm") + @ObfuscatedGetter( + intValue = 1081078287 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -14,17 +26,17 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;I)I", - garbageValue = "899318279" + descriptor = "(Llg;Llg;I)I", + garbageValue = "-1459911395" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 18 } } @@ -32,24 +44,20 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "77103650" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lor;" ) - static String method3580(int var0) { - return ""; // L: 18 - } + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { // L: 57 + var2 = (RunException)var0; // L: 58 + var2.message = var2.message + ' ' + var1; // L: 59 + } else { + var2 = new RunException(var0, var1); // L: 61 + } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1892343700" - ) - static void method3573() { - Login.worldSelectOpen = false; // L: 1577 - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1578 - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1579 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 1580 - } // L: 1581 + return var2; // L: 62 + } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 7aa5d3fe96..32b0ecdadc 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -4,10 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("nt") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -15,21 +15,21 @@ public class UserComparator2 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljn;Ljn;I)I", - garbageValue = "-1740485605" + descriptor = "(Llt;Llt;I)I", + garbageValue = "677246703" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); // L: 18 - } - public boolean equals(Object var1) { return super.equals(var1); // L: 22 } + + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); // L: 18 + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index da8d2b3703..c8ca8c06f0 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -3,10 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("di") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("n") + @ObfuscatedName("k") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -14,10 +17,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;I)I", - garbageValue = "917883171" + descriptor = "(Llg;Llg;I)I", + garbageValue = "-1718548069" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,4 +34,44 @@ public class UserComparator3 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Lkz;", + garbageValue = "73" + ) + @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 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "97099503" + ) + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 161 + int var2 = 0; // L: 162 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 163 + var2 = (var2 << 5) - var2 + Messages.charToByteCp1252(var0.charAt(var3)); + } + + return var2; // L: 164 + } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 186a74f367..e636bc2ade 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -1,13 +1,20 @@ +import java.awt.Component; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fb") +@ObfuscatedName("dz") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("n") + @ObfuscatedName("tl") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -15,21 +22,251 @@ public class UserComparator4 implements Comparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;B)I", - garbageValue = "4" + descriptor = "(Llg;Llg;I)I", + garbageValue = "-867581222" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 } + public int compare(Object var1, Object var2) { + return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 + } + public boolean equals(Object var1) { return super.equals(var1); // L: 22 } - public int compare(Object var1, Object var2) { - return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1533461235" + ) + static void method2419(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 + var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 + } // L: 40 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1612766571" + ) + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; // L: 63 + int[] var3 = new int[4]; // L: 64 + var2[0] = var0; // L: 65 + var3[0] = var1; // L: 66 + int var4 = 1; // L: 67 + + for (int var5 = 0; var5 < 4; ++var5) { // L: 68 + if (World.World_sortOption1[var5] != var0) { // L: 69 + var2[var4] = World.World_sortOption1[var5]; // L: 70 + var3[var4] = World.World_sortOption2[var5]; // L: 71 + ++var4; // L: 72 + } + } + + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + class208.sortWorlds(class9.World_worlds, 0, class9.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-303804195" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 172 } + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(ZLnk;ZI)V", + garbageValue = "517232593" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1, boolean var2) { + Client.field723 = 0; // L: 7142 + Client.field645 = 0; // L: 7143 + Strings.method4404(); // L: 7144 + WorldMapScaleHandler.method3246(var0, var1, var2); // L: 7145 + + int var3; + int var4; + for (var3 = 0; var3 < Client.field645; ++var3) { // L: 7147 + var4 = Client.field646[var3]; // L: 7148 + NPC var5 = Client.npcs[var4]; // L: 7149 + int var6 = var1.readUnsignedByte(); // L: 7150 + int var7; + if ((var6 & 128) != 0) { // L: 7151 + var5.spotAnimation = var1.readUnsignedShort(); // L: 7152 + var7 = var1.method6629(); // L: 7153 + var5.field1238 = var7 >> 16; // L: 7154 + var5.field1249 = (var7 & 65535) + Client.cycle; // L: 7155 + var5.spotAnimationFrame = 0; // L: 7156 + var5.spotAnimationFrameCycle = 0; // L: 7157 + if (var5.field1249 > Client.cycle) { // L: 7158 + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { // L: 7159 + var5.spotAnimation = -1; + } + } + + int var8; + int var9; + int var10; + if ((var6 & 64) != 0) { // L: 7161 + var7 = var1.method6748(); // L: 7162 + var8 = var1.method6766(); // L: 7163 + var9 = var5.x - (var7 - ItemLayer.baseX - ItemLayer.baseX) * 64; // L: 7164 + var10 = var5.y - (var8 - Tile.baseY - Tile.baseY) * 64; // L: 7165 + if (var9 != 0 || var10 != 0) { // L: 7166 + var5.field1237 = (int)(Math.atan2((double)var9, (double)var10) * 325.949D) & 2047; + } + } + + if ((var6 & 1) != 0) { // L: 7168 + var5.overheadText = var1.readStringCp1252NullTerminated(); // L: 7169 + var5.overheadTextCyclesRemaining = 100; // L: 7170 + } + + if ((var6 & 16) != 0) { // L: 7172 + var5.definition = GraphicsObject.getNpcDefinition(var1.method6766()); // L: 7173 + var5.field1258 = var5.definition.size; // L: 7174 + var5.field1262 = var5.definition.rotation; // L: 7175 + var5.walkSequence = var5.definition.walkSequence; // L: 7176 + var5.walkBackSequence = var5.definition.walkBackSequence; // L: 7177 + var5.walkLeftSequence = var5.definition.walkLeftSequence; // L: 7178 + var5.walkRightSequence = var5.definition.walkRightSequence; // L: 7179 + var5.idleSequence = var5.definition.idleSequence; // L: 7180 + var5.turnLeftSequence = var5.definition.turnLeftSequence; // L: 7181 + var5.turnRightSequence = var5.definition.turnRightSequence; // L: 7182 + } + + if ((var6 & 8) != 0) { // L: 7184 + var5.targetIndex = var1.readUnsignedShort(); // L: 7185 + if (var5.targetIndex == 65535) { // L: 7186 + var5.targetIndex = -1; + } + } + + if ((var6 & 4) != 0) { // L: 7188 + var7 = var1.readUnsignedByte(); // L: 7189 + int var11; + int var12; + int var13; + if (var7 > 0) { // L: 7190 + for (var8 = 0; var8 < var7; ++var8) { // L: 7191 + var10 = -1; // L: 7193 + var11 = -1; // L: 7194 + var12 = -1; // L: 7195 + var9 = var1.readUShortSmart(); // L: 7196 + if (var9 == 32767) { // L: 7197 + var9 = var1.readUShortSmart(); // L: 7198 + var11 = var1.readUShortSmart(); // L: 7199 + var10 = var1.readUShortSmart(); // L: 7200 + var12 = var1.readUShortSmart(); // L: 7201 + } else if (var9 != 32766) { // L: 7203 + var11 = var1.readUShortSmart(); // L: 7204 + } else { + var9 = -1; // L: 7206 + } + + var13 = var1.readUShortSmart(); // L: 7207 + var5.addHitSplat(var9, var11, var10, var12, Client.cycle, var13); // L: 7208 + } + } + + var8 = var1.method6623(); // L: 7211 + if (var8 > 0) { // L: 7212 + for (var9 = 0; var9 < var8; ++var9) { // L: 7213 + var10 = var1.readUShortSmart(); // L: 7214 + var11 = var1.readUShortSmart(); // L: 7215 + if (var11 != 32767) { // L: 7216 + var12 = var1.readUShortSmart(); // L: 7217 + var13 = var1.method6623(); // L: 7218 + int var14 = var11 > 0 ? var1.method6609() : var13; // L: 7219 + var5.addHealthBar(var10, Client.cycle, var11, var12, var13, var14); // L: 7220 + } else { + var5.removeHealthBar(var10); // L: 7222 + } + } + } + } + + if ((var6 & 2) != 0) { // L: 7226 + var5.field1240 = var1.method6612(); // L: 7227 + var5.field1253 = var1.method6584(); // L: 7228 + var5.field1252 = var1.method6612(); // L: 7229 + var5.field1239 = var1.readByte(); // L: 7230 + var5.field1255 = var1.method6748() + Client.cycle; // L: 7231 + var5.field1268 = var1.method6766() + Client.cycle; // L: 7232 + var5.field1213 = var1.method6748(); // L: 7233 + var5.pathLength = 1; // L: 7234 + var5.field1224 = 0; // L: 7235 + var5.field1240 += var5.pathX[0]; // L: 7236 + var5.field1253 += var5.pathY[0]; // L: 7237 + var5.field1252 += var5.pathX[0]; // L: 7238 + var5.field1239 += var5.pathY[0]; // L: 7239 + } + + if ((var6 & 32) != 0) { // L: 7241 + var7 = var1.method6617(); // L: 7242 + if (var7 == 65535) { // L: 7243 + var7 = -1; + } + + var8 = var1.method6610(); // L: 7244 + if (var7 == var5.sequence && var7 != -1) { // L: 7245 + var9 = class225.SequenceDefinition_get(var7).field3707; // L: 7246 + if (var9 == 1) { // L: 7247 + var5.sequenceFrame = 0; // L: 7248 + var5.sequenceFrameCycle = 0; // L: 7249 + var5.sequenceDelay = var8; // L: 7250 + var5.field1245 = 0; // L: 7251 + } + + if (var9 == 2) { // L: 7253 + var5.field1245 = 0; // L: 7254 + } + } else if (var7 == -1 || var5.sequence == -1 || class225.SequenceDefinition_get(var7).field3718 >= class225.SequenceDefinition_get(var5.sequence).field3718) { // L: 7257 + var5.sequence = var7; // L: 7258 + var5.sequenceFrame = 0; // L: 7259 + var5.sequenceFrameCycle = 0; // L: 7260 + var5.sequenceDelay = var8; // L: 7261 + var5.field1245 = 0; // L: 7262 + var5.field1224 = var5.pathLength; // L: 7263 + } + } + } + + for (var3 = 0; var3 < Client.field723; ++var3) { // L: 7269 + var4 = Client.field724[var3]; // L: 7270 + if (Client.npcs[var4].npcCycle != Client.cycle) { // L: 7271 + Client.npcs[var4].definition = null; // L: 7272 + Client.npcs[var4] = null; // L: 7273 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7276 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var3 = 0; var3 < Client.npcCount; ++var3) { // L: 7277 + if (Client.npcs[Client.npcIndices[var3]] == null) { // L: 7278 + throw new RuntimeException(var3 + "," + Client.npcCount); // L: 7279 + } + } + + } + } // L: 7282 } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index e00e7e40ed..739d2ead8f 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("du") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;I)I", - garbageValue = "-159510893" + descriptor = "(Llg;Llg;I)I", + garbageValue = "-893758058" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -26,671 +26,44 @@ public class UserComparator5 extends AbstractUserComparator { 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("n") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IB)Lld;", - garbageValue = "25" + descriptor = "(III)Lbs;", + garbageValue = "725590681" ) - public static PrivateChatMode method3604(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3831, PrivateChatMode.field3829, PrivateChatMode.field3830}; // L: 18 - PrivateChatMode[] var2 = var1; // L: 20 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21 - PrivateChatMode var4 = var2[var3]; // L: 22 - if (var0 == var4.field3832) { // L: 24 - return var4; - } - } - - return null; // L: 28 + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 + return var2.getMessage(var1); // L: 36 } - @ObfuscatedName("fy") + @ObfuscatedName("iy") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-179435824" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "53199048" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (WorldMapDecorationType.pcmPlayer1 != null) { // L: 3291 - WorldMapDecorationType.pcmPlayer1.run(); + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 9930 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9931 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9932 } - if (class197.pcmPlayer0 != null) { // L: 3292 - class197.pcmPlayer0.run(); + if (var1.length() > 9) { // L: 9934 + return " " + DefaultsGroup.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + DefaultsGroup.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + DefaultsGroup.colorStartTag(16776960) + var1 + ""; // L: 9935 9936 } - - } // L: 3293 - - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(Lcv;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()) { // L: 4426 - if (var0 instanceof NPC) { // L: 4427 - NPCComposition var6 = ((NPC)var0).definition; // L: 4428 - if (var6.transforms != null) { // L: 4429 - var6 = var6.transform(); - } - - if (var6 == null) { // L: 4430 - return; - } - } - - int var75 = Players.Players_count; // L: 4432 - int[] var7 = Players.Players_indices; // L: 4433 - byte var8 = 0; // L: 4434 - Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 4435 - var10 = (Player)var0; // L: 4437 - boolean var9; - if (Client.drawPlayerNames == 0) { // L: 4439 - var9 = false; // L: 4440 - } else if (var10 == UserComparator9.localPlayer) { // L: 4443 - var9 = ArchiveDiskAction.method4359(); // L: 4462 - } else { - boolean var11 = GameBuild.method4350(); // L: 4444 - boolean var12; - if (!var11) { // L: 4445 - var12 = (Client.drawPlayerNames & 1) != 0; // L: 4448 - var11 = var12 && var10.isFriend(); // L: 4450 - } - - var12 = var11; // L: 4452 - if (!var11) { // L: 4453 - boolean var13 = (Client.drawPlayerNames & 2) != 0; // L: 4456 - var12 = var13 && var10.isClanMember(); // L: 4458 - } - - var9 = var12; // L: 4460 - } - - if (var9) { // L: 4464 - Player var76 = (Player)var0; // L: 4465 - if (var1 < var75) { // L: 4466 - SoundCache.method2689(var0, var0.defaultHeight + 15); // L: 4467 - AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4468 - byte var91 = 9; // L: 4469 - var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var91, 16777215, 0); // L: 4470 - var8 = 18; // L: 4471 - } - } - } - - int var87 = -2; // L: 4475 - int var15; - int var22; - int var23; - if (!var0.healthBars.method5064()) { // L: 4476 - SoundCache.method2689(var0, var0.defaultHeight + 15); // L: 4477 - - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { // L: 4478 - HealthBarUpdate var94 = var88.get(Client.cycle); // L: 4479 - if (var94 == null) { // L: 4480 - if (var88.isEmpty()) { // L: 4538 - var88.remove(); - } - } else { - HealthBarDefinition var95 = var88.definition; // L: 4481 - SpritePixels var79 = var95.getBackSprite(); // L: 4482 - SpritePixels var81 = var95.getFrontSprite(); // L: 4483 - int var82 = 0; // L: 4485 - if (var79 != null && var81 != null) { // L: 4486 - if (var95.widthPadding * 2 < var81.subWidth) { // L: 4487 - var82 = var95.widthPadding; - } - - var15 = var81.subWidth - var82 * 2; // L: 4488 - } else { - var15 = var95.width; // L: 4490 - } - - int var17 = 255; // L: 4491 - boolean var83 = true; // L: 4492 - int var84 = Client.cycle - var94.cycle; // L: 4493 - int var85 = var15 * var94.health2 / var95.width; // L: 4494 - int var86; - int var97; - if (var94.cycleOffset > var84) { // L: 4495 - var86 = var95.field3316 == 0 ? 0 : var95.field3316 * (var84 / var95.field3316); // L: 4496 - var22 = var15 * var94.health / var95.width; // L: 4497 - var97 = var86 * (var85 - var22) / var94.cycleOffset + var22; // L: 4498 - } else { - var97 = var85; // L: 4501 - var86 = var95.int5 + var94.cycleOffset - var84; // L: 4502 - if (var95.int3 >= 0) { // L: 4503 - var17 = (var86 << 8) / (var95.int5 - var95.int3); - } - } - - if (var94.health2 > 0 && var97 < 1) { // L: 4505 - var97 = 1; - } - - if (var79 != null && var81 != null) { // L: 4506 - if (var15 == var97) { // L: 4507 - var97 += var82 * 2; - } else { - var97 += var82; // L: 4508 - } - - var86 = var79.subHeight; // L: 4509 - var87 += var86; // L: 4510 - var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4511 - var23 = var3 + Client.viewportTempY - var87; // L: 4512 - var22 -= var82; // L: 4513 - if (var17 >= 0 && var17 < 255) { // L: 4514 - var79.drawTransAt(var22, var23, var17); // L: 4515 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var97 + var22, var86 + var23); // L: 4516 - var81.drawTransAt(var22, var23, var17); // L: 4517 - } else { - var79.drawTransBgAt(var22, var23); // L: 4520 - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var97 + var22, var86 + var23); // L: 4521 - var81.drawTransBgAt(var22, var23); // L: 4522 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4524 - var87 += 2; // L: 4525 - } else { - var87 += 5; // L: 4528 - if (Client.viewportTempX > -1) { // L: 4529 - var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4530 - var22 = var3 + Client.viewportTempY - var87; // L: 4531 - Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var97, 5, 65280); // L: 4532 - Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var97, var22, var15 - var97, 5, 16711680); // L: 4533 - } - - var87 += 2; // L: 4535 - } - } - } - } - - if (var87 == -2) { // L: 4541 - var87 += 7; - } - - var87 += var8; // L: 4542 - if (var1 < var75) { // L: 4543 - var10 = (Player)var0; // L: 4544 - if (var10.isHidden) { // L: 4545 - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 4546 - SoundCache.method2689(var0, var0.defaultHeight + 15); // L: 4547 - if (Client.viewportTempX > -1) { // L: 4548 - if (var10.headIconPk != -1) { // L: 4549 - var87 += 25; // L: 4550 - Client.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4551 - } - - if (var10.headIconPrayer != -1) { // L: 4553 - var87 += 25; // L: 4554 - class169.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4555 - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4559 - SoundCache.method2689(var0, var0.defaultHeight + 15); // L: 4560 - if (Client.viewportTempX > -1) { // L: 4561 - var87 += class13.headIconHintSprites[1].subHeight; // L: 4562 - class13.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4563 - } - } - } else { - NPCComposition var89 = ((NPC)var0).definition; // L: 4568 - if (var89.transforms != null) { // L: 4569 - var89 = var89.transform(); - } - - if (var89.headIconPrayer >= 0 && var89.headIconPrayer < class169.headIconPrayerSprites.length) { // L: 4570 - SoundCache.method2689(var0, var0.defaultHeight + 15); // L: 4571 - if (Client.viewportTempX > -1) { // L: 4572 - class169.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4573 - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4576 - SoundCache.method2689(var0, var0.defaultHeight + 15); // L: 4577 - if (Client.viewportTempX > -1) { // L: 4578 - class13.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field968 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4581 4582 - SoundCache.method2689(var0, var0.defaultHeight); // L: 4583 - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4584 - Client.overheadTextXOffsets[Client.overheadTextCount] = ScriptEvent.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4585 - Client.overheadTextAscents[Client.overheadTextCount] = ScriptEvent.fontBold12.ascent; // L: 4586 - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4587 - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4588 - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4589 - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4590 - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4591 - Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4592 - ++Client.overheadTextCount; // L: 4593 - } - } - - for (int var78 = 0; var78 < 4; ++var78) { // L: 4597 - int var90 = var0.hitSplatCycles[var78]; // L: 4598 - int var92 = var0.hitSplatTypes[var78]; // L: 4599 - HitSplatDefinition var96 = null; // L: 4600 - int var14 = 0; // L: 4601 - if (var92 >= 0) { // L: 4602 - if (var90 <= Client.cycle) { // L: 4603 - continue; - } - - var96 = ScriptFrame.method1222(var0.hitSplatTypes[var78]); // L: 4604 - var14 = var96.field3364; // L: 4605 - if (var96 != null && var96.transforms != null) { // L: 4606 - var96 = var96.transform(); // L: 4607 - if (var96 == null) { // L: 4608 - var0.hitSplatCycles[var78] = -1; // L: 4609 - continue; // L: 4610 - } - } - } else if (var90 < 0) { // L: 4614 - continue; - } - - var15 = var0.hitSplatTypes2[var78]; // L: 4615 - HitSplatDefinition var16 = null; // L: 4616 - if (var15 >= 0) { // L: 4617 - var16 = ScriptFrame.method1222(var15); // L: 4618 - if (var16 != null && var16.transforms != null) { // L: 4619 - var16 = var16.transform(); - } - } - - if (var90 - var14 <= Client.cycle) { // L: 4621 - if (var96 == null) { // L: 4622 - var0.hitSplatCycles[var78] = -1; // L: 4623 - } else { - SoundCache.method2689(var0, var0.defaultHeight / 2); // L: 4626 - if (Client.viewportTempX > -1) { // L: 4627 - if (var78 == 1) { // L: 4629 - Client.viewportTempY -= 20; // L: 4630 - } - - if (var78 == 2) { // L: 4632 - Client.viewportTempX -= 15; // L: 4633 - Client.viewportTempY -= 10; // L: 4634 - } - - if (var78 == 3) { // L: 4636 - Client.viewportTempX += 15; // L: 4637 - Client.viewportTempY -= 10; // L: 4638 - } - - SpritePixels var18 = null; // L: 4640 - SpritePixels var19 = null; // L: 4641 - SpritePixels var20 = null; // L: 4642 - SpritePixels var21 = null; // L: 4643 - var22 = 0; // L: 4644 - var23 = 0; // L: 4645 - int var24 = 0; // L: 4646 - int var25 = 0; // L: 4647 - int var26 = 0; // L: 4648 - int var27 = 0; // L: 4649 - int var28 = 0; // L: 4650 - int var29 = 0; // L: 4651 - SpritePixels var30 = null; // L: 4652 - SpritePixels var31 = null; // L: 4653 - SpritePixels var32 = null; // L: 4654 - SpritePixels var33 = null; // L: 4655 - int var34 = 0; // L: 4656 - int var35 = 0; // L: 4657 - int var36 = 0; // L: 4658 - int var37 = 0; // L: 4659 - int var38 = 0; // L: 4660 - int var39 = 0; // L: 4661 - int var40 = 0; // L: 4662 - int var41 = 0; // L: 4663 - int var42 = 0; // L: 4664 - var18 = var96.method4764(); // L: 4665 - int var43; - if (var18 != null) { // L: 4666 - var22 = var18.subWidth; // L: 4667 - var43 = var18.subHeight; // L: 4668 - if (var43 > var42) { // L: 4669 - var42 = var43; - } - - var26 = var18.xOffset; // L: 4670 - } - - var19 = var96.method4770(); // L: 4672 - if (var19 != null) { // L: 4673 - var23 = var19.subWidth; // L: 4674 - var43 = var19.subHeight; // L: 4675 - if (var43 > var42) { // L: 4676 - var42 = var43; - } - - var27 = var19.xOffset; // L: 4677 - } - - var20 = var96.method4769(); // L: 4679 - if (var20 != null) { // L: 4680 - var24 = var20.subWidth; // L: 4681 - var43 = var20.subHeight; // L: 4682 - if (var43 > var42) { // L: 4683 - var42 = var43; - } - - var28 = var20.xOffset; // L: 4684 - } - - var21 = var96.method4766(); // L: 4686 - if (var21 != null) { // L: 4687 - var25 = var21.subWidth; // L: 4688 - var43 = var21.subHeight; // L: 4689 - if (var43 > var42) { // L: 4690 - var42 = var43; - } - - var29 = var21.xOffset; // L: 4691 - } - - if (var16 != null) { // L: 4693 - var30 = var16.method4764(); // L: 4694 - if (var30 != null) { // L: 4695 - var34 = var30.subWidth; // L: 4696 - var43 = var30.subHeight; // L: 4697 - if (var43 > var42) { // L: 4698 - var42 = var43; - } - - var38 = var30.xOffset; // L: 4699 - } - - var31 = var16.method4770(); // L: 4701 - if (var31 != null) { // L: 4702 - var35 = var31.subWidth; // L: 4703 - var43 = var31.subHeight; // L: 4704 - if (var43 > var42) { // L: 4705 - var42 = var43; - } - - var39 = var31.xOffset; // L: 4706 - } - - var32 = var16.method4769(); // L: 4708 - if (var32 != null) { // L: 4709 - var36 = var32.subWidth; // L: 4710 - var43 = var32.subHeight; // L: 4711 - if (var43 > var42) { // L: 4712 - var42 = var43; - } - - var40 = var32.xOffset; // L: 4713 - } - - var33 = var16.method4766(); // L: 4715 - if (var33 != null) { // L: 4716 - var37 = var33.subWidth; // L: 4717 - var43 = var33.subHeight; // L: 4718 - if (var43 > var42) { // L: 4719 - var42 = var43; - } - - var41 = var33.xOffset; // L: 4720 - } - } - - Font var80 = var96.getFont(); // L: 4725 - if (var80 == null) { // L: 4726 - var80 = SecureRandomCallable.fontPlain11; - } - - Font var44; - if (var16 != null) { // L: 4727 - var44 = var16.getFont(); // L: 4728 - if (var44 == null) { // L: 4729 - var44 = SecureRandomCallable.fontPlain11; - } - } else { - var44 = SecureRandomCallable.fontPlain11; // L: 4731 - } - - String var45 = null; // L: 4732 - String var46 = null; // L: 4733 - boolean var47 = false; // L: 4734 - int var48 = 0; // L: 4735 - var45 = var96.getString(var0.hitSplatValues[var78]); // L: 4736 - int var93 = var80.stringWidth(var45); // L: 4737 - if (var16 != null) { // L: 4738 - var46 = var16.getString(var0.hitSplatValues2[var78]); // L: 4739 - var48 = var44.stringWidth(var46); // L: 4740 - } - - int var49 = 0; // L: 4742 - int var50 = 0; // L: 4743 - if (var23 > 0) { // L: 4744 - if (var20 == null && var21 == null) { // L: 4745 - var49 = 1; // L: 4746 - } else { - var49 = var93 / var23 + 1; - } - } - - if (var16 != null && var35 > 0) { // L: 4748 4749 - if (var32 == null && var33 == null) { // L: 4750 - var50 = 1; // L: 4751 - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; // L: 4754 - int var52 = var51; // L: 4755 - if (var22 > 0) { // L: 4756 - var51 += var22; - } - - var51 += 2; // L: 4757 - int var53 = var51; // L: 4758 - if (var24 > 0) { // L: 4759 - var51 += var24; - } - - int var54 = var51; // L: 4760 - int var55 = var51; // L: 4761 - int var56; - if (var23 > 0) { // L: 4762 - var56 = var23 * var49; // L: 4763 - var51 += var56; // L: 4764 - var55 += (var56 - var93) / 2; // L: 4765 - } else { - var51 += var93; // L: 4768 - } - - var56 = var51; // L: 4770 - if (var25 > 0) { // L: 4771 - var51 += var25; - } - - int var57 = 0; // L: 4772 - int var58 = 0; // L: 4773 - int var59 = 0; // L: 4774 - int var60 = 0; // L: 4775 - int var61 = 0; // L: 4776 - int var62; - if (var16 != null) { // L: 4777 - var51 += 2; // L: 4778 - var57 = var51; // L: 4779 - if (var34 > 0) { // L: 4780 - var51 += var34; - } - - var51 += 2; // L: 4781 - var58 = var51; // L: 4782 - if (var36 > 0) { // L: 4783 - var51 += var36; - } - - var59 = var51; // L: 4784 - var61 = var51; // L: 4785 - if (var35 > 0) { // L: 4786 - var62 = var35 * var50; // L: 4787 - var51 += var62; // L: 4788 - var61 += (var62 - var48) / 2; // L: 4789 - } else { - var51 += var48; // L: 4792 - } - - var60 = var51; // L: 4794 - if (var37 > 0) { // L: 4795 - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var78] - Client.cycle; // L: 4797 - int var63 = var96.field3378 - var62 * var96.field3378 / var96.field3364; // L: 4798 - int var64 = var62 * var96.field3370 / var96.field3364 + -var96.field3370; // L: 4799 - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4800 - int var66 = var64 + (var3 + Client.viewportTempY - 12); // L: 4801 - int var67 = var66; // L: 4802 - int var68 = var66 + var42; // L: 4803 - int var69 = var66 + var96.field3368 + 15; // L: 4804 - int var70 = var69 - var80.maxAscent; // L: 4805 - int var71 = var69 + var80.maxDescent; // L: 4806 - if (var70 < var66) { // L: 4807 - var67 = var70; - } - - if (var71 > var68) { // L: 4808 - var68 = var71; - } - - int var72 = 0; // L: 4809 - int var73; - int var74; - if (var16 != null) { // L: 4810 - var72 = var66 + var16.field3368 + 15; // L: 4811 - var73 = var72 - var44.maxAscent; // L: 4812 - var74 = var72 + var44.maxDescent; // L: 4813 - if (var73 < var67) { // L: 4814 - ; - } - - if (var74 > var68) { // L: 4815 - ; - } - } - - var73 = 255; // L: 4817 - if (var96.field3371 >= 0) { // L: 4818 - var73 = (var62 << 8) / (var96.field3364 - var96.field3371); - } - - if (var73 >= 0 && var73 < 255) { // L: 4819 - if (var18 != null) { // L: 4820 - var18.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var20 != null) { // L: 4821 - var20.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var19 != null) { // L: 4822 - for (var74 = 0; var74 < var49; ++var74) { // L: 4823 - var19.drawTransAt(var74 * var23 + (var54 + var65 - var27), var66, var73); // L: 4824 - } - } - - if (var21 != null) { // L: 4827 - var21.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var80.drawAlpha(var45, var65 + var55, var69, var96.textColor, 0, var73); // L: 4828 - if (var16 != null) { // L: 4829 - if (var30 != null) { // L: 4830 - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { // L: 4831 - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { // L: 4832 - for (var74 = 0; var74 < var50; ++var74) { // L: 4833 - var31.drawTransAt(var35 * var74 + (var59 + var65 - var39), var66, var73); // L: 4834 - } - } - - if (var33 != null) { // L: 4837 - var33.drawTransAt(var60 + var65 - var41, var66, var73); - } - - var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 4838 - } - } else { - if (var18 != null) { // L: 4842 - var18.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var20 != null) { // L: 4843 - var20.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var19 != null) { // L: 4844 - for (var74 = 0; var74 < var49; ++var74) { // L: 4845 - var19.drawTransBgAt(var23 * var74 + (var54 + var65 - var27), var66); // L: 4846 - } - } - - if (var21 != null) { // L: 4849 - var21.drawTransBgAt(var65 + var56 - var29, var66); - } - - var80.draw(var45, var55 + var65, var69, var96.textColor | -16777216, 0); // L: 4850 - if (var16 != null) { // L: 4851 - if (var30 != null) { // L: 4852 - var30.drawTransBgAt(var57 + var65 - var38, var66); - } - - if (var32 != null) { // L: 4853 - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { // L: 4854 - for (var74 = 0; var74 < var50; ++var74) { // L: 4855 - var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); // L: 4856 - } - } - - if (var33 != null) { // L: 4859 - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 4860 - } - } - } - } - } - } - - } - } // L: 4865 + } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index cbb200c6ab..abc8b172f5 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -1,17 +1,19 @@ import 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("fk") +@ObfuscatedName("dv") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "Lls;" + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = -1429066911 ) - static AbstractSocket field2008; - @ObfuscatedName("n") + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -19,10 +21,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;I)I", - garbageValue = "-441882539" + descriptor = "(Llg;Llg;I)I", + garbageValue = "-1442699949" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index e2e9fec375..182cdecca8 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,18 +1,19 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fc") +@ObfuscatedName("dh") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("el") - @ObfuscatedGetter( - intValue = -528381057 - ) - static int field1999; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -20,10 +21,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;B)I", - garbageValue = "0" + descriptor = "(Llg;Llg;I)I", + garbageValue = "-465902583" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,58 +39,644 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("x") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIIIIIB)Z", - garbageValue = "126" + descriptor = "(ILcc;ZI)I", + garbageValue = "-770449800" ) - static final boolean method3592(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 181 - if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 182 - return false; + static int method2431(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; + var4 = class139.getWidget(var3); // L: 559 } else { - var7 = ViewportMouse.ViewportMouse_y - var6; // L: 183 - if (var7 > var0 && var7 > var1 && var7 > var2) { // L: 184 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x + var6; // L: 185 - if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 186 - return false; - } else { - var7 = ViewportMouse.ViewportMouse_x - var6; // L: 187 - return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 188 - } + var4 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 561 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 562 + class16.Interpreter_intStackSize -= 4; // L: 563 + var4.rawX = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; + class29.invalidateWidget(var4); + class10.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { // L: 570 + UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + class16.Interpreter_intStackSize -= 4; // L: 574 + var4.rawWidth = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; + class29.invalidateWidget(var4); + class10.client.alignWidget(var4); // L: 580 + if (var3 != -1 && var4.type == 0) { // L: 581 + UserList.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + class29.invalidateWidget(var4); // L: 588 + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 592 + var4.noClickThrough = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 593 + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; + return 1; // L: 598 + } else { + return 2; // L: 600 } } - @ObfuscatedName("gz") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lbk;IIB)V", - garbageValue = "-26" + descriptor = "(Lal;B)V", + garbageValue = "0" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { // L: 3784 - int var3 = InterfaceParent.SequenceDefinition_get(var1).field3548; // L: 3785 - if (var3 == 1) { // L: 3786 - var0.sequenceFrame = 0; // L: 3787 - var0.sequenceFrameCycle = 0; // L: 3788 - var0.sequenceDelay = var2; // L: 3789 - var0.field973 = 0; // L: 3790 + @Export("doCycleTitle") + static void doCycleTitle(GameEngine var0) { + if (Login.worldSelectOpen) { // L: 217 + class223.method4238(var0); // L: 218 + } else { + int var3; + if ((MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 221 + Login.clientPreferences.titleMusicDisabled = !Login.clientPreferences.titleMusicDisabled; // L: 222 + Message.savePreferences(); // L: 223 + if (!Login.clientPreferences.titleMusicDisabled) { // L: 224 + Archive var1 = class8.archive6; // L: 225 + int var2 = var1.getGroupId("scape main"); // L: 227 + var3 = var1.getFileId(var2, ""); // L: 228 + PacketBufferNode.method3898(var1, var2, var3, 255, false); // L: 229 + } else { + class210.midiPcmStream.clear(); // L: 233 + class210.musicPlayerStatus = 1; // L: 234 + class210.musicTrackArchive = null; // L: 235 + } } - if (var3 == 2) { // L: 3792 - var0.field973 = 0; // L: 3793 + if (Client.gameState != 5) { // L: 238 + if (-1L == Login.field991) { // L: 239 + Login.field991 = ObjectSound.currentTimeMillis() + 1000L; // L: 240 + } + + long var15 = ObjectSound.currentTimeMillis(); // L: 242 + if (class3.method63() && -1L == Login.field1016) { // L: 243 244 + Login.field1016 = var15; // L: 245 + if (Login.field1016 > Login.field991) { // L: 246 + Login.field991 = Login.field1016; // L: 247 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 251 + if (class35.clientLanguage == Language.Language_EN) { // L: 252 + if (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 253 + var3 = Login.xPadding + 5; // L: 254 + short var4 = 463; // L: 255 + byte var5 = 100; // L: 256 + byte var6 = 35; // L: 257 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var4 + var6) { // L: 258 + class18.method283(); // L: 259 + return; // L: 260 + } + } + + if (World.World_request != null) { // L: 263 + class18.method283(); + } + } + + var3 = MouseHandler.MouseHandler_lastButton; // L: 265 + int var22 = MouseHandler.MouseHandler_lastPressedX; // L: 266 + int var23 = MouseHandler.MouseHandler_lastPressedY; // L: 267 + if (var3 == 0) { // L: 268 + var22 = MouseHandler.MouseHandler_x; // L: 269 + var23 = MouseHandler.MouseHandler_y; // L: 270 + } + + if (!MouseHandler.mouseCam && var3 == 4) { // L: 272 + var3 = 1; + } + + short var26; + int var27; + if (Login.loginIndex == 0) { // L: 273 + boolean var30 = false; // L: 274 + + while (class231.isKeyDown()) { // L: 275 + if (class19.field146 == 84) { // L: 276 + var30 = true; // L: 277 + } + } + + var27 = GraphicsObject.loginBoxCenter - 80; // L: 280 + var26 = 291; // L: 281 + if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 282 + class302.openURL(FontName.method6285("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 283 + } + + var27 = GraphicsObject.loginBoxCenter + 80; // L: 285 + if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20 || var30) { // L: 286 + if ((Client.worldProperties & 33554432) != 0) { // L: 287 + Login.Login_response0 = ""; // L: 288 + Login.Login_response1 = "This is a Beta world."; // L: 289 + Login.Login_response2 = "Your normal account will not be affected."; // L: 290 + Login.Login_response3 = ""; // L: 291 + Login.loginIndex = 1; // L: 292 + Canvas.method481(); // L: 293 + } else if ((Client.worldProperties & 4) != 0) { // L: 295 + if ((Client.worldProperties & 1024) != 0) { // L: 296 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 297 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 298 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 299 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 302 + Login.Login_response2 = "Players can attack each other"; // L: 303 + Login.Login_response3 = "almost everywhere."; // L: 304 + } + + Login.Login_response0 = "Warning!"; // L: 306 + Login.loginIndex = 1; // L: 307 + Canvas.method481(); // L: 308 + } else if ((Client.worldProperties & 1024) != 0) { // L: 310 + Login.Login_response1 = "This is a High Risk world."; // L: 311 + Login.Login_response2 = "The Protect Item prayer will"; // L: 312 + Login.Login_response3 = "not work on this world."; // L: 313 + Login.Login_response0 = "Warning!"; // L: 314 + Login.loginIndex = 1; // L: 315 + Canvas.method481(); // L: 316 + } else { + class25.Login_promptCredentials(false); // L: 319 + } + } + } else { + short var7; + int var24; + if (Login.loginIndex == 1) { // L: 323 + while (true) { + if (!class231.isKeyDown()) { // L: 324 + var24 = GraphicsObject.loginBoxCenter - 80; // L: 332 + var7 = 321; // L: 333 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 334 + class25.Login_promptCredentials(false); // L: 335 + } + + var24 = GraphicsObject.loginBoxCenter + 80; // L: 337 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 338 + Login.loginIndex = 0; // L: 339 + } + break; + } + + if (class19.field146 == 84) { // L: 325 + class25.Login_promptCredentials(false); // L: 326 + } else if (class19.field146 == 13) { // L: 328 + Login.loginIndex = 0; // L: 329 + } + } + } else { + int var10; + short var25; + if (Login.loginIndex == 2) { // L: 342 + var25 = 201; // L: 343 + var24 = var25 + 52; // L: 344 + if (var3 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { // L: 345 + Login.currentLoginField = 0; + } + + var24 += 15; // L: 346 + if (var3 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { // L: 347 + Login.currentLoginField = 1; + } + + var24 += 15; // L: 348 + var25 = 361; // L: 349 + if (ChatChannel.field1084 != null) { // L: 350 + var27 = ChatChannel.field1084.highX / 2; // L: 351 + if (var3 == 1 && var22 >= ChatChannel.field1084.lowX - var27 && var22 <= var27 + ChatChannel.field1084.lowX && var23 >= var25 - 15 && var23 < var25) { // L: 352 + switch(Login.field994) { // L: 353 + case 1: + class9.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 356 + Login.loginIndex = 5; // L: 357 + return; // L: 358 + case 2: + class302.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 362 + } + } + } + + var27 = GraphicsObject.loginBoxCenter - 80; // L: 368 + var26 = 321; // L: 369 + if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 370 + Login.Login_username = Login.Login_username.trim(); // L: 371 + if (Login.Login_username.length() == 0) { // L: 372 + class9.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 373 + return; // L: 374 + } + + if (Login.Login_password.length() == 0) { // L: 376 + class9.setLoginResponseString("", "Please enter your password.", ""); // L: 377 + return; // L: 378 + } + + class9.setLoginResponseString("", "Connecting to server...", ""); // L: 380 + TriBool.method5818(false); // L: 381 + class20.updateGameState(20); // L: 382 + return; // L: 383 + } + + var27 = Login.loginBoxX + 180 + 80; // L: 385 + if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 386 + Login.loginIndex = 0; // L: 387 + Login.Login_username = ""; // L: 388 + Login.Login_password = ""; // L: 389 + class139.field1560 = 0; // L: 390 + Bounds.otp = ""; // L: 391 + Login.field1005 = true; // L: 392 + } + + var27 = GraphicsObject.loginBoxCenter + -117; // L: 394 + var26 = 277; // L: 395 + Login.field1003 = var22 >= var27 && var22 < var27 + class225.field2777 && var23 >= var26 && var23 < var26 + class34.field232; // L: 396 + if (var3 == 1 && Login.field1003) { // L: 397 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 398 + if (!Client.Login_isUsernameRemembered && Login.clientPreferences.rememberedUsername != null) { // L: 399 + Login.clientPreferences.rememberedUsername = null; // L: 400 + Message.savePreferences(); // L: 401 + } + } + + var27 = GraphicsObject.loginBoxCenter + 24; // L: 404 + var26 = 277; // L: 405 + Login.field1012 = var22 >= var27 && var22 < var27 + class225.field2777 && var23 >= var26 && var23 < var26 + class34.field232; // L: 406 + if (var3 == 1 && Login.field1012) { // L: 407 + Login.clientPreferences.hideUsername = !Login.clientPreferences.hideUsername; // L: 408 + if (!Login.clientPreferences.hideUsername) { // L: 409 + Login.Login_username = ""; // L: 410 + Login.clientPreferences.rememberedUsername = null; // L: 411 + Canvas.method481(); // L: 412 + } + + Message.savePreferences(); // L: 414 + } + + while (true) { + int var11; + Transferable var18; + do { + while (true) { + label882: + do { + while (true) { + while (class231.isKeyDown()) { // L: 416 + if (class19.field146 != 13) { // L: 417 + if (Login.currentLoginField != 0) { // L: 426 + continue label882; + } + + char var29 = Message.field591; // L: 427 + + for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var29 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10); ++var10) { // L: 429 430 + } + + if (class19.field146 == 85 && Login.Login_username.length() > 0) { // L: 433 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class19.field146 == 84 || class19.field146 == 80) { // L: 434 + Login.currentLoginField = 1; + } + + if (class4.method76(Message.field591) && Login.Login_username.length() < 320) { // L: 435 + Login.Login_username = Login.Login_username + Message.field591; + } + } else { + Login.loginIndex = 0; // L: 418 + Login.Login_username = ""; // L: 419 + Login.Login_password = ""; // L: 420 + class139.field1560 = 0; // L: 421 + Bounds.otp = ""; // L: 422 + Login.field1005 = true; // L: 423 + } + } + + return; // L: 676 + } + } while(Login.currentLoginField != 1); // L: 437 + + if (class19.field146 == 85 && Login.Login_password.length() > 0) { // L: 438 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 439 + } else if (class19.field146 == 84 || class19.field146 == 80) { // L: 441 + Login.currentLoginField = 0; // L: 442 + if (class19.field146 == 84) { // L: 443 + Login.Login_username = Login.Login_username.trim(); // L: 444 + if (Login.Login_username.length() == 0) { // L: 445 + class9.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 446 + return; // L: 447 + } + + if (Login.Login_password.length() == 0) { // L: 449 + class9.setLoginResponseString("", "Please enter your password.", ""); // L: 450 + return; // L: 451 + } + + class9.setLoginResponseString("", "Connecting to server...", ""); // L: 453 + TriBool.method5818(false); // L: 454 + class20.updateGameState(20); // L: 455 + return; // L: 456 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class19.field146 == 67) { // L: 459 + Clipboard var17 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 460 + var18 = var17.getContents(class10.client); // L: 461 + var11 = 20 - Login.Login_password.length(); // L: 462 + break; + } + + if (Players.method2287(Message.field591) && class4.method76(Message.field591) && Login.Login_password.length() < 20) { // L: 479 + Login.Login_password = Login.Login_password + Message.field591; // L: 480 + } + } + } while(var11 <= 0); // L: 463 + + try { + String var12 = (String)var18.getTransferData(DataFlavor.stringFlavor); // L: 465 + int var13 = Math.min(var11, var12.length()); // L: 466 + + for (int var14 = 0; var14 < var13; ++var14) { // L: 467 + if (!Players.method2287(var12.charAt(var14)) || !class4.method76(var12.charAt(var14))) { // L: 468 + Login.loginIndex = 3; // L: 469 + return; // L: 470 + } + } + + Login.Login_password = Login.Login_password + var12.substring(0, var13); // L: 473 + } catch (UnsupportedFlavorException var20) { // L: 475 + } catch (IOException var21) { // L: 476 + } + } + } else if (Login.loginIndex == 3) { // L: 486 + var24 = Login.loginBoxX + 180; // L: 487 + var7 = 276; // L: 488 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 489 + class25.Login_promptCredentials(false); // L: 490 + } + + var24 = Login.loginBoxX + 180; // L: 492 + var7 = 326; // L: 493 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 494 + class9.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 495 + Login.loginIndex = 5; // L: 496 + return; // L: 497 + } + } else { + int var9; + if (Login.loginIndex == 4) { // L: 500 + var24 = Login.loginBoxX + 180 - 80; // L: 501 + var7 = 321; // L: 502 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 503 + Bounds.otp.trim(); // L: 504 + if (Bounds.otp.length() != 6) { // L: 505 + class9.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 506 + return; // L: 507 + } + + class139.field1560 = Integer.parseInt(Bounds.otp); // L: 509 + Bounds.otp = ""; // L: 510 + TriBool.method5818(true); // L: 511 + class9.setLoginResponseString("", "Connecting to server...", ""); // L: 512 + class20.updateGameState(20); // L: 513 + return; // L: 514 + } + + if (var3 == 1 && var22 >= Login.loginBoxX + 180 - 9 && var22 <= Login.loginBoxX + 180 + 130 && var23 >= 263 && var23 <= 296) { // L: 516 + Login.field1005 = !Login.field1005; // L: 517 + } + + if (var3 == 1 && var22 >= Login.loginBoxX + 180 - 34 && var22 <= Login.loginBoxX + 34 + 180 && var23 >= 351 && var23 <= 363) { // L: 519 + class302.openURL(FontName.method6285("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 520 + } + + var24 = Login.loginBoxX + 180 + 80; // L: 522 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 523 + Login.loginIndex = 0; // L: 524 + Login.Login_username = ""; // L: 525 + Login.Login_password = ""; // L: 526 + class139.field1560 = 0; // L: 527 + Bounds.otp = ""; // L: 528 + } + + while (class231.isKeyDown()) { // L: 530 + boolean var8 = false; // L: 531 + + for (var9 = 0; var9 < "1234567890".length(); ++var9) { // L: 532 + if (Message.field591 == "1234567890".charAt(var9)) { // L: 533 + var8 = true; // L: 534 + break; // L: 535 + } + } + + if (class19.field146 == 13) { // L: 538 + Login.loginIndex = 0; // L: 539 + Login.Login_username = ""; // L: 540 + Login.Login_password = ""; // L: 541 + class139.field1560 = 0; // L: 542 + Bounds.otp = ""; // L: 543 + } else { + if (class19.field146 == 85 && Bounds.otp.length() > 0) { // L: 546 + Bounds.otp = Bounds.otp.substring(0, Bounds.otp.length() - 1); + } + + if (class19.field146 == 84) { // L: 547 + Bounds.otp.trim(); // L: 548 + if (Bounds.otp.length() != 6) { // L: 549 + class9.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 550 + return; // L: 551 + } + + class139.field1560 = Integer.parseInt(Bounds.otp); // L: 553 + Bounds.otp = ""; // L: 554 + TriBool.method5818(true); // L: 555 + class9.setLoginResponseString("", "Connecting to server...", ""); // L: 556 + class20.updateGameState(20); // L: 557 + return; // L: 558 + } + + if (var8 && Bounds.otp.length() < 6) { // L: 560 + Bounds.otp = Bounds.otp + Message.field591; + } + } + } + } else if (Login.loginIndex == 5) { // L: 564 + var24 = Login.loginBoxX + 180 - 80; // L: 565 + var7 = 321; // L: 566 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 567 + class18.method282(); // L: 568 + return; // L: 569 + } + + var24 = Login.loginBoxX + 180 + 80; // L: 571 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 572 + class25.Login_promptCredentials(true); // L: 573 + } + + var26 = 361; // L: 575 + if (ModeWhere.field3378 != null) { // L: 576 + var9 = ModeWhere.field3378.highX / 2; // L: 577 + if (var3 == 1 && var22 >= ModeWhere.field3378.lowX - var9 && var22 <= var9 + ModeWhere.field3378.lowX && var23 >= var26 - 15 && var23 < var26) { // L: 578 + class302.openURL(FontName.method6285("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 579 + } + } + + while (class231.isKeyDown()) { // L: 582 + boolean var28 = false; // L: 583 + + for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { // L: 584 + if (Message.field591 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { // L: 585 + var28 = true; // L: 586 + break; // L: 587 + } + } + + if (class19.field146 == 13) { // L: 590 + class25.Login_promptCredentials(true); // L: 591 + } else { + if (class19.field146 == 85 && Login.Login_username.length() > 0) { // L: 594 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class19.field146 == 84) { // L: 595 + class18.method282(); // L: 596 + return; // L: 597 + } + + if (var28 && Login.Login_username.length() < 320) { // L: 599 + Login.Login_username = Login.Login_username + Message.field591; + } + } + } + } else if (Login.loginIndex != 6) { // L: 603 + if (Login.loginIndex == 7) { // L: 614 + var24 = Login.loginBoxX + 180 - 80; // L: 615 + var7 = 321; // L: 616 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 617 + class302.openURL(FontName.method6285("secure", true) + "m=dob/set_dob.ws", true, false); // L: 618 + class9.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 619 + Login.loginIndex = 6; // L: 620 + return; // L: 621 + } + + var24 = Login.loginBoxX + 180 + 80; // L: 623 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 624 + class25.Login_promptCredentials(true); // L: 625 + } + } else if (Login.loginIndex == 8) { // L: 628 + var24 = Login.loginBoxX + 180 - 80; // L: 629 + var7 = 321; // L: 630 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 631 + class302.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 632 + class9.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 633 + Login.loginIndex = 6; // L: 634 + return; // L: 635 + } + + var24 = Login.loginBoxX + 180 + 80; // L: 637 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 638 + class25.Login_promptCredentials(true); // L: 639 + } + } else if (Login.loginIndex == 12) { // L: 642 + String var19 = ""; // L: 643 + switch(Login.field993) { // L: 644 + case 0: + var19 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 649 + break; // L: 650 + case 1: + var19 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 646 + break; // L: 647 + default: + class25.Login_promptCredentials(false); // L: 652 + } + + var27 = Login.loginBoxX + 180; // L: 655 + var26 = 276; // L: 656 + if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 657 + class302.openURL(var19, true, false); // L: 658 + class9.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 659 + Login.loginIndex = 6; // L: 660 + return; // L: 661 + } + + var27 = Login.loginBoxX + 180; // L: 663 + var26 = 326; // L: 664 + if (var3 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { // L: 665 + class25.Login_promptCredentials(false); // L: 666 + } + } else if (Login.loginIndex == 24) { // L: 669 + var24 = Login.loginBoxX + 180; // L: 670 + var7 = 301; // L: 671 + if (var3 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var7 - 20 && var23 <= var7 + 20) { // L: 672 + class25.Login_promptCredentials(false); // L: 673 + } + } + } else { + while (true) { + do { + if (!class231.isKeyDown()) { // L: 604 + var25 = 321; // L: 609 + if (var3 == 1 && var23 >= var25 - 20 && var23 <= var25 + 20) { // L: 610 + class25.Login_promptCredentials(true); // L: 611 + } + + return; + } + } while(class19.field146 != 84 && class19.field146 != 13); // L: 605 + + class25.Login_promptCredentials(true); // L: 606 + } + } + } + } + } + + } } - } else if (var1 == -1 || var0.sequence == -1 || InterfaceParent.SequenceDefinition_get(var1).field3560 >= InterfaceParent.SequenceDefinition_get(var0.sequence).field3560) { // L: 3796 - var0.sequence = var1; // L: 3797 - var0.sequenceFrame = 0; // L: 3798 - var0.sequenceFrameCycle = 0; // L: 3799 - var0.sequenceDelay = var2; // L: 3800 - var0.field973 = 0; // L: 3801 - var0.field1012 = var0.pathLength; // L: 3802 } + } // L: 219 - } // L: 3804 + @ObfuscatedName("gu") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1516268196" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 4638 + int var4 = var1 >> 7; // L: 4639 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 4640 + int var5 = var2; // L: 4641 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 4642 + var5 = var2 + 1; + } + + int var6 = var0 & 127; // L: 4643 + int var7 = var1 & 127; // L: 4644 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 4645 + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 4646 + return var9 * var7 + var8 * (128 - var7) >> 7; // L: 4647 + } else { + return 0; + } + } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 9f9e62414c..ac09d60334 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,38 +1,149 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("dr") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("n") + @ObfuscatedName("sc") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1639190955 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; // L: 11 - } // L: 12 + this.reversed = var1; + } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;I)I", - garbageValue = "-1412914674" + descriptor = "(Llg;Llg;I)I", + garbageValue = "1545225379" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { // L: 15 + if (Client.worldId == var1.world) { if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; // L: 16 + return this.reversed ? -1 : 1; } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; // L: 19 + return this.reversed ? 1 : -1; } - return this.compareUser(var1, var2); // L: 21 + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 + return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([Ljk;II)Ljk;", + garbageValue = "476276664" + ) + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; + + for (int var3 = 0; var3 < var2.length; ++var3) { + Enumerated var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; + } + } + + return null; + } + + @ObfuscatedName("f") + public static final int method2427(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (var2 != 0.0D) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = var4 * (1.0D + var2); + } else { + var12 = var4 + var2 - var2 * var4; // L: 15 + } + + double var14 = var4 * 2.0D - var12; // L: 16 + double var16 = var0 + 0.3333333333333333D; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; + } + + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; + } + + if (6.0D * var16 < 1.0D) { // L: 22 + var6 = var14 + 6.0D * (var12 - var14) * var16; + } else if (var16 * 2.0D < 1.0D) { // L: 23 + var6 = var12; + } else if (3.0D * var16 < 2.0D) { // L: 24 + var6 = var14 + (0.6666666666666666D - var16) * (var12 - var14) * 6.0D; + } else { + var6 = var14; // L: 25 + } + + if (6.0D * var0 < 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 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14; // L: 28 + } else { + var8 = var14; // L: 29 + } + + if (var20 * 6.0D < 1.0D) { // L: 30 + var10 = var14 + (var12 - var14) * 6.0D * var20; + } else if (2.0D * var20 < 1.0D) { // L: 31 + var10 = var12; + } else if (var20 * 3.0D < 2.0D) { // L: 32 + var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14); + } else { + var10 = var14; // L: 33 + } + } + + int var22 = (int)(var6 * 256.0D); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(var10 * 256.0D); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "32" + ) + @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 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 6ceac8ccd5..623fb90b3a 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,24 +1,18 @@ import 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("fs") +@ObfuscatedName("dp") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lei;" + @ObfuscatedName("rx") + @ObfuscatedGetter( + intValue = -1797290331 ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "Lbk;" - ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("n") + static int field1435; + @ObfuscatedName("f") @Export("reversed") final boolean reversed; @@ -26,10 +20,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; // L: 11 } // L: 12 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lky;Lky;B)I", - garbageValue = "53" + descriptor = "(Llg;Llg;B)I", + garbageValue = "6" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -44,13 +38,782 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("n") + @ObfuscatedName("hx") @ObfuscatedSignature( - descriptor = "(Lig;Lig;I)V", - garbageValue = "-1134565802" + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-1402191695" ) - public static void method3562(AbstractArchive var0, AbstractArchive var1) { - HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 30 - HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; // L: 31 - } // L: 32 + @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: 7979 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 7980 + Client.mouseCrossX = var6; // L: 8755 + Client.mouseCrossY = var7; // L: 8756 + Client.mouseCrossColor = 2; // L: 8757 + Client.mouseCrossState = 0; // L: 8758 + Client.destinationX = var0; // L: 8759 + Client.destinationY = var1; // L: 8760 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); // L: 8762 + var8.packetBuffer.method6771(Client.selectedItemId); // L: 8763 + var8.packetBuffer.writeInt(UserComparator6.selectedItemWidget); // L: 8764 + var8.packetBuffer.writeShort(var3); // L: 8765 + var8.packetBuffer.writeIntME(class208.selectedItemSlot); // L: 8766 + var8.packetBuffer.writeShort(Tile.baseY + var1); // L: 8767 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8768 + var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8769 + Client.packetWriter.addNode(var8); // L: 8770 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 8408 + Client.mouseCrossY = var7; // L: 8409 + Client.mouseCrossColor = 2; // L: 8410 + Client.mouseCrossState = 0; // L: 8411 + Client.destinationX = var0; // L: 8412 + Client.destinationY = var1; // L: 8413 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); // L: 8415 + var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); // L: 8416 + var8.packetBuffer.method6614(var0 + ItemLayer.baseX); // L: 8417 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8418 + var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8419 + var8.packetBuffer.method6614(var3); // L: 8420 + var8.packetBuffer.method6625(class148.selectedSpellWidget); // L: 8421 + Client.packetWriter.addNode(var8); // L: 8422 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 8232 + Client.mouseCrossY = var7; // L: 8233 + Client.mouseCrossColor = 2; // L: 8234 + Client.mouseCrossState = 0; // L: 8235 + Client.destinationX = var0; // L: 8236 + Client.destinationY = var1; // L: 8237 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); // L: 8239 + var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8240 + var8.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8241 + var8.packetBuffer.method6771(var3); // L: 8242 + var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8243 + Client.packetWriter.addNode(var8); // L: 8244 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 8512 + Client.mouseCrossY = var7; // L: 8513 + Client.mouseCrossColor = 2; // L: 8514 + Client.mouseCrossState = 0; // L: 8515 + Client.destinationX = var0; // L: 8516 + Client.destinationY = var1; // L: 8517 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); // L: 8519 + var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8520 + var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8521 + var8.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8522 + var8.packetBuffer.method6614(var3); // L: 8523 + Client.packetWriter.addNode(var8); // L: 8524 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 8700 + Client.mouseCrossY = var7; // L: 8701 + Client.mouseCrossColor = 2; // L: 8702 + Client.mouseCrossState = 0; // L: 8703 + Client.destinationX = var0; // L: 8704 + Client.destinationY = var1; // L: 8705 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); // L: 8707 + var8.packetBuffer.method6771(var0 + ItemLayer.baseX); // L: 8708 + var8.packetBuffer.method6771(var3); // L: 8709 + var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8710 + var8.packetBuffer.method6771(Tile.baseY + var1); // L: 8711 + Client.packetWriter.addNode(var8); // L: 8712 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8630 + Client.mouseCrossY = var7; // L: 8631 + Client.mouseCrossColor = 2; // L: 8632 + Client.mouseCrossState = 0; // L: 8633 + Client.destinationX = var0; // L: 8634 + Client.destinationY = var1; // L: 8635 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); // L: 8637 + var8.packetBuffer.writeShort(var3); // L: 8638 + var8.packetBuffer.method6771(Tile.baseY + var1); // L: 8639 + var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8640 + var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8641 + Client.packetWriter.addNode(var8); // L: 8642 + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 8194 + if (var13 != null) { // L: 8195 + Client.mouseCrossX = var6; // L: 8196 + Client.mouseCrossY = var7; // L: 8197 + Client.mouseCrossColor = 2; // L: 8198 + Client.mouseCrossState = 0; // L: 8199 + Client.destinationX = var0; // L: 8200 + Client.destinationY = var1; // L: 8201 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); // L: 8203 + var9.packetBuffer.writeInt(UserComparator6.selectedItemWidget); // L: 8204 + var9.packetBuffer.method6614(Client.selectedItemId); // L: 8205 + var9.packetBuffer.method6614(class208.selectedItemSlot); // L: 8206 + var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8207 + var9.packetBuffer.writeIntME(var3); // L: 8208 + Client.packetWriter.addNode(var9); // L: 8209 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 8145 + if (var13 != null) { // L: 8146 + Client.mouseCrossX = var6; // L: 8147 + Client.mouseCrossY = var7; // L: 8148 + Client.mouseCrossColor = 2; // L: 8149 + Client.mouseCrossState = 0; // L: 8150 + Client.destinationX = var0; // L: 8151 + Client.destinationY = var1; // L: 8152 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); // L: 8154 + var9.packetBuffer.writeInt(class148.selectedSpellWidget); // L: 8155 + var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8156 + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8157 + var9.packetBuffer.method6771(var3); // L: 8158 + Client.packetWriter.addNode(var9); // L: 8159 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 8566 + if (var13 != null) { // L: 8567 + Client.mouseCrossX = var6; // L: 8568 + Client.mouseCrossY = var7; // L: 8569 + Client.mouseCrossColor = 2; // L: 8570 + Client.mouseCrossState = 0; // L: 8571 + Client.destinationX = var0; // L: 8572 + Client.destinationY = var1; // L: 8573 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); // L: 8575 + var9.packetBuffer.method6614(var3); // L: 8576 + var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8577 + Client.packetWriter.addNode(var9); // L: 8578 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 8614 + if (var13 != null) { // L: 8615 + Client.mouseCrossX = var6; // L: 8616 + Client.mouseCrossY = var7; // L: 8617 + Client.mouseCrossColor = 2; // L: 8618 + Client.mouseCrossState = 0; // L: 8619 + Client.destinationX = var0; // L: 8620 + Client.destinationY = var1; // L: 8621 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); // L: 8623 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8624 + var9.packetBuffer.method6771(var3); // L: 8625 + Client.packetWriter.addNode(var9); // L: 8626 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 8216 + if (var13 != null) { // L: 8217 + Client.mouseCrossX = var6; // L: 8218 + Client.mouseCrossY = var7; // L: 8219 + Client.mouseCrossColor = 2; // L: 8220 + Client.mouseCrossState = 0; // L: 8221 + Client.destinationX = var0; // L: 8222 + Client.destinationY = var1; // L: 8223 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); // L: 8225 + var9.packetBuffer.method6614(var3); // L: 8226 + var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8227 + Client.packetWriter.addNode(var9); // L: 8228 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 8302 + if (var13 != null) { // L: 8303 + Client.mouseCrossX = var6; // L: 8304 + Client.mouseCrossY = var7; // L: 8305 + Client.mouseCrossColor = 2; // L: 8306 + Client.mouseCrossState = 0; // L: 8307 + Client.destinationX = var0; // L: 8308 + Client.destinationY = var1; // L: 8309 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); // L: 8311 + var9.packetBuffer.method6771(var3); // L: 8312 + var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8313 + Client.packetWriter.addNode(var9); // L: 8314 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 8113 + if (var13 != null) { // L: 8114 + Client.mouseCrossX = var6; // L: 8115 + Client.mouseCrossY = var7; // L: 8116 + Client.mouseCrossColor = 2; // L: 8117 + Client.mouseCrossState = 0; // L: 8118 + Client.destinationX = var0; // L: 8119 + Client.destinationY = var1; // L: 8120 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2309, Client.packetWriter.isaacCipher); // L: 8122 + var9.packetBuffer.method6614(var3); // L: 8123 + var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8124 + Client.packetWriter.addNode(var9); // L: 8125 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 8681 + if (var15 != null) { // L: 8682 + Client.mouseCrossX = var6; // L: 8683 + Client.mouseCrossY = var7; // L: 8684 + Client.mouseCrossColor = 2; // L: 8685 + Client.mouseCrossState = 0; // L: 8686 + Client.destinationX = var0; // L: 8687 + Client.destinationY = var1; // L: 8688 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); // L: 8690 + var9.packetBuffer.method6624(UserComparator6.selectedItemWidget); // L: 8691 + var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8692 + var9.packetBuffer.writeShort(Client.selectedItemId); // L: 8693 + var9.packetBuffer.writeIntME(class208.selectedItemSlot); // L: 8694 + var9.packetBuffer.method6614(var3); // L: 8695 + Client.packetWriter.addNode(var9); // L: 8696 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 8390 + if (var15 != null) { // L: 8391 + Client.mouseCrossX = var6; // L: 8392 + Client.mouseCrossY = var7; // L: 8393 + Client.mouseCrossColor = 2; // L: 8394 + Client.mouseCrossState = 0; // L: 8395 + Client.destinationX = var0; // L: 8396 + Client.destinationY = var1; // L: 8397 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); // L: 8399 + var9.packetBuffer.method6624(class148.selectedSpellWidget); // L: 8400 + var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8401 + var9.packetBuffer.writeIntME(var3); // L: 8402 + var9.packetBuffer.method6771(Client.selectedSpellChildIndex); // L: 8403 + Client.packetWriter.addNode(var9); // L: 8404 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 8483 + Client.mouseCrossY = var7; // L: 8484 + Client.mouseCrossColor = 2; // L: 8485 + Client.mouseCrossState = 0; // L: 8486 + Client.destinationX = var0; // L: 8487 + Client.destinationY = var1; // L: 8488 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); // L: 8490 + var8.packetBuffer.method6614(class208.selectedItemSlot); // L: 8491 + var8.packetBuffer.method6625(UserComparator6.selectedItemWidget); // L: 8492 + var8.packetBuffer.method6771(var0 + ItemLayer.baseX); // L: 8493 + var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8494 + var8.packetBuffer.method6614(Client.selectedItemId); // L: 8495 + var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8496 + var8.packetBuffer.writeShort(var3); // L: 8497 + Client.packetWriter.addNode(var8); // L: 8498 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 8549 + Client.mouseCrossY = var7; // L: 8550 + Client.mouseCrossColor = 2; // L: 8551 + Client.mouseCrossState = 0; // L: 8552 + Client.destinationX = var0; // L: 8553 + Client.destinationY = var1; // L: 8554 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2321, Client.packetWriter.isaacCipher); // L: 8556 + var8.packetBuffer.writeInt(class148.selectedSpellWidget); // L: 8557 + var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8558 + var8.packetBuffer.method6771(var3); // L: 8559 + var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8560 + var8.packetBuffer.method6614(Client.selectedSpellChildIndex); // L: 8561 + var8.packetBuffer.writeShort(var0 + ItemLayer.baseX); // L: 8562 + Client.packetWriter.addNode(var8); // L: 8563 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 8452 + Client.mouseCrossY = var7; // L: 8453 + Client.mouseCrossColor = 2; // L: 8454 + Client.mouseCrossState = 0; // L: 8455 + Client.destinationX = var0; // L: 8456 + Client.destinationY = var1; // L: 8457 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); // L: 8459 + var8.packetBuffer.method6614(var0 + ItemLayer.baseX); // L: 8460 + var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8461 + var8.packetBuffer.method6614(Tile.baseY + var1); // L: 8462 + var8.packetBuffer.writeShort(var3); // L: 8463 + Client.packetWriter.addNode(var8); // L: 8464 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 8084 + Client.mouseCrossY = var7; // L: 8085 + Client.mouseCrossColor = 2; // L: 8086 + Client.mouseCrossState = 0; // L: 8087 + Client.destinationX = var0; // L: 8088 + Client.destinationY = var1; // L: 8089 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); // L: 8091 + var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8092 + var8.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8093 + var8.packetBuffer.method6614(var3); // L: 8094 + var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8095 + Client.packetWriter.addNode(var8); // L: 8096 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 8364 + Client.mouseCrossY = var7; // L: 8365 + Client.mouseCrossColor = 2; // L: 8366 + Client.mouseCrossState = 0; // L: 8367 + Client.destinationX = var0; // L: 8368 + Client.destinationY = var1; // L: 8369 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); // L: 8371 + var8.packetBuffer.method6771(var0 + ItemLayer.baseX); // L: 8372 + var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8373 + var8.packetBuffer.method6771(Tile.baseY + var1); // L: 8374 + var8.packetBuffer.writeIntME(var3); // L: 8375 + Client.packetWriter.addNode(var8); // L: 8376 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 8262 + Client.mouseCrossY = var7; // L: 8263 + Client.mouseCrossColor = 2; // L: 8264 + Client.mouseCrossState = 0; // L: 8265 + Client.destinationX = var0; // L: 8266 + Client.destinationY = var1; // L: 8267 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); // L: 8269 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8270 + var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8271 + var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8272 + var8.packetBuffer.writeShort(var3); // L: 8273 + Client.packetWriter.addNode(var8); // L: 8274 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 8247 + Client.mouseCrossY = var7; // L: 8248 + Client.mouseCrossColor = 2; // L: 8249 + Client.mouseCrossState = 0; // L: 8250 + Client.destinationX = var0; // L: 8251 + Client.destinationY = var1; // L: 8252 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); // L: 8254 + var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8255 + var8.packetBuffer.writeIntME(var0 + ItemLayer.baseX); // L: 8256 + var8.packetBuffer.writeShort(Tile.baseY + var1); // L: 8257 + var8.packetBuffer.writeIntME(var3); // L: 8258 + Client.packetWriter.addNode(var8); // L: 8259 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 8715 + WorldMapArea.scene.setViewportWalking(); // L: 8716 + } else { + WorldMapArea.scene.menuOpen(class26.Client_plane, var0, var1, true); // L: 8719 + } + } else { + PacketBufferNode var11; + Widget var16; + if (var2 == 24) { + var16 = class139.getWidget(var1); // L: 8501 + boolean var12 = true; // L: 8502 + if (var16.contentType > 0) { // L: 8503 + var12 = ClanChat.method5644(var16); + } + + if (var12) { // L: 8504 + var11 = ObjectComposition.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 8506 + var11.packetBuffer.writeInt(var1); // L: 8507 + Client.packetWriter.addNode(var11); // L: 8508 + } + } else { + if (var2 == 25) { + var16 = class231.getWidgetChild(var1, var0); // L: 7981 + if (var16 != null) { // L: 7982 + WorldMapID.Widget_runOnTargetLeave(); // L: 7983 + Strings.selectSpell(var1, var0, class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var16)), var16.itemId); // L: 7984 + Client.isItemSelected = 0; // L: 7985 + Client.selectedSpellActionName = class11.Widget_getSpellActionName(var16); // L: 7986 + if (Client.selectedSpellActionName == null) { // L: 7987 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 7988 + Client.selectedSpellName = var16.dataText + DefaultsGroup.colorStartTag(16777215); + } else { + Client.selectedSpellName = DefaultsGroup.colorStartTag(65280) + var16.spellName + DefaultsGroup.colorStartTag(16777215); // L: 7989 + } + } + + return; // L: 7991 + } + + if (var2 == 26) { + Archive.method4470(); // L: 8191 + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 8034 + var8.packetBuffer.writeInt(var1); // L: 8035 + Client.packetWriter.addNode(var8); // L: 8036 + var14 = class139.getWidget(var1); // L: 8037 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8038 + var10 = var14.cs1Instructions[0][1]; // L: 8039 + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8040 + class27.changeGameOptions(var10); // L: 8041 + } + } else if (var2 == 29) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); // L: 8100 + var8.packetBuffer.writeInt(var1); // L: 8101 + Client.packetWriter.addNode(var8); // L: 8102 + var14 = class139.getWidget(var1); // L: 8103 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8104 + var10 = var14.cs1Instructions[0][1]; // L: 8105 + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8106 + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8107 + class27.changeGameOptions(var10); // L: 8108 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 8045 + class43.resumePauseWidget(var1, var0); // L: 8046 + Client.meslayerContinueWidget = class231.getWidgetChild(var1, var0); // L: 8047 + class29.invalidateWidget(Client.meslayerContinueWidget); // L: 8048 + } + } else if (var2 == 31) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 8289 + var8.packetBuffer.method6771(var3); // L: 8290 + var8.packetBuffer.method6754(var1); // L: 8291 + var8.packetBuffer.writeIntME(Client.selectedItemId); // L: 8292 + var8.packetBuffer.writeShort(var0); // L: 8293 + var8.packetBuffer.writeShort(class208.selectedItemSlot); // L: 8294 + var8.packetBuffer.method6754(UserComparator6.selectedItemWidget); // L: 8295 + Client.packetWriter.addNode(var8); // L: 8296 + Client.field708 = 0; // L: 8297 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8298 + Client.field709 = var0; // L: 8299 + } else if (var2 == 32) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); // L: 8164 + var8.packetBuffer.writeIntME(var0); // L: 8165 + var8.packetBuffer.writeShort(var3); // L: 8166 + var8.packetBuffer.method6624(class148.selectedSpellWidget); // L: 8167 + var8.packetBuffer.writeInt(var1); // L: 8168 + var8.packetBuffer.method6614(Client.selectedSpellChildIndex); // L: 8169 + Client.packetWriter.addNode(var8); // L: 8170 + Client.field708 = 0; // L: 8171 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8172 + Client.field709 = var0; // L: 8173 + } else if (var2 == 33) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); // L: 8671 + var8.packetBuffer.method6625(var1); // L: 8672 + var8.packetBuffer.method6771(var3); // L: 8673 + var8.packetBuffer.method6771(var0); // L: 8674 + Client.packetWriter.addNode(var8); // L: 8675 + Client.field708 = 0; // L: 8676 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8677 + Client.field709 = var0; // L: 8678 + } else if (var2 == 34) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); // L: 8278 + var8.packetBuffer.writeIntME(var3); // L: 8279 + var8.packetBuffer.writeIntME(var0); // L: 8280 + var8.packetBuffer.method6754(var1); // L: 8281 + Client.packetWriter.addNode(var8); // L: 8282 + Client.field708 = 0; // L: 8283 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8284 + Client.field709 = var0; // L: 8285 + } else if (var2 == 35) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); // L: 8011 + var8.packetBuffer.writeInt(var1); // L: 8012 + var8.packetBuffer.writeIntME(var3); // L: 8013 + var8.packetBuffer.writeShort(var0); // L: 8014 + Client.packetWriter.addNode(var8); // L: 8015 + Client.field708 = 0; // L: 8016 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8017 + Client.field709 = var0; // L: 8018 + } else if (var2 == 36) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); // L: 8442 + var8.packetBuffer.writeShort(var0); // L: 8443 + var8.packetBuffer.method6771(var3); // L: 8444 + var8.packetBuffer.method6624(var1); // L: 8445 + Client.packetWriter.addNode(var8); // L: 8446 + Client.field708 = 0; // L: 8447 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8448 + Client.field709 = var0; // L: 8449 + } else if (var2 == 37) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); // L: 8053 + var8.packetBuffer.method6624(var1); // L: 8054 + var8.packetBuffer.writeIntME(var3); // L: 8055 + var8.packetBuffer.method6614(var0); // L: 8056 + Client.packetWriter.addNode(var8); // L: 8057 + Client.field708 = 0; // L: 8058 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8059 + Client.field709 = var0; // L: 8060 + } else { + if (var2 == 38) { + WorldMapID.Widget_runOnTargetLeave(); // L: 8021 + var16 = class139.getWidget(var1); // L: 8022 + Client.isItemSelected = 1; // L: 8023 + class208.selectedItemSlot = var0; // L: 8024 + UserComparator6.selectedItemWidget = var1; // L: 8025 + Client.selectedItemId = var3; // L: 8026 + class29.invalidateWidget(var16); // L: 8027 + Client.selectedItemName = DefaultsGroup.colorStartTag(16748608) + class23.ItemDefinition_get(var3).name + DefaultsGroup.colorStartTag(16777215); // L: 8028 + if (Client.selectedItemName == null) { // L: 8029 + Client.selectedItemName = "null"; + } + + return; // L: 8030 + } + + if (var2 == 39) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); // L: 8074 + var8.packetBuffer.method6754(var1); // L: 8075 + var8.packetBuffer.method6771(var3); // L: 8076 + var8.packetBuffer.method6771(var0); // L: 8077 + Client.packetWriter.addNode(var8); // L: 8078 + Client.field708 = 0; // L: 8079 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8080 + Client.field709 = var0; // L: 8081 + } else if (var2 == 40) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); // L: 8380 + var8.packetBuffer.method6614(var3); // L: 8381 + var8.packetBuffer.writeIntME(var0); // L: 8382 + var8.packetBuffer.method6754(var1); // L: 8383 + Client.packetWriter.addNode(var8); // L: 8384 + Client.field708 = 0; // L: 8385 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8386 + Client.field709 = var0; // L: 8387 + } else if (var2 == 41) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); // L: 8660 + var8.packetBuffer.method6614(var3); // L: 8661 + var8.packetBuffer.method6614(var0); // L: 8662 + var8.packetBuffer.method6624(var1); // L: 8663 + Client.packetWriter.addNode(var8); // L: 8664 + Client.field708 = 0; // L: 8665 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8666 + Client.field709 = var0; // L: 8667 + } else if (var2 == 42) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 8745 + var8.packetBuffer.method6614(var0); // L: 8746 + var8.packetBuffer.method6614(var3); // L: 8747 + var8.packetBuffer.method6754(var1); // L: 8748 + Client.packetWriter.addNode(var8); // L: 8749 + Client.field708 = 0; // L: 8750 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8751 + Client.field709 = var0; // L: 8752 + } else if (var2 == 43) { + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); // L: 8724 + var8.packetBuffer.method6614(var0); // L: 8725 + var8.packetBuffer.writeInt(var1); // L: 8726 + var8.packetBuffer.method6771(var3); // L: 8727 + Client.packetWriter.addNode(var8); // L: 8728 + Client.field708 = 0; // L: 8729 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8730 + Client.field709 = var0; // L: 8731 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 8527 + if (var15 != null) { // L: 8528 + Client.mouseCrossX = var6; // L: 8529 + Client.mouseCrossY = var7; // L: 8530 + Client.mouseCrossColor = 2; // L: 8531 + Client.mouseCrossState = 0; // L: 8532 + Client.destinationX = var0; // L: 8533 + Client.destinationY = var1; // L: 8534 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); // L: 8536 + var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8537 + var9.packetBuffer.method6614(var3); // L: 8538 + Client.packetWriter.addNode(var9); // L: 8539 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 8467 + if (var15 != null) { // L: 8468 + Client.mouseCrossX = var6; // L: 8469 + Client.mouseCrossY = var7; // L: 8470 + Client.mouseCrossColor = 2; // L: 8471 + Client.mouseCrossState = 0; // L: 8472 + Client.destinationX = var0; // L: 8473 + Client.destinationY = var1; // L: 8474 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); // L: 8476 + var9.packetBuffer.method6614(var3); // L: 8477 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8478 + Client.packetWriter.addNode(var9); // L: 8479 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 8598 + if (var15 != null) { // L: 8599 + Client.mouseCrossX = var6; // L: 8600 + Client.mouseCrossY = var7; // L: 8601 + Client.mouseCrossColor = 2; // L: 8602 + Client.mouseCrossState = 0; // L: 8603 + Client.destinationX = var0; // L: 8604 + Client.destinationY = var1; // L: 8605 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 8607 + var9.packetBuffer.writeIntME(var3); // L: 8608 + var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8609 + Client.packetWriter.addNode(var9); // L: 8610 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 7994 + if (var15 != null) { // L: 7995 + Client.mouseCrossX = var6; // L: 7996 + Client.mouseCrossY = var7; // L: 7997 + Client.mouseCrossColor = 2; // L: 7998 + Client.mouseCrossState = 0; // L: 7999 + Client.destinationX = var0; // L: 8000 + Client.destinationY = var1; // L: 8001 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 8003 + var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8004 + var9.packetBuffer.method6771(var3); // L: 8005 + Client.packetWriter.addNode(var9); // L: 8006 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 8318 + if (var15 != null) { // L: 8319 + Client.mouseCrossX = var6; // L: 8320 + Client.mouseCrossY = var7; // L: 8321 + Client.mouseCrossColor = 2; // L: 8322 + Client.mouseCrossState = 0; // L: 8323 + Client.destinationX = var0; // L: 8324 + Client.destinationY = var1; // L: 8325 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); // L: 8327 + var9.packetBuffer.writeShort(var3); // L: 8328 + var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8329 + Client.packetWriter.addNode(var9); // L: 8330 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 8425 + if (var15 != null) { // L: 8426 + Client.mouseCrossX = var6; // L: 8427 + Client.mouseCrossY = var7; // L: 8428 + Client.mouseCrossColor = 2; // L: 8429 + Client.mouseCrossState = 0; // L: 8430 + Client.destinationX = var0; // L: 8431 + Client.destinationY = var1; // L: 8432 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8434 + var9.packetBuffer.method6614(var3); // L: 8435 + var9.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8436 + Client.packetWriter.addNode(var9); // L: 8437 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 8129 + if (var15 != null) { // L: 8130 + Client.mouseCrossX = var6; // L: 8131 + Client.mouseCrossY = var7; // L: 8132 + Client.mouseCrossColor = 2; // L: 8133 + Client.mouseCrossState = 0; // L: 8134 + Client.destinationX = var0; // L: 8135 + Client.destinationY = var1; // L: 8136 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); // L: 8138 + var9.packetBuffer.writeShortLE(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8139 + var9.packetBuffer.method6614(var3); // L: 8140 + Client.packetWriter.addNode(var9); // L: 8141 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 8582 + if (var15 != null) { // L: 8583 + Client.mouseCrossX = var6; // L: 8584 + Client.mouseCrossY = var7; // L: 8585 + Client.mouseCrossColor = 2; // L: 8586 + Client.mouseCrossState = 0; // L: 8587 + Client.destinationX = var0; // L: 8588 + Client.destinationY = var1; // L: 8589 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); // L: 8591 + var9.packetBuffer.method6771(var3); // L: 8592 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8593 + Client.packetWriter.addNode(var9); // L: 8594 + } + } else { + label645: { + if (var2 != 57) { + if (var2 == 58) { + var16 = class231.getWidgetChild(var1, var0); // L: 8645 + if (var16 != null) { // L: 8646 + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); // L: 8648 + var9.packetBuffer.method6614(var16.itemId); // L: 8649 + var9.packetBuffer.method6624(var1); // L: 8650 + var9.packetBuffer.writeShort(Client.field874); // L: 8651 + var9.packetBuffer.method6771(Client.selectedSpellChildIndex); // L: 8652 + var9.packetBuffer.method6625(class148.selectedSpellWidget); // L: 8653 + var9.packetBuffer.writeIntME(var0); // L: 8654 + Client.packetWriter.addNode(var9); // L: 8655 + } + break label645; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 8176 + Client.mouseCrossY = var7; // L: 8177 + Client.mouseCrossColor = 2; // L: 8178 + Client.mouseCrossState = 0; // L: 8179 + Client.destinationX = var0; // L: 8180 + Client.destinationY = var1; // L: 8181 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); // L: 8183 + var8.packetBuffer.writeIntME(Tile.baseY + var1); // L: 8184 + var8.packetBuffer.method6606(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8185 + var8.packetBuffer.method6771(var3); // L: 8186 + var8.packetBuffer.method6614(var0 + ItemLayer.baseX); // L: 8187 + Client.packetWriter.addNode(var8); // L: 8188 + break label645; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 8063 + Client.mouseCrossY = var7; // L: 8064 + Client.mouseCrossColor = 2; // L: 8065 + Client.mouseCrossState = 0; // L: 8066 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8068 + var8.packetBuffer.method6614(var3); // L: 8069 + Client.packetWriter.addNode(var8); // L: 8070 + break label645; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 8347 + Client.mouseCrossY = var7; // L: 8348 + Client.mouseCrossColor = 2; // L: 8349 + Client.mouseCrossState = 0; // L: 8350 + var13 = Client.npcs[var3]; // L: 8351 + if (var13 != null) { // L: 8352 + NPCComposition var17 = var13.definition; // L: 8353 + if (var17.transforms != null) { // L: 8354 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 8355 + var11 = ObjectComposition.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); // L: 8357 + var11.packetBuffer.method6771(var17.id); // L: 8358 + Client.packetWriter.addNode(var11); // L: 8359 + } + } + break label645; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 8734 + Client.mouseCrossY = var7; // L: 8735 + Client.mouseCrossColor = 2; // L: 8736 + Client.mouseCrossState = 0; // L: 8737 + var8 = ObjectComposition.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); // L: 8739 + var8.packetBuffer.method6771(var3); // L: 8740 + Client.packetWriter.addNode(var8); // L: 8741 + break label645; + } + + if (var2 == 1005) { + var16 = class139.getWidget(var1); // L: 8334 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8335 + class69.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class23.ItemDefinition_get(var3).name); + } else { + var9 = ObjectComposition.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); // L: 8338 + var9.packetBuffer.method6771(var3); // L: 8339 + Client.packetWriter.addNode(var9); // L: 8340 + } + + Client.field708 = 0; // L: 8342 + PacketWriter.field1394 = class139.getWidget(var1); // L: 8343 + Client.field709 = var0; // L: 8344 + break label645; + } + + if (var2 != 1007) { + if (var2 == 1009 || var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1012) { + UserComparator4.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8213 + } + break label645; + } + } + + var16 = class231.getWidgetChild(var1, var0); // L: 8543 + if (var16 != null) { // L: 8544 + class376.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8545 + } + } + } + } + } + } + } + } + } + + if (Client.isItemSelected != 0) { // L: 8772 + Client.isItemSelected = 0; // L: 8773 + class29.invalidateWidget(class139.getWidget(UserComparator6.selectedItemWidget)); // L: 8774 + } + + if (Client.isSpellSelected) { // L: 8776 + WorldMapID.Widget_runOnTargetLeave(); + } + + if (PacketWriter.field1394 != null && Client.field708 == 0) { // L: 8777 + class29.invalidateWidget(PacketWriter.field1394); + } + + } // L: 8778 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 424d011b9f..c962019133 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("lf") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1596118633 + intValue = 1532544579 ) @Export("capacity") final int capacity; - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 201704809 + intValue = 432517863 ) @Export("size") int size; - @ObfuscatedName("h") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Ljn;" + descriptor = "[Llt;" ) @Export("array") User[] array; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("e") + @ObfuscatedName("d") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("q") + @ObfuscatedName("c") @Export("comparator") Comparator comparator; @@ -47,26 +47,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19 } // L: 20 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)Ljn;", - garbageValue = "-315842787" + descriptor = "(I)Llt;", + garbageValue = "-1522637653" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)[Ljn;", - garbageValue = "1723641195" + descriptor = "(II)[Llt;", + garbageValue = "1232560537" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("q") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-16027" + descriptor = "(B)V", + garbageValue = "115" ) @Export("clear") public void clear() { @@ -76,30 +76,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); // L: 26 } // L: 27 - @ObfuscatedName("l") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "687" + descriptor = "(B)I", + garbageValue = "78" ) @Export("getSize") public int getSize() { return this.size; // L: 30 } - @ObfuscatedName("s") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "2143346405" ) @Export("isFull") public boolean isFull() { return this.size == this.capacity; // L: 34 } - @ObfuscatedName("b") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "(Lkk;I)Z", - garbageValue = "-1403863390" + descriptor = "(Llw;I)Z", + garbageValue = "-382653222" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("a") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lkk;I)Ljn;", - garbageValue = "2091513607" + descriptor = "(Llw;I)Llt;", + garbageValue = "-1399672858" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 } - @ObfuscatedName("w") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lkk;I)Ljn;", - garbageValue = "1389255330" + descriptor = "(Llw;B)Llt;", + garbageValue = "11" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51 } - @ObfuscatedName("k") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Lkk;B)Ljn;", - garbageValue = "106" + descriptor = "(Llw;I)Llt;", + garbageValue = "2131806982" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 } - @ObfuscatedName("i") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "(Lkk;I)Z", - garbageValue = "925545602" + descriptor = "(Llw;I)Z", + garbageValue = "-1769483355" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("x") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(Ljn;I)V", - garbageValue = "1008503929" + descriptor = "(Llt;I)V", + garbageValue = "2115617221" ) @Export("remove") final void remove(User var1) { @@ -171,20 +171,20 @@ public abstract class UserList { } } // L: 71 - @ObfuscatedName("g") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lkk;I)Ljn;", - garbageValue = "1681859445" + descriptor = "(Llw;I)Llt;", + garbageValue = "-2090976352" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); // L: 74 } - @ObfuscatedName("u") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lkk;Lkk;I)Ljn;", - garbageValue = "1304686486" + descriptor = "(Llw;Llw;B)Llt;", + garbageValue = "52" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +199,10 @@ public abstract class UserList { } } - @ObfuscatedName("t") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(IB)Ljn;", - garbageValue = "12" + descriptor = "(II)Llt;", + garbageValue = "1309219130" ) @Export("get") public final User get(int var1) { @@ -213,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("p") + @ObfuscatedName("ai") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1849487850" + garbageValue = "697370657" ) @Export("sort") public final void sort() { @@ -228,10 +228,10 @@ public abstract class UserList { } // L: 98 - @ObfuscatedName("o") + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(Ljn;Lkk;Lkk;I)V", - garbageValue = "1325828813" + descriptor = "(Llt;Llw;Llw;I)V", + garbageValue = "1904626398" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); // L: 103 } // L: 104 - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(Ljn;B)I", - garbageValue = "113" + descriptor = "(Llt;I)I", + garbageValue = "-1638157420" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,10 +256,10 @@ public abstract class UserList { return -1; // L: 110 } - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Ljn;I)V", - garbageValue = "-1644008169" + descriptor = "(Llt;I)V", + garbageValue = "-1033271588" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -273,20 +273,20 @@ public abstract class UserList { } } // L: 116 - @ObfuscatedName("ag") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljn;B)V", - garbageValue = "-53" + descriptor = "(Llt;B)V", + garbageValue = "-1" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; // L: 119 } // L: 120 - @ObfuscatedName("ae") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Ljn;I)V", - garbageValue = "-669871077" + descriptor = "(Llt;I)V", + garbageValue = "-1125941169" ) @Export("mapPut") final void mapPut(User var1) { @@ -300,10 +300,10 @@ public abstract class UserList { } // L: 130 - @ObfuscatedName("ac") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "53" + descriptor = "(II)V", + garbageValue = "-1138258430" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -314,20 +314,20 @@ public abstract class UserList { } // L: 137 - @ObfuscatedName("aq") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1607977980" + garbageValue = "1483962639" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; // L: 143 } // L: 144 - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "-22" + garbageValue = "-92" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -338,4 +338,31 @@ public abstract class UserList { } } // L: 153 + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "([Lhu;Lhu;ZB)V", + garbageValue = "1" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1255368413 * -823811723 : var1.width * 1340111239 * 1559493687; // L: 9960 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1519718797 * -639002299 : var1.height * -834307829 * -569603421; // L: 9961 + Message.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9962 + if (var1.children != null) { // L: 9963 + Message.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9964 + if (var5 != null) { // L: 9965 + int var6 = var5.group; // L: 9966 + if (class15.loadInterface(var6)) { // L: 9968 + Message.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 9969 + } + } + + if (var1.contentType == 1337) { // L: 9972 + } + + } // L: 9973 } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 785b36072d..d5cdce1562 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,408 +3,82 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("lw") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("name") String name; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lml;)V" + descriptor = "(Ljava/lang/String;Lmf;)V" ) public Username(String var1, LoginType var2) { this.name = var1; // L: 11 - String var4; - if (var1 == null) { // L: 15 - var4 = null; // L: 16 - } else { - label124: { - int var5 = 0; // L: 19 + this.cleanName = class336.method5978(var1, var2); // L: 12 + } // L: 13 - int var6; - for (var6 = var1.length(); var5 < var6 && class281.method5194(var1.charAt(var5)); ++var5) { // L: 20 21 - } - - while (var6 > var5 && class281.method5194(var1.charAt(var6 - 1))) { // L: 22 - --var6; - } - - int var7 = var6 - var5; // L: 23 - if (var7 >= 1) { // L: 25 - byte var9; - if (var2 == null) { // L: 29 - var9 = 12; // L: 30 - } else { - switch(var2.field4073) { // L: 33 - case 0: - var9 = 20; // L: 35 - break; // L: 36 - default: - var9 = 12; // L: 38 - } - } - - if (var7 <= var9) { // L: 42 - StringBuilder var15 = new StringBuilder(var7); // L: 47 - - for (int var17 = var5; var17 < var6; ++var17) { // L: 48 - char var10 = var1.charAt(var17); // L: 49 - boolean var11; - if (Character.isISOControl(var10)) { // L: 52 - var11 = false; // L: 53 - } else if (class225.isAlphaNumeric(var10)) { // L: 56 - var11 = true; // L: 57 - } else { - char[] var12 = class349.field4080; // L: 61 - int var13 = 0; - - label91: - while (true) { - char var14; - if (var13 >= var12.length) { - var12 = class349.field4078; // L: 71 - - for (var13 = 0; var13 < var12.length; ++var13) { // L: 72 - var14 = var12[var13]; // L: 73 - if (var14 == var10) { // L: 74 - var11 = true; // L: 75 - break label91; // L: 76 - } - } - - var11 = false; // L: 80 - break; - } - - var14 = var12[var13]; // L: 63 - if (var10 == var14) { // L: 64 - var11 = true; // L: 65 - break; // L: 66 - } - - ++var13; // L: 62 - } - } - - if (var11) { // L: 82 - char var16; - switch(var10) { // L: 85 - case ' ': - case '-': - case '_': - case ' ': - var16 = '_'; // L: 102 - break; // L: 103 - case '#': - case '[': - case ']': - var16 = var10; // L: 131 - break; // L: 132 - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var16 = 'a'; // L: 96 - break; - case 'Ç': - case 'ç': - var16 = 'c'; // L: 147 - break; // L: 148 - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var16 = 'e'; // L: 112 - break; // L: 113 - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var16 = 'i'; // L: 165 - break; - case 'Ñ': - case 'ñ': - var16 = 'n'; // L: 116 - break; // L: 117 - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var16 = 'o'; // L: 143 - break; // L: 144 - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var16 = 'u'; // L: 126 - break; // L: 127 - case 'ß': - var16 = 'b'; // L: 150 - break; // L: 151 - case 'ÿ': - case 'Ÿ': - var16 = 'y'; // L: 154 - break; // L: 155 - default: - var16 = Character.toLowerCase(var10); // L: 157 - } - - if (var16 != 0) { // L: 170 - var15.append(var16); // L: 171 - } - } - } - - if (var15.length() == 0) { // L: 173 - var4 = null; // L: 174 - } else { - var4 = var15.toString(); // L: 177 - } - break label124; - } - } - - var4 = null; // L: 44 - } - } - - this.cleanName = var4; // L: 179 - } // L: 180 - - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1565783636" + garbageValue = "-44870609" ) @Export("getName") public String getName() { - return this.name; // L: 183 + return this.name; // L: 16 } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "2035894536" + garbageValue = "1020088991" ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; // L: 187 + return this.cleanName != null; // L: 20 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkk;B)I", - garbageValue = "120" + descriptor = "(Llw;I)I", + garbageValue = "1145898443" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { // L: 211 - return var1.cleanName == null ? 0 : 1; // L: 212 213 + if (this.cleanName == null) { // L: 44 + return var1.cleanName == null ? 0 : 1; // L: 45 46 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 215 216 + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 48 49 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { // L: 191 - Username var2 = (Username)var1; // L: 192 + if (var1 instanceof Username) { // L: 24 + Username var2 = (Username)var1; // L: 25 if (this.cleanName == null) { - return var2.cleanName == null; // L: 193 - } else if (var2.cleanName == null) { // L: 194 + return var2.cleanName == null; // L: 26 + } else if (var2.cleanName == null) { // L: 27 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 195 196 + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 28 29 } } else { - return false; // L: 198 + return false; // L: 31 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 202 203 - } - - public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); // L: 220 + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 35 36 } public String toString() { - return this.getName(); // L: 207 + return this.getName(); // L: 40 } - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "296142419" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = MilliClock.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5818 - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { // L: 5819 - var7 = MilliClock.scene.getObjectFlags(var0, var1, var2, var5); // L: 5820 - var8 = var7 >> 6 & 3; // L: 5821 - var9 = var7 & 31; // L: 5822 - var10 = var3; // L: 5823 - if (TileItem.method2265(var5)) { // L: 5824 - var10 = var4; - } - - int[] var11 = GrandExchangeOfferAgeComparator.sceneMinimapSprite.pixels; // L: 5825 - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5826 - var13 = class25.Entity_unpackID(var5); // L: 5827 - ObjectComposition var14 = WorldMapAreaData.getObjectDefinition(var13); // L: 5828 - if (var14.mapSceneId != -1) { // L: 5829 - IndexedSprite var15 = WorldMapSection1.mapSceneSprites[var14.mapSceneId]; // L: 5830 - if (var15 != null) { // L: 5831 - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5832 - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5833 - var15.drawAt(var16 + var1 * 4 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5834 - } - } else { - if (var9 == 0 || var9 == 2) { // L: 5838 - if (var8 == 0) { // L: 5839 - var11[var12] = var10; // L: 5840 - var11[var12 + 512] = var10; // L: 5841 - var11[var12 + 1024] = var10; // L: 5842 - var11[var12 + 1536] = var10; // L: 5843 - } else if (var8 == 1) { // L: 5845 - var11[var12] = var10; // L: 5846 - var11[var12 + 1] = var10; // L: 5847 - var11[var12 + 2] = var10; // L: 5848 - var11[var12 + 3] = var10; // L: 5849 - } else if (var8 == 2) { // L: 5851 - var11[var12 + 3] = var10; // L: 5852 - var11[var12 + 512 + 3] = var10; // L: 5853 - var11[var12 + 1024 + 3] = var10; // L: 5854 - var11[var12 + 1536 + 3] = var10; // L: 5855 - } else if (var8 == 3) { // L: 5857 - var11[var12 + 1536] = var10; // L: 5858 - var11[var12 + 1536 + 1] = var10; // L: 5859 - var11[var12 + 1536 + 2] = var10; // L: 5860 - var11[var12 + 1536 + 3] = var10; // L: 5861 - } - } - - if (var9 == 3) { // L: 5864 - if (var8 == 0) { // L: 5865 - var11[var12] = var10; - } else if (var8 == 1) { // L: 5866 - var11[var12 + 3] = var10; - } else if (var8 == 2) { // L: 5867 - var11[var12 + 1536 + 3] = var10; - } else if (var8 == 3) { // L: 5868 - var11[var12 + 1536] = var10; - } - } - - if (var9 == 2) { // L: 5870 - if (var8 == 3) { // L: 5871 - var11[var12] = var10; // L: 5872 - var11[var12 + 512] = var10; // L: 5873 - var11[var12 + 1024] = var10; // L: 5874 - var11[var12 + 1536] = var10; // L: 5875 - } else if (var8 == 0) { // L: 5877 - var11[var12] = var10; // L: 5878 - var11[var12 + 1] = var10; // L: 5879 - var11[var12 + 2] = var10; // L: 5880 - var11[var12 + 3] = var10; // L: 5881 - } else if (var8 == 1) { // L: 5883 - var11[var12 + 3] = var10; // L: 5884 - var11[var12 + 512 + 3] = var10; // L: 5885 - var11[var12 + 1024 + 3] = var10; // L: 5886 - var11[var12 + 1536 + 3] = var10; // L: 5887 - } else if (var8 == 2) { // L: 5889 - var11[var12 + 1536] = var10; // L: 5890 - var11[var12 + 1536 + 1] = var10; // L: 5891 - var11[var12 + 1536 + 2] = var10; // L: 5892 - var11[var12 + 1536 + 3] = var10; // L: 5893 - } - } - } - } - - var5 = MilliClock.scene.getGameObjectTag(var0, var1, var2); // L: 5898 - if (var5 != 0L) { // L: 5899 - var7 = MilliClock.scene.getObjectFlags(var0, var1, var2, var5); // L: 5900 - var8 = var7 >> 6 & 3; // L: 5901 - var9 = var7 & 31; // L: 5902 - var10 = class25.Entity_unpackID(var5); // L: 5903 - ObjectComposition var24 = WorldMapAreaData.getObjectDefinition(var10); // L: 5904 - int var19; - if (var24.mapSceneId != -1) { // L: 5905 - IndexedSprite var20 = WorldMapSection1.mapSceneSprites[var24.mapSceneId]; // L: 5906 - if (var20 != null) { // L: 5907 - var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5908 - var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5909 - var20.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48); // L: 5910 - } - } else if (var9 == 9) { // L: 5913 - var12 = 15658734; // L: 5914 - if (TileItem.method2265(var5)) { // L: 5915 - var12 = 15597568; - } - - int[] var18 = GrandExchangeOfferAgeComparator.sceneMinimapSprite.pixels; // L: 5916 - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5917 - if (var8 != 0 && var8 != 2) { // L: 5918 - var18[var19] = var12; // L: 5925 - var18[var19 + 1 + 512] = var12; // L: 5926 - var18[var19 + 1024 + 2] = var12; // L: 5927 - var18[var19 + 1536 + 3] = var12; // L: 5928 - } else { - var18[var19 + 1536] = var12; // L: 5919 - var18[var19 + 1 + 1024] = var12; // L: 5920 - var18[var19 + 512 + 2] = var12; // L: 5921 - var18[var19 + 3] = var12; // L: 5922 - } - } - } - - var5 = MilliClock.scene.getFloorDecorationTag(var0, var1, var2); // L: 5932 - if (0L != var5) { // L: 5933 - var7 = class25.Entity_unpackID(var5); // L: 5934 - ObjectComposition var21 = WorldMapAreaData.getObjectDefinition(var7); // L: 5935 - if (var21.mapSceneId != -1) { // L: 5936 - IndexedSprite var22 = WorldMapSection1.mapSceneSprites[var21.mapSceneId]; // L: 5937 - if (var22 != null) { // L: 5938 - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5939 - int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5940 - var22.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var21.sizeY) * 4 + var23 + 48); // L: 5941 - } - } - } - - } // L: 5945 + public int compareTo(Object var1) { + return this.compareToTyped((Username)var1); // L: 53 + } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index a6dc84878f..9650d804b8 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("kg") +@ObfuscatedName("la") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("kd") + @ObfuscatedName("kg") @ObfuscatedSignature( - descriptor = "(B)Lkk;", - garbageValue = "75" + descriptor = "(I)Llw;", + garbageValue = "-447538147" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java index c2b82b85c6..78590b6fb9 100644 --- a/runescape-client/src/main/java/VarbitComposition.java +++ b/runescape-client/src/main/java/VarbitComposition.java @@ -4,97 +4,88 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("kl") @Implements("VarbitComposition") public class VarbitComposition extends DualNode { - @ObfuscatedName("qo") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldi;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("e") + static final int[] field3549; + @ObfuscatedName("id") @ObfuscatedGetter( - intValue = 1019712225 + intValue = 979490587 + ) + static int field3544; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 909782819 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 832067477 + intValue = -1000839247 ) @Export("startBit") public int startBit; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1230578517 + intValue = 1799765893 ) @Export("endBit") public int endBit; static { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 - } + field3549 = new int[32]; // L: 15 + int var0 = 2; // L: 18 - VarbitComposition() { - } // L: 16 + for (int var1 = 0; var1 < 32; ++var1) { // L: 19 + field3549[var1] = var0 - 1; // L: 20 + var0 += var0; // L: 21 + } - @ObfuscatedName("v") + } // L: 23 + + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "1" + descriptor = "(Lnu;I)V", + garbageValue = "44894085" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 30 - if (var2 == 0) { // L: 31 - return; // L: 34 + int var2 = var1.readUnsignedByte(); // L: 27 + if (var2 == 0) { // L: 28 + return; // L: 31 } - this.decodeNext(var1, var2); // L: 32 + this.decodeNext(var1, var2); // L: 29 } } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-1952270730" + descriptor = "(Lnu;II)V", + garbageValue = "-1491405636" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 37 - this.baseVar = var1.readUnsignedShort(); // L: 38 - this.startBit = var1.readUnsignedByte(); // L: 39 - this.endBit = var1.readUnsignedByte(); // L: 40 + if (var2 == 1) { // L: 34 + this.baseVar = var1.readUnsignedShort(); // L: 35 + this.startBit = var1.readUnsignedByte(); // L: 36 + this.endBit = var1.readUnsignedByte(); // L: 37 } - } // L: 43 - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1439525339" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { // L: 11458 - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 11460 - var1.packetBuffer.writeByte(WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var0)); // L: 11461 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11462 - Client.packetWriter.addNode(var1); // L: 11463 - } - } // L: 11464 + } // L: 40 } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index d555f0acab..6206d6ec43 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,22 +3,27 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("jv") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("VarcInt_archive") - public static AbstractArchive VarcInt_archive; - @ObfuscatedName("v") + static AbstractArchive VarcInt_archive; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("VarcInt_cached") - public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("d") + static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Low;" + ) + static IndexedSprite field3429; + @ObfuscatedName("u") @Export("persist") public boolean persist; @@ -26,35 +31,80 @@ public class VarcInt extends DualNode { VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public VarcInt() { + VarcInt() { this.persist = false; // L: 12 - } + } // L: 14 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "-111" + descriptor = "(Lnu;B)V", + garbageValue = "-9" ) - public void method4594(Buffer var1) { + void method4933(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 20 - if (var2 == 0) { // L: 21 - return; // L: 24 + int var2 = var1.readUnsignedByte(); // L: 32 + if (var2 == 0) { // L: 33 + return; // L: 36 } - this.method4595(var1, var2); // L: 22 + this.method4934(var1, var2); // L: 34 } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-1938056419" + descriptor = "(Lnu;II)V", + garbageValue = "635398124" ) - void method4595(Buffer var1, int var2) { - if (var2 == 2) { // L: 27 - this.persist = true; // L: 28 + void method4934(Buffer var1, int var2) { + if (var2 == 2) { // L: 39 + this.persist = true; // L: 40 } - } // L: 31 + } // L: 43 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "20641087" + ) + public static String method4940(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); // L: 58 + + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 59 + int var5 = var0[var4] & 255; // L: 60 + var3.append(class301.field3751[var5 >>> 2]); // L: 61 + if (var4 < var2 - 1) { // L: 62 + int var6 = var0[var4 + 1] & 255; // L: 63 + var3.append(class301.field3751[(var5 & 3) << 4 | var6 >>> 4]); // L: 64 + if (var4 < var2 - 2) { // L: 65 + int var7 = var0[var4 + 2] & 255; // L: 66 + var3.append(class301.field3751[(var6 & 15) << 2 | var7 >>> 6]).append(class301.field3751[var7 & 63]); // L: 67 + } else { + var3.append(class301.field3751[(var6 & 15) << 2]).append("="); // L: 69 + } + } else { + var3.append(class301.field3751[(var5 & 3) << 4]).append("=="); // L: 71 + } + } + + return var3.toString(); // L: 73 + } + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-581975107" + ) + static int method4941(int var0, Script var1, boolean var2) { + if (var0 == 6900) { // L: 4155 + ++Interpreter.Interpreter_stringStackSize; // L: 4156 + return 1; // L: 4157 + } else if (var0 == 6950) { // L: 4159 + ++class16.Interpreter_intStackSize; // L: 4160 + return 1; // L: 4161 + } else { + return 2; // L: 4163 + } + } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index a695b7c88c..c850f5737a 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -1,7 +1,4 @@ import java.io.EOFException; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -12,423 +9,697 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("dl") @Implements("Varcs") public class Varcs { - @ObfuscatedName("d") + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "Lcs;" + ) + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("u") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("map") Map map; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("strings") String[] strings; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 3247217840907840609L + longValue = 93578901250318875L ) - long field1282; + long field1366; Varcs() { this.unwrittenChanges = false; // L: 22 - int var1 = WorldMapIcon_0.archive2.getGroupFileCount(19); - this.map = new HashMap(); - this.intsPersistence = new boolean[var1]; + int var1 = class235.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 var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); - VarcInt var3; - if (var4 != null) { - var3 = var4; // L: 34 - } else { - byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); // L: 37 - var4 = new VarcInt(); // L: 38 - if (var5 != null) { - var4.method4594(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 + for (var2 = 0; var2 < var1; ++var2) { // L: 29 + VarcInt var3 = GrandExchangeOfferAgeComparator.method4606(var2); // L: 30 + this.intsPersistence[var2] = var3.persist; // L: 31 } - var2 = 0; // L: 46 - if (WorldMapIcon_0.archive2.method4471(15)) { // L: 47 - var2 = WorldMapIcon_0.archive2.getGroupFileCount(15); // L: 48 + var2 = 0; // L: 33 + if (class235.archive2.method4440(15)) { + var2 = class235.archive2.getGroupFileCount(15); } - this.strings = new String[var2]; // L: 50 - this.read(); // L: 51 - } // L: 52 + this.strings = new String[var2]; + this.read(); + } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1194686711" + garbageValue = "849299209" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); // L: 55 + this.map.put(var1, var2); if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; // L: 56 + this.unwrittenChanges = true; } - } // L: 57 + } - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "16777215" + garbageValue = "1590858521" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); // L: 60 - return var2 instanceof Integer ? (Integer)var2 : -1; // L: 61 62 64 + Object var2 = this.map.get(var1); + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 51 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "2044340742" + garbageValue = "111416311" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); // L: 68 - } // L: 69 + this.map.put(var1, var2); + } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1459564767" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "39" ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(var1); // L: 72 - return var2 instanceof String ? (String)var2 : ""; // L: 73 74 76 + Object var2 = this.map.get(var1); // L: 59 + return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "81320649" + garbageValue = "2094662895" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; // L: 80 - } // L: 81 + this.strings[var1] = var2; // L: 67 + } // L: 68 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "-82" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "944550369" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; // L: 84 + return this.strings[var1]; // L: 71 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1732763236" + garbageValue = "1577659232" ) @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.intsPersistence.length; ++var1) { // L: 75 + if (!this.intsPersistence[var1]) { // L: 76 + this.map.remove(var1); // L: 77 } } - for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 93 - this.strings[var1] = null; // L: 94 + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 80 + this.strings[var1] = null; // L: 81 } - } // L: 96 + } // L: 83 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ZI)Lmc;", - garbageValue = "1003516163" + descriptor = "(ZI)Lni;", + garbageValue = "1031892444" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return WorldMapRectangle.getPreferencesFile("2", FontName.field3699.name, var1); // L: 99 + return class15.getPreferencesFile("2", class27.field208.name, var1); // L: 86 } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2064490955" + descriptor = "(B)V", + garbageValue = "105" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); // L: 103 + AccessFile var1 = this.getPreferencesFile(true); // L: 90 try { - int var2 = 3; // L: 105 - int var3 = 0; // L: 106 - Iterator var4 = this.map.entrySet().iterator(); // L: 107 + int var2 = 3; // L: 92 + int var3 = 0; // L: 93 + Iterator var4 = this.map.entrySet().iterator(); // L: 94 while (var4.hasNext()) { - 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 + Entry var5 = (Entry)var4.next(); // L: 95 + int var6 = (Integer)var5.getKey(); // L: 97 + if (this.intsPersistence[var6]) { // L: 98 + Object var7 = var5.getValue(); // L: 99 + var2 += 3; // L: 100 + if (var7 instanceof Integer) { // L: 101 var2 += 4; - } else if (var7 instanceof String) { // L: 115 - var2 += WorldMapLabelSize.stringCp1252NullTerminatedByteSize((String)var7); + } else if (var7 instanceof String) { // L: 102 + var2 += Friend.stringCp1252NullTerminatedByteSize((String)var7); } - ++var3; // L: 116 + ++var3; // L: 103 } } - Buffer var28 = new Buffer(var2); // L: 120 - var28.writeByte(2); // L: 121 - var28.writeShort(var3); // L: 122 - Iterator var29 = this.map.entrySet().iterator(); // L: 123 + Buffer var24 = new Buffer(var2); // L: 107 + var24.writeByte(2); // L: 108 + var24.writeShort(var3); // L: 109 + Iterator var25 = this.map.entrySet().iterator(); // L: 110 - label146: - while (true) { - Entry var17; - int var18; - do { - if (!var29.hasNext()) { - var1.write(var28.array, 0, var28.offset); // L: 157 - break label146; - } - - var17 = (Entry)var29.next(); // L: 124 - var18 = (Integer)var17.getKey(); - } while(!this.intsPersistence[var18]); - - var28.writeShort(var18); - Object var8 = var17.getValue(); - Class var10 = var8.getClass(); // L: 131 - class3[] var11 = new class3[]{class3.field18, class3.field26, class3.field17}; // L: 136 - class3[] var12 = var11; // L: 138 - int var13 = 0; - - class3 var9; - while (true) { - if (var13 >= var12.length) { - var9 = null; // L: 149 - break; - } - - class3 var14 = var12[var13]; // L: 140 - if (var10 == var14.field21) { // L: 142 - var9 = var14; // L: 143 - break; // L: 144 - } - - ++var13; // L: 139 + while (var25.hasNext()) { + Entry var13 = (Entry)var25.next(); // L: 111 + int var14 = (Integer)var13.getKey(); // L: 113 + if (this.intsPersistence[var14]) { // L: 114 + var24.writeShort(var14); // L: 115 + Object var8 = var13.getValue(); // L: 116 + class373 var9 = class373.method6477(var8.getClass()); // L: 117 + var24.writeByte(var9.field4130); // L: 118 + class369 var10 = class373.method6480(var8.getClass()); // L: 120 + var10.vmethod6493(var8, var24); // L: 121 } - - var28.writeByte(var9.field22); // L: 152 - class3.method30(var8, var28); // L: 153 } - } catch (Exception var26) { // L: 159 + + var1.write(var24.array, 0, var24.offset); // L: 126 + } catch (Exception var22) { // L: 128 } finally { try { - var1.close(); // L: 162 - } catch (Exception var25) { // L: 164 + var1.close(); // L: 131 + } catch (Exception var21) { // L: 133 } } - this.unwrittenChanges = false; // L: 166 - this.field1282 = Tiles.currentTimeMillis(); // L: 167 - } // L: 168 - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1389856130" - ) - @Export("read") - void read() { - AccessFile var1 = this.getPreferencesFile(false); // L: 171 - - try { - byte[] var2 = new byte[(int)var1.length()]; // L: 173 - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 174 175 178 - var4 = var1.read(var2, var3, var2.length - var3); // L: 176 - if (var4 == -1) { // L: 177 - throw new EOFException(); - } - } - - Buffer var15 = new Buffer(var2); // L: 180 - if (var15.array.length - var15.offset < 1) { // L: 181 - return; - } - - int var16 = var15.readUnsignedByte(); // L: 182 - if (var16 < 0 || var16 > 2) { // L: 183 - return; // L: 221 - } - - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { // L: 184 - var17 = var15.readUnsignedShort(); // L: 185 - - for (var7 = 0; var7 < var17; ++var7) { // L: 186 - var8 = var15.readUnsignedShort(); // L: 187 - var9 = var15.readUnsignedByte(); // L: 188 - class3[] var10 = new class3[]{class3.field18, class3.field26, class3.field17}; // L: 191 - class3 var11 = (class3)InterfaceParent.findEnumerated(var10, var9); // L: 193 - Object var12 = var11.method32(var15); // L: 194 - if (this.intsPersistence[var8]) { // L: 195 - this.map.put(var8, var12); // L: 196 - } - } - } else { - var17 = var15.readUnsignedShort(); // L: 201 - - for (var7 = 0; var7 < var17; ++var7) { // L: 202 - var8 = var15.readUnsignedShort(); // L: 203 - var9 = var15.readInt(); // L: 204 - if (this.intsPersistence[var8]) { // L: 205 - this.map.put(var8, var9); // L: 206 - } - } - - var7 = var15.readUnsignedShort(); // L: 209 - - for (var8 = 0; var8 < var7; ++var8) { // L: 210 - var15.readUnsignedShort(); // L: 211 - var15.readStringCp1252NullTerminated(); // L: 212 - } - } - } catch (Exception var26) { // L: 216 - } finally { - try { - var1.close(); // L: 219 - } catch (Exception var25) { - } - - } - - this.unwrittenChanges = false; // L: 223 - } // L: 224 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2098120459" - ) - @Export("tryWrite") - void tryWrite() { - if (this.unwrittenChanges && this.field1282 < Tiles.currentTimeMillis() - 60000L) { // L: 227 - this.write(); // L: 228 - } - - } // L: 230 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2106101646" - ) - @Export("hasUnwrittenChanges") - boolean hasUnwrittenChanges() { - return this.unwrittenChanges; // L: 233 - } + this.unwrittenChanges = false; // L: 135 + this.field1366 = ObjectSound.currentTimeMillis(); // L: 136 + } // L: 137 @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IB)Lcl;", - garbageValue = "18" + descriptor = "(I)V", + garbageValue = "1853705286" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = WorldMapSection0.archive12.takeFile(var0, 0); // L: 27 - if (var2 == null) { // L: 28 - return null; // L: 29 - } else { - var1 = GameObject.newScript(var2); // L: 31 - Script.Script_cached.put(var1, (long)var0); // L: 32 - return var1; // L: 33 - } - } - } + @Export("read") + void read() { + AccessFile var1 = this.getPreferencesFile(false); // L: 140 - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-73" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { // L: 125 - if (KeyHandler.field424 == KeyHandler.field418) { // L: 126 - return false; - } else { - ModeWhere.field2417 = KeyHandler.field428[KeyHandler.field418]; // L: 127 - WorldMapID.field299 = KeyHandler.field422[KeyHandler.field418]; // L: 128 - KeyHandler.field418 = KeyHandler.field418 + 1 & 127; // L: 129 - return true; // L: 130 - } - } - } + label214: { + try { + byte[] var2 = new byte[(int)var1.length()]; // L: 142 - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - @Export("findOrCreateRandomDatFile") - static void findOrCreateRandomDatFile() { - try { - File var0 = new File(JagexCache.userHomeDirectory, "random.dat"); // L: 250 - int var2; - if (var0.exists()) { // L: 251 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 252 - } else { - label39: - for (int var1 = 0; var1 < Timer.cacheSubPaths.length; ++var1) { // L: 255 - for (var2 = 0; var2 < class224.cacheParentPaths.length; ++var2) { // L: 256 - File var3 = new File(class224.cacheParentPaths[var2] + Timer.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 257 - if (var3.exists()) { // L: 258 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 259 - break label39; // L: 260 + int var4; + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 143 144 147 + var4 = var1.read(var2, var3, var2.length - var3); // L: 145 + if (var4 == -1) { // L: 146 + throw new EOFException(); + } + } + + Buffer var15 = new Buffer(var2); // L: 149 + if (var15.array.length - var15.offset < 1) { // L: 150 + return; + } + + int var16 = var15.readUnsignedByte(); // L: 151 + if (var16 >= 0 && var16 <= 2) { // L: 152 + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { // L: 153 + var17 = var15.readUnsignedShort(); // L: 154 + var7 = 0; + + while (true) { + if (var7 >= var17) { + break label214; + } + + var8 = var15.readUnsignedShort(); // L: 156 + var9 = var15.readUnsignedByte(); // L: 157 + class373[] var10 = new class373[]{class373.field4128, class373.field4134, class373.field4126}; // L: 160 + class373 var11 = (class373)UserComparator8.findEnumerated(var10, var9); // L: 162 + Object var12 = var11.method6482(var15); // L: 163 + if (this.intsPersistence[var8]) { // L: 164 + this.map.put(var8, var12); // L: 165 + } + + ++var7; // L: 155 + } + } else { + var17 = var15.readUnsignedShort(); // L: 170 + + for (var7 = 0; var7 < var17; ++var7) { // L: 171 + var8 = var15.readUnsignedShort(); // L: 172 + var9 = var15.readInt(); // L: 173 + if (this.intsPersistence[var8]) { // L: 174 + this.map.put(var8, var9); // L: 175 + } + } + + var7 = var15.readUnsignedShort(); // L: 178 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label214; + } + + var15.readUnsignedShort(); // L: 180 + var15.readStringCp1252NullTerminated(); // L: 181 + ++var8; // L: 179 } } } + } catch (Exception var26) { // L: 185 + break label214; + } finally { + try { + var1.close(); // L: 188 + } catch (Exception var25) { + } + } - if (JagexCache.JagexCache_randomDat == null) { // L: 265 - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 266 - var2 = var4.read(); // L: 267 - var4.seek(0L); // L: 268 - var4.write(var2); // L: 269 - var4.seek(0L); // L: 270 - var4.close(); // L: 271 - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 272 - } - } catch (IOException var5) { // L: 275 + return; // L: 190 } - } // L: 276 -} \ No newline at end of file + this.unwrittenChanges = false; // L: 192 + } // L: 193 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "150" + ) + @Export("tryWrite") + void tryWrite() { + if (this.unwrittenChanges && this.field1366 < ObjectSound.currentTimeMillis() - 60000L) { // L: 196 + this.write(); // L: 197 + } + + } // L: 199 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "111" + ) + @Export("hasUnwrittenChanges") + boolean hasUnwrittenChanges() { + return this.unwrittenChanges; // L: 202 + } + + @ObfuscatedName("o") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 34 + if (var0 % 37L == 0L) { // L: 35 + return null; + } else { + int var2 = 0; // L: 36 + + for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 37 38 40 + ++var2; // L: 39 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 42 43 52 + long var6 = var0; // L: 44 + var0 /= 37L; // L: 45 + var8 = class304.base37Table[(int)(var6 - 37L * var0)]; // L: 46 + if (var8 == '_') { // L: 47 + int var9 = var5.length() - 1; // L: 48 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 49 + var8 = 160; // L: 50 + } + } + + var5.reverse(); // L: 54 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 55 + return var5.toString(); // L: 56 + } + } else { + return null; + } + } + + @ObfuscatedName("gm") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1479918720" + ) + static final void method2340() { + class20.method304(false); // L: 4889 + Client.field655 = 0; // L: 4890 + boolean var0 = true; // L: 4891 + + int var1; + for (var1 = 0; var1 < class15.regionLandArchives.length; ++var1) { // L: 4892 + if (WorldMapData_0.regionMapArchiveIds[var1] != -1 && class15.regionLandArchives[var1] == null) { // L: 4893 4894 + class15.regionLandArchives[var1] = class157.archive5.takeFile(WorldMapData_0.regionMapArchiveIds[var1], 0); // L: 4895 + if (class15.regionLandArchives[var1] == null) { // L: 4896 + var0 = false; // L: 4897 + ++Client.field655; // L: 4898 + } + } + + if (class18.regionLandArchiveIds[var1] != -1 && MouseHandler.regionMapArchives[var1] == null) { // L: 4902 4903 + MouseHandler.regionMapArchives[var1] = class157.archive5.takeFileEncrypted(class18.regionLandArchiveIds[var1], 0, NPC.xteaKeys[var1]); // L: 4904 + if (MouseHandler.regionMapArchives[var1] == null) { // L: 4905 + var0 = false; // L: 4906 + ++Client.field655; // L: 4907 + } + } + } + + if (!var0) { // L: 4912 + Client.field659 = 1; // L: 4913 + } else { + Client.field657 = 0; // L: 4916 + var0 = true; // L: 4917 + + int var3; + int var4; + for (var1 = 0; var1 < class15.regionLandArchives.length; ++var1) { // L: 4918 + byte[] var2 = MouseHandler.regionMapArchives[var1]; // L: 4919 + if (var2 != null) { // L: 4920 + var3 = (class11.regions[var1] >> 8) * 64 - ItemLayer.baseX; // L: 4921 + var4 = (class11.regions[var1] & 255) * 64 - Tile.baseY; // L: 4922 + if (Client.isInInstance) { // L: 4923 + var3 = 10; // L: 4924 + var4 = 10; // L: 4925 + } + + var0 &= ItemContainer.method2092(var2, var3, var4); // L: 4927 + } + } + + if (!var0) { // L: 4930 + Client.field659 = 2; // L: 4931 + } else { + if (Client.field659 != 0) { // L: 4934 + class2.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + BoundaryObject.playPcmPlayers(); // L: 4935 + WorldMapArea.scene.clear(); // L: 4936 + + for (var1 = 0; var1 < 4; ++var1) { // L: 4937 + Client.collisionMaps[var1].clear(); + } + + int var13; + for (var1 = 0; var1 < 4; ++var1) { // L: 4938 + for (var13 = 0; var13 < 104; ++var13) { // L: 4939 + for (var3 = 0; var3 < 104; ++var3) { // L: 4940 + Tiles.Tiles_renderFlags[var1][var13][var3] = 0; // L: 4941 + } + } + } + + BoundaryObject.playPcmPlayers(); // L: 4945 + Tiles.Tiles_minPlane = 99; // L: 4947 + class9.field69 = new byte[4][104][104]; // L: 4948 + Tiles.field1092 = new byte[4][104][104]; // L: 4949 + Tiles.field1091 = new byte[4][104][104]; // L: 4950 + class362.field4079 = new byte[4][104][104]; // L: 4951 + MidiPcmStream.field2489 = new int[4][105][105]; // L: 4952 + SecureRandomCallable.field1106 = new byte[4][105][105]; // L: 4953 + WorldMapLabelSize.field1570 = new int[105][105]; // L: 4954 + Tiles.Tiles_hue = new int[104]; // L: 4955 + Tiles.Tiles_saturation = new int[104]; // L: 4956 + Tiles.Tiles_lightness = new int[104]; // L: 4957 + GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier = new int[104]; // L: 4958 + class375.field4136 = new int[104]; // L: 4959 + var1 = class15.regionLandArchives.length; // L: 4961 + + for (ObjectSound var16 = (ObjectSound)ObjectSound.objectSounds.last(); var16 != null; var16 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 4963 + if (var16.stream1 != null) { // L: 4964 + Huffman.pcmStreamMixer.removeSubStream(var16.stream1); // L: 4965 + var16.stream1 = null; // L: 4966 + } + + if (var16.stream2 != null) { // L: 4968 + Huffman.pcmStreamMixer.removeSubStream(var16.stream2); // L: 4969 + var16.stream2 = null; // L: 4970 + } + } + + ObjectSound.objectSounds.clear(); // L: 4973 + class20.method304(true); // L: 4975 + int var5; + int var6; + int var7; + byte var8; + int var10; + int var11; + if (!Client.isInInstance) { // L: 4976 + byte[] var15; + for (var13 = 0; var13 < var1; ++var13) { // L: 4977 + var3 = (class11.regions[var13] >> 8) * 64 - ItemLayer.baseX; // L: 4978 + var4 = (class11.regions[var13] & 255) * 64 - Tile.baseY; // L: 4979 + var15 = class15.regionLandArchives[var13]; // L: 4980 + if (var15 != null) { // L: 4981 + BoundaryObject.playPcmPlayers(); // L: 4982 + MouseRecorder.method2108(var15, var3, var4, class105.field1327 * 8 - 48, Language.field3357 * 8 - 48, Client.collisionMaps); // L: 4983 + } + } + + for (var13 = 0; var13 < var1; ++var13) { // L: 4986 + var3 = (class11.regions[var13] >> 8) * 64 - ItemLayer.baseX; // L: 4987 + var4 = (class11.regions[var13] & 255) * 64 - Tile.baseY; // L: 4988 + var15 = class15.regionLandArchives[var13]; // L: 4989 + if (var15 == null && Language.field3357 < 800) { // L: 4990 + BoundaryObject.playPcmPlayers(); // L: 4991 + var6 = var3; // L: 4992 + var7 = var4; // L: 4993 + var8 = 64; // L: 4994 + byte var9 = 64; // L: 4995 + + for (var10 = var4; var10 <= var7 + var9; ++var10) { // L: 4997 + for (var11 = var6; var11 <= var6 + var8; ++var11) { // L: 4998 + if (var11 >= 0 && var11 < 104 && var10 >= 0 && var10 < 104) { // L: 4999 + SecureRandomCallable.field1106[0][var11][var10] = 127; // L: 5000 + if (var11 == var6 && var11 > 0) { // L: 5001 + Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11 - 1][var10]; + } + + if (var11 == var8 + var6 && var11 < 103) { // L: 5002 + Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11 + 1][var10]; + } + + if (var7 == var10 && var10 > 0) { + Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11][var10 - 1]; // L: 5003 + } + + if (var10 == var7 + var9 && var10 < 103) { // L: 5004 + Tiles.Tiles_heights[0][var11][var10] = Tiles.Tiles_heights[0][var11][var10 + 1]; + } + } + } + } + } + } + + class20.method304(true); // L: 5011 + + for (var13 = 0; var13 < var1; ++var13) { // L: 5012 + byte[] var14 = MouseHandler.regionMapArchives[var13]; // L: 5013 + if (var14 != null) { // L: 5014 + var4 = (class11.regions[var13] >> 8) * 64 - ItemLayer.baseX; // L: 5015 + var5 = (class11.regions[var13] & 255) * 64 - Tile.baseY; // L: 5016 + BoundaryObject.playPcmPlayers(); // L: 5017 + class243.method4399(var14, var4, var5, WorldMapArea.scene, Client.collisionMaps); // L: 5018 + } + } + } + + int var19; + if (Client.isInInstance) { // L: 5022 + int var20; + for (var13 = 0; var13 < 4; ++var13) { // L: 5023 + BoundaryObject.playPcmPlayers(); // L: 5024 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5025 + for (var4 = 0; var4 < 13; ++var4) { // L: 5026 + boolean var17 = false; // L: 5027 + var6 = Client.instanceChunkTemplates[var13][var3][var4]; // L: 5028 + if (var6 != -1) { // L: 5029 + var7 = var6 >> 24 & 3; // L: 5030 + var19 = var6 >> 1 & 3; // L: 5031 + var20 = var6 >> 14 & 1023; // L: 5032 + var10 = var6 >> 3 & 2047; // L: 5033 + var11 = (var20 / 8 << 8) + var10 / 8; // L: 5034 + + for (int var12 = 0; var12 < class11.regions.length; ++var12) { // L: 5035 + if (class11.regions[var12] == var11 && class15.regionLandArchives[var12] != null) { // L: 5036 + class7.method104(class15.regionLandArchives[var12], var13, var3 * 8, var4 * 8, var7, (var20 & 7) * 8, (var10 & 7) * 8, var19, Client.collisionMaps); // L: 5037 + var17 = true; // L: 5038 + break; + } + } + } + + if (!var17) { // L: 5043 + class26.method368(var13, var3 * 8, var4 * 8); // L: 5044 + } + } + } + } + + for (var13 = 0; var13 < 13; ++var13) { // L: 5049 + for (var3 = 0; var3 < 13; ++var3) { // L: 5050 + var4 = Client.instanceChunkTemplates[0][var13][var3]; // L: 5051 + if (var4 == -1) { // L: 5052 + var5 = var13 * 8; // L: 5053 + var6 = var3 * 8; // L: 5054 + byte var18 = 8; // L: 5055 + var8 = 8; // L: 5056 + + for (var20 = var6; var20 <= var6 + var8; ++var20) { // L: 5058 + for (var10 = var5; var10 <= var18 + var5; ++var10) { // L: 5059 + if (var10 >= 0 && var10 < 104 && var20 >= 0 && var20 < 104) { // L: 5060 + SecureRandomCallable.field1106[0][var10][var20] = 127; // L: 5061 + if (var10 == var5 && var10 > 0) { // L: 5062 + Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10 - 1][var20]; + } + + if (var10 == var5 + var18 && var10 < 103) { // L: 5063 + Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10 + 1][var20]; + } + + if (var6 == var20 && var20 > 0) { // L: 5064 + Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10][var20 - 1]; + } + + if (var20 == var8 + var6 && var20 < 103) { // L: 5065 + Tiles.Tiles_heights[0][var10][var20] = Tiles.Tiles_heights[0][var10][var20 + 1]; + } + } + } + } + } + } + } + + class20.method304(true); // L: 5073 + + for (var13 = 0; var13 < 4; ++var13) { // L: 5074 + BoundaryObject.playPcmPlayers(); // L: 5075 + + for (var3 = 0; var3 < 13; ++var3) { // L: 5076 + for (var4 = 0; var4 < 13; ++var4) { // L: 5077 + var5 = Client.instanceChunkTemplates[var13][var3][var4]; // L: 5078 + if (var5 != -1) { // L: 5079 + var6 = var5 >> 24 & 3; // L: 5080 + var7 = var5 >> 1 & 3; // L: 5081 + var19 = var5 >> 14 & 1023; // L: 5082 + var20 = var5 >> 3 & 2047; // L: 5083 + var10 = (var19 / 8 << 8) + var20 / 8; // L: 5084 + + for (var11 = 0; var11 < class11.regions.length; ++var11) { // L: 5085 + if (class11.regions[var11] == var10 && MouseHandler.regionMapArchives[var11] != null) { // L: 5086 + class157.method3114(MouseHandler.regionMapArchives[var11], var13, var3 * 8, var4 * 8, var6, (var19 & 7) * 8, (var20 & 7) * 8, var7, WorldMapArea.scene, Client.collisionMaps); // L: 5087 + break; // L: 5088 + } + } + } + } + } + } + } + + class20.method304(true); // L: 5096 + BoundaryObject.playPcmPlayers(); // L: 5097 + GameEngine.method680(WorldMapArea.scene, Client.collisionMaps); // L: 5098 + class20.method304(true); // L: 5099 + var13 = Tiles.Tiles_minPlane; // L: 5100 + if (var13 > class26.Client_plane) { // L: 5101 + var13 = class26.Client_plane; + } + + if (var13 < class26.Client_plane - 1) { // L: 5102 + var13 = class26.Client_plane - 1; + } + + if (Client.isLowDetail) { // L: 5103 + WorldMapArea.scene.init(Tiles.Tiles_minPlane); + } else { + WorldMapArea.scene.init(0); // L: 5104 + } + + for (var3 = 0; var3 < 104; ++var3) { // L: 5105 + for (var4 = 0; var4 < 104; ++var4) { // L: 5106 + class225.updateItemPile(var3, var4); // L: 5107 + } + } + + BoundaryObject.playPcmPlayers(); // L: 5110 + NetFileRequest.method4472(); // L: 5111 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5112 + PacketBufferNode var21; + if (class10.client.hasFrame()) { // L: 5113 + var21 = ObjectComposition.getPacketBufferNode(ClientPacket.field2312, Client.packetWriter.isaacCipher); // L: 5115 + var21.packetBuffer.writeInt(1057001181); // L: 5116 + Client.packetWriter.addNode(var21); // L: 5117 + } + + if (!Client.isInInstance) { // L: 5119 + var3 = (class105.field1327 - 6) / 8; // L: 5120 + var4 = (class105.field1327 + 6) / 8; // L: 5121 + var5 = (Language.field3357 - 6) / 8; // L: 5122 + var6 = (Language.field3357 + 6) / 8; // L: 5123 + + for (var7 = var3 - 1; var7 <= var4 + 1; ++var7) { // L: 5124 + for (var19 = var5 - 1; var19 <= var6 + 1; ++var19) { // L: 5125 + if (var7 < var3 || var7 > var4 || var19 < var5 || var19 > var6) { // L: 5126 + class157.archive5.loadRegionFromName("m" + var7 + "_" + var19); // L: 5127 + class157.archive5.loadRegionFromName("l" + var7 + "_" + var19); // L: 5128 + } + } + } + } + + class20.updateGameState(30); // L: 5132 + BoundaryObject.playPcmPlayers(); // L: 5133 + class69.method1166(); // L: 5134 + var21 = ObjectComposition.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); // L: 5135 + Client.packetWriter.addNode(var21); // L: 5136 + Decimator.clock.mark(); // L: 5138 + + for (var4 = 0; var4 < 32; ++var4) { // L: 5139 + GameEngine.graphicsTickTimes[var4] = 0L; + } + + for (var4 = 0; var4 < 32; ++var4) { // L: 5140 + GameEngine.clientTickTimes[var4] = 0L; + } + + class232.gameCyclesToDo = 0; // L: 5141 + } + } + } // L: 4914 4932 5143 +} diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index be45fc44ce..9e36cb2110 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,24 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("je") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("d") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1381184627 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("VarpDefinition_cached") - static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("c") + public static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -921079377 + intValue = 1440962611 ) @Export("type") public int type; @@ -34,55 +40,64 @@ public class VarpDefinition extends DualNode { this.type = 0; // L: 13 } // L: 15 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1864493120" + descriptor = "(Lnu;I)V", + garbageValue = "923214413" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 29 - if (var2 == 0) { // L: 30 - return; // L: 33 + int var2 = var1.readUnsignedByte(); // L: 34 + if (var2 == 0) { // L: 35 + return; // L: 38 } - this.decodeNext(var1, var2); // L: 31 + this.decodeNext(var1, var2); // L: 36 } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;IB)V", - garbageValue = "54" + descriptor = "(Lnu;II)V", + garbageValue = "1336556891" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { // L: 36 + if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); } - } // L: 38 + } // L: 43 - @ObfuscatedName("ez") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "498467917" + descriptor = "(ILcc;ZB)I", + garbageValue = "47" ) - static boolean method4552() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1389 - while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1390 - ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1391 - if (!var0.isLoaded()) { - return false; // L: 1392 - } - - ++Client.archiveLoadersDone; // L: 1393 + static int method4898(int var0, Script var1, boolean var2) { + if (var0 == 7100) { // L: 4212 + ++class16.Interpreter_intStackSize; // L: 4213 + return 1; // L: 4214 + } else if (var0 == 7101) { // L: 4216 + Interpreter.Interpreter_stringStackSize += 2; // L: 4217 + return 1; // L: 4218 + } else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4220 + if (var0 == 7106) { // L: 4224 + ++class16.Interpreter_intStackSize; // L: 4225 + return 1; // L: 4226 + } else if (var0 == 7107) { // L: 4228 + ++class16.Interpreter_intStackSize; // L: 4229 + return 1; // L: 4230 + } else if (var0 == 7108) { // L: 4232 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Huffman.method4311() ? 1 : 0; // L: 4233 + return 1; // L: 4234 + } else { + return 2; // L: 4236 } - - return true; // L: 1395 } else { - return true; + ++class16.Interpreter_intStackSize; // L: 4221 + return 1; // L: 4222 } } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index d4cfbc557b..632547f804 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,20 +1,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hw") @Implements("Varps") public class Varps { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("g") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 998373993 + ) + static int field2580; + @ObfuscatedName("i") + @Export("operatingSystemName") + static String operatingSystemName; + @ObfuscatedName("lq") + @ObfuscatedSignature( + descriptor = "Lhu;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; static { Varps_masks = new int[32]; // L: 6 @@ -29,16 +47,26 @@ public class Varps { Varps_main = new int[4000]; // L: 17 } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "1823742662" + descriptor = "(II)Lkb;", + garbageValue = "1594101631" ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (World.World_worlds != null) { // L: 171 - WorldMapLabelSize.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 - } + @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)); + } - } // L: 174 + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } + } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 5140182b2c..6220ac0485 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,42 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eh") +@ObfuscatedName("ge") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgg;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("e") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1584172969 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1064061579 + intValue = 1974778043 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -178122101 + intValue = -537542863 ) @Export("y") int y; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1860163805 + intValue = 987855995 ) @Export("z") int z; - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -525129943 + intValue = -1799823947 ) @Export("magnitude") int magnitude; @@ -48,7 +36,7 @@ public class VertexNormal { } // L: 9 @ObfuscatedSignature( - descriptor = "(Leh;)V" + descriptor = "(Lge;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; // L: 12 @@ -57,62 +45,31 @@ public class VertexNormal { this.magnitude = var1.magnitude; // L: 15 } // L: 16 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BI)Ljava/lang/String;", - garbageValue = "1971758922" + descriptor = "(Lir;Lir;S)V", + garbageValue = "6851" ) - public static String method3163(byte[] var0) { - int var2 = var0.length; // L: 59 - StringBuilder var3 = new StringBuilder(); // L: 61 - - for (int var4 = 0; var4 < var2 + 0; var4 += 3) { // L: 62 - int var5 = var0[var4] & 255; // L: 63 - var3.append(class300.field3688[var5 >>> 2]); // L: 64 - if (var4 < var2 - 1) { // L: 65 - int var6 = var0[var4 + 1] & 255; // L: 66 - var3.append(class300.field3688[(var5 & 3) << 4 | var6 >>> 4]); // L: 67 - if (var4 < var2 - 2) { // L: 68 - int var7 = var0[var4 + 2] & 255; // L: 69 - var3.append(class300.field3688[(var6 & 15) << 2 | var7 >>> 6]).append(class300.field3688[var7 & 63]); // L: 70 - } else { - var3.append(class300.field3688[(var6 & 15) << 2]).append("="); // L: 72 - } - } else { - var3.append(class300.field3688[(var5 & 3) << 4]).append("=="); // L: 74 - } - } - - String var1 = var3.toString(); // L: 76 - return var1; // L: 78 - } + public static void method3782(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 30 + HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; // L: 31 + } // L: 32 @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-1881073597" + descriptor = "(Lir;II)Low;", + garbageValue = "577836402" ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; // L: 141 - int var4 = 0; // L: 142 - - for (int var5 = 0; var5 < var2; ++var5) { // L: 143 - int var6 = var0[var5 + var1] & 255; // L: 144 - if (var6 != 0) { // L: 145 - if (var6 >= 128 && var6 < 160) { // L: 146 - char var7 = class298.cp1252AsciiExtension[var6 - 128]; // L: 147 - if (var7 == 0) { // L: 148 - var7 = '?'; - } - - var6 = var7; // L: 149 - } - - var3[var4++] = (char)var6; // L: 151 - } + public static IndexedSprite method3783(AbstractArchive var0, int var1) { + byte[] var3 = var0.takeFileFlat(var1); // L: 190 + boolean var2; + if (var3 == null) { // L: 191 + var2 = false; // L: 192 + } else { + class244.SpriteBuffer_decode(var3); // L: 195 + var2 = true; // L: 196 } - return new String(var3, 0, var4); // L: 153 + return !var2 ? null : ArchiveLoader.method2076(); // L: 198 199 } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 84dad54283..880f6fb025 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -4,51 +4,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("kf") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lkf;" ) - field3236(0, 0), - @ObfuscatedName("v") + field3517(1, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lkf;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(2, 1), - @ObfuscatedName("d") + VerticalAlignment_centered(0, 1), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lkf;" ) - field3234(1, 2); + field3514(2, 2); - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -876494083 + intValue = 5650729 ) @Export("value") public final int value; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 405688727 + intValue = -974816521 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; // L: 18 - this.id = var4; // L: 19 - } // L: 20 + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; // L: 23 + return this.id; // L: 19 } + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1799855349" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + Client.menuOptionsCount = 0; // L: 7769 + Client.isMenuOpen = false; // L: 7770 + Client.menuActions[0] = "Cancel"; // L: 7772 + Client.menuTargets[0] = ""; // L: 7773 + Client.menuOpcodes[0] = 1006; // L: 7774 + Client.menuShiftClick[0] = false; // L: 7775 + Client.menuOptionsCount = 1; // L: 7776 + } // L: 7777 } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index a33e4cf20f..2ff54f305c 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -2,59 +2,52 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("gj") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("ViewportMouse_isInViewport") public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -174867873 + intValue = -108577355 ) @Export("ViewportMouse_x") - static int ViewportMouse_x; - @ObfuscatedName("d") + public static int ViewportMouse_x; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1503136055 + intValue = 463191059 ) @Export("ViewportMouse_y") - static int ViewportMouse_y; - @ObfuscatedName("c") + public static int ViewportMouse_y; + @ObfuscatedName("p") @Export("ViewportMouse_false0") - static boolean ViewportMouse_false0; - @ObfuscatedName("y") + public static boolean ViewportMouse_false0; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1632949407 + intValue = -1570054271 ) - static int field1757; - @ObfuscatedName("e") + static int field2135; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1445923815 + intValue = -1844660953 ) - static int field1758; - @ObfuscatedName("q") + static int field2136; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -822732275 + intValue = 809710403 ) - static int field1759; - @ObfuscatedName("w") + static int field2137; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1825654461 + intValue = -131115169 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive9") - static Archive archive9; static { ViewportMouse_isInViewport = false; // L: 4 @@ -64,65 +57,4 @@ public class ViewportMouse { ViewportMouse_entityCount = 0; // L: 17 ViewportMouse_entityTags = new long[1000]; // L: 18 } - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "598296470" - ) - static int method3161() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1399 - int var0 = 0; // L: 1400 - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1401 - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1402 - } - - return var0 * 10000 / Client.field934; // L: 1404 - } else { - return 10000; - } - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "(IZZZI)Liy;", - garbageValue = "1822401208" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; // L: 1789 - if (JagexCache.JagexCache_dat2File != null) { // L: 1790 - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, WorldMapEvent.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, WorldMapScaleHandler.masterDisk, var0, var1, var2, var3); // L: 1791 - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1069741089" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (WorldMapCacheName.loadInterface(var0)) { // L: 9381 - WorldMapAreaData.field362 = null; // L: 9388 - class41.drawInterface(DefaultsGroup.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9389 - if (WorldMapAreaData.field362 != null) { // L: 9390 - class41.drawInterface(WorldMapAreaData.field362, -1412584499, var1, var2, var3, var4, WorldMapIcon_1.field218, GrandExchangeOfferOwnWorldComparator.field656, var7); // L: 9391 - WorldMapAreaData.field362 = null; // L: 9392 - } - - } else { - if (var7 != -1) { // L: 9382 - Client.field816[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { // L: 9384 - Client.field816[var8] = true; - } - } - - } - } // L: 9386 9394 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index ab703237e5..2701ccd00c 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,23 +2,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dd") +@ObfuscatedName("bo") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("dimensions") int dimensions; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("entries") int entries; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("c") - int[] field1359; - @ObfuscatedName("y") - float[][] field1358; - @ObfuscatedName("h") + @ObfuscatedName("p") + int[] field461; + @ObfuscatedName("b") + float[][] field466; + @ObfuscatedName("e") @Export("keys") int[] keys; @@ -35,7 +35,7 @@ public class VorbisCodebook { var2 = 0; // L: 28 for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 - int var4 = VorbisSample.readBits(Coord.iLog(this.entries - var2)); // L: 31 + int var4 = VorbisSample.readBits(GrandExchangeEvent.iLog(this.entries - var2)); // L: 31 for (var5 = 0; var5 < var4; ++var5) { // L: 32 this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2524(); // L: 43 + this.method1067(); // L: 43 var2 = VorbisSample.readBits(4); // L: 44 if (var2 > 0) { // L: 45 float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 @@ -67,14 +67,14 @@ public class VorbisCodebook { var7 = this.entries * this.dimensions; // L: 52 } - this.field1359 = new int[var7]; // L: 53 + this.field461 = new int[var7]; // L: 53 int var8; for (var8 = 0; var8 < var7; ++var8) { // L: 54 - this.field1359[var8] = VorbisSample.readBits(var5); + this.field461[var8] = VorbisSample.readBits(var5); } - this.field1358 = new float[this.entries][this.dimensions]; // L: 55 + this.field466 = new float[this.entries][this.dimensions]; // L: 55 float var9; int var10; int var11; @@ -85,8 +85,8 @@ public class VorbisCodebook { for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 int var12 = var8 / var10 % var7; // L: 61 - float var13 = (float)this.field1359[var12] * var16 + var15 + var9; // L: 62 - this.field1358[var8][var11] = var13; // L: 63 + float var13 = (float)this.field461[var12] * var16 + var15 + var9; // L: 62 + this.field466[var8][var11] = var13; // L: 63 if (var6) { // L: 64 var9 = var13; } @@ -100,8 +100,8 @@ public class VorbisCodebook { var10 = var8 * this.dimensions; // L: 72 for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 - float var17 = (float)this.field1359[var10] * var16 + var15 + var9; // L: 74 - this.field1358[var8][var11] = var17; // L: 75 + float var17 = (float)this.field461[var10] * var16 + var15 + var9; // L: 74 + this.field466[var8][var11] = var17; // L: 75 if (var6) { // L: 76 var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } // L: 82 - @ObfuscatedName("v") - void method2524() { + @ObfuscatedName("o") + void method1067() { int[] var1 = new int[this.entries]; // L: 85 int[] var2 = new int[33]; // L: 87 @@ -208,8 +208,8 @@ public class VorbisCodebook { } // L: 148 - @ObfuscatedName("d") - int method2510() { + @ObfuscatedName("u") + int method1068() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 } @@ -217,16 +217,16 @@ public class VorbisCodebook { return ~this.keys[var1]; // L: 153 } - @ObfuscatedName("c") - float[] method2511() { - return this.field1358[this.method2510()]; // L: 157 + @ObfuscatedName("p") + float[] method1069() { + return this.field466[this.method1068()]; // L: 157 } - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class39.method644(var2, var1) > var0; --var2) { // L: 16 17 + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; Skeleton.method3431(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 40e8d79ec2..a4ce72d10a 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,43 +2,43 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dj") +@ObfuscatedName("ae") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("n") - static final int[] field1411; - @ObfuscatedName("v") + @ObfuscatedName("f") + static final int[] field381; + @ObfuscatedName("o") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; + @ObfuscatedName("n") + static int[] field383; @ObfuscatedName("l") - static int[] field1415; - @ObfuscatedName("s") - static int[] field1405; - @ObfuscatedName("b") - static boolean[] field1416; - @ObfuscatedName("d") - int[] field1407; - @ObfuscatedName("c") + static int[] field374; + @ObfuscatedName("m") + static boolean[] field385; + @ObfuscatedName("u") + int[] field376; + @ObfuscatedName("p") @Export("multiplier") int multiplier; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("subclassBooks") int[][] subclassBooks; static { - field1411 = new int[]{256, 128, 86, 64}; // L: 8 + field381 = new int[]{256, 128, 86, 64}; // L: 8 VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9 } @@ -92,30 +92,30 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field1407 = new int[var5]; // L: 137 - this.field1407[0] = 0; // L: 138 - this.field1407[1] = 1 << var4; // L: 139 + this.field376 = new int[var5]; // L: 137 + this.field376[0] = 0; // L: 138 + this.field376[1] = 1 << var4; // L: 139 var5 = 2; // L: 140 for (var6 = 0; var6 < var2; ++var6) { // L: 141 var7 = this.partitionClassList[var6]; // L: 142 for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 - this.field1407[var5++] = VorbisSample.readBits(var4); + this.field376[var5++] = VorbisSample.readBits(var4); } } - if (field1415 == null || field1415.length < var5) { // L: 145 - field1415 = new int[var5]; // L: 146 - field1405 = new int[var5]; // L: 147 - field1416 = new boolean[var5]; // L: 148 + if (field383 == null || field383.length < var5) { // L: 145 + field383 = new int[var5]; // L: 146 + field374 = new int[var5]; // L: 147 + field385 = new boolean[var5]; // L: 148 } } } // L: 150 - @ObfuscatedName("d") - int method2586(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("u") + int method786(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; // L: 50 int var7 = var3 - var1; // L: 51 int var8 = var6 < 0 ? -var6 : var6; // L: 52 @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("c") - void method2606(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("p") + void method787(int var1, int var2, int var3, int var4, float[] var5, int var6) { int var7 = var4 - var2; // L: 59 int var8 = var3 - var1; // L: 60 int var9 = var7 < 0 ? -var7 : var7; // L: 61 @@ -153,54 +153,54 @@ public class VorbisFloor { } // L: 80 - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { // L: 83 int var3 = var1; // L: 84 - int var4 = field1415[var1]; // L: 85 - int var5 = field1405[var1]; // L: 86 - boolean var6 = field1416[var1]; // L: 87 + int var4 = field383[var1]; // L: 85 + int var5 = field374[var1]; // L: 86 + boolean var6 = field385[var1]; // L: 87 for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 - int var8 = field1415[var7]; // L: 89 + int var8 = field383[var7]; // L: 89 if (var8 < var4) { // L: 90 - field1415[var3] = var8; // L: 91 - field1405[var3] = field1405[var7]; // L: 92 - field1416[var3] = field1416[var7]; // L: 93 + field383[var3] = var8; // L: 91 + field374[var3] = field374[var7]; // L: 92 + field385[var3] = field385[var7]; // L: 93 ++var3; // L: 94 - field1415[var7] = field1415[var3]; // L: 95 - field1405[var7] = field1405[var3]; // L: 96 - field1416[var7] = field1416[var3]; // L: 97 + field383[var7] = field383[var3]; // L: 95 + field374[var7] = field374[var3]; // L: 96 + field385[var7] = field385[var3]; // L: 97 } } - field1415[var3] = var4; // L: 100 - field1405[var3] = var5; // L: 101 - field1416[var3] = var6; // L: 102 + field383[var3] = var4; // L: 100 + field374[var3] = var5; // L: 101 + field385[var3] = var6; // L: 102 this.VarbisFloor_sort(var1, var3 - 1); // L: 103 this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } } // L: 105 - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; // L: 153 if (!var1) { // L: 154 return false; } else { - int var2 = this.field1407.length; // L: 155 + int var2 = this.field376.length; // L: 155 int var3; for (var3 = 0; var3 < var2; ++var3) { // L: 156 - field1415[var3] = this.field1407[var3]; + field383[var3] = this.field376[var3]; } - var3 = field1411[this.multiplier - 1]; // L: 157 - int var4 = Coord.iLog(var3 - 1); // L: 158 - field1405[0] = VorbisSample.readBits(var4); // L: 159 - field1405[1] = VorbisSample.readBits(var4); // L: 160 + var3 = field381[this.multiplier - 1]; // L: 157 + int var4 = GrandExchangeEvent.iLog(var3 - 1); // L: 158 + field374[0] = VorbisSample.readBits(var4); // L: 159 + field374[1] = VorbisSample.readBits(var4); // L: 160 int var5 = 2; // L: 161 for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 @@ -210,13 +210,13 @@ public class VorbisFloor { int var10 = (1 << var9) - 1; // L: 166 int var11 = 0; // L: 167 if (var9 > 0) { // L: 168 - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2510(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1068(); } for (int var12 = 0; var12 < var8; ++var12) { // L: 169 int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 var11 >>>= var9; // L: 171 - field1405[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2510() : 0; // L: 172 + field374[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1068() : 0; // L: 172 } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("z") - void method2590(float[] var1, int var2) { - int var3 = this.field1407.length; // L: 179 - int var4 = field1411[this.multiplier - 1]; // L: 180 - boolean[] var5 = field1416; // L: 181 - field1416[1] = true; // L: 182 + @ObfuscatedName("k") + void method790(float[] var1, int var2) { + int var3 = this.field376.length; // L: 179 + int var4 = field381[this.multiplier - 1]; // L: 180 + boolean[] var5 = field385; // L: 181 + field385[1] = true; // L: 182 var5[0] = true; // L: 183 int var6; @@ -238,37 +238,37 @@ public class VorbisFloor { int var9; int var10; for (var6 = 2; var6 < var3; ++var6) { // L: 184 - var7 = method2602(field1415, var6); // L: 185 - var8 = method2600(field1415, var6); // L: 186 - var9 = this.method2586(field1415[var7], field1405[var7], field1415[var8], field1405[var8], field1415[var6]); // L: 187 - var10 = field1405[var6]; // L: 188 + var7 = method801(field383, var6); // L: 185 + var8 = method795(field383, var6); // L: 186 + var9 = this.method786(field383[var7], field374[var7], field383[var8], field374[var8], field383[var6]); // L: 187 + var10 = field374[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 = field1416; // L: 193 - field1416[var8] = true; // L: 195 + boolean[] var14 = field385; // L: 193 + field385[var8] = true; // L: 195 var14[var7] = true; // L: 196 - field1416[var6] = true; // L: 197 + field385[var6] = true; // L: 197 if (var10 >= var13) { // L: 198 - field1405[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 + field374[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field1405[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 + field374[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field1416[var6] = false; // L: 206 - field1405[var6] = var9; // L: 207 + field385[var6] = false; // L: 206 + field374[var6] = var9; // L: 207 } } this.VarbisFloor_sort(0, var3 - 1); // L: 210 var6 = 0; // L: 211 - var7 = field1405[0] * this.multiplier; // L: 212 + var7 = field374[0] * this.multiplier; // L: 212 for (var8 = 1; var8 < var3; ++var8) { // L: 213 - if (field1416[var8]) { // L: 214 - var9 = field1415[var8]; // L: 215 - var10 = field1405[var8] * this.multiplier; // L: 216 - this.method2606(var6, var7, var9, var10, var1, var2); // L: 217 + if (field385[var8]) { // L: 214 + var9 = field383[var8]; // L: 215 + var10 = field374[var8] * this.multiplier; // L: 216 + this.method787(var6, var7, var9, var10, var1, var2); // L: 217 if (var9 >= var2) { // L: 218 return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } // L: 225 - @ObfuscatedName("n") - static int method2602(int[] var0, int var1) { + @ObfuscatedName("f") + static int method801(int[] var0, int var1) { int var2 = var0[var1]; // L: 22 int var3 = -1; // L: 23 int var4 = Integer.MIN_VALUE; // L: 24 @@ -303,8 +303,8 @@ public class VorbisFloor { return var3; // L: 32 } - @ObfuscatedName("v") - static int method2600(int[] var0, int var1) { + @ObfuscatedName("o") + static int method795(int[] var0, int var1) { int var2 = var0[var1]; // L: 36 int var3 = -1; // L: 37 int var4 = Integer.MAX_VALUE; // L: 38 diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index 44fd113cc7..aa18b8031a 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,19 +2,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dz") +@ObfuscatedName("ba") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("submaps") int submaps; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("mappingMux") int mappingMux; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index f1c030c98e..f842e532bb 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,28 +2,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dc") +@ObfuscatedName("bb") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("residueType") int residueType; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("begin") int begin; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("end") int end; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("partitionSize") int partitionSize; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("classifications") int classifications; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("classbook") int classbook; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } // L: 31 - @ObfuscatedName("n") - void method2696(float[] var1, int var2, boolean var3) { + @ObfuscatedName("f") + void method891(float[] var1, int var2, boolean var3) { int var4; for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; @@ -76,7 +76,7 @@ public class VorbisResidue { int var10; int var11; if (var8 == 0) { // L: 43 - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2510(); // L: 45 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1068(); // L: 45 for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 if (var9 + var11 < var6) { // L: 47 @@ -98,7 +98,7 @@ public class VorbisResidue { var15 = this.partitionSize / var14.dimensions; // L: 60 for (int var19 = 0; var19 < var15; ++var19) { // L: 61 - float[] var20 = var14.method2511(); // L: 62 + float[] var20 = var14.method1069(); // L: 62 for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 var1[var13 + var19 + var18 * var15] += var20[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; // L: 67 while (var15 < this.partitionSize) { // L: 68 - float[] var16 = var14.method2511(); // L: 69 + float[] var16 = var14.method1069(); // L: 69 for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 var1[var13 + var15] += var16[var17]; // L: 71 diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index ce82e9c3d9..e6f486df18 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,115 +3,115 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("bp") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("l") + @ObfuscatedName("n") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "[Ldd;" + descriptor = "[Lbo;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Ldj;" + descriptor = "[Lae;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "[Ldc;" + descriptor = "[Lbb;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Ldz;" + descriptor = "[Lba;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("x") + @ObfuscatedName("q") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("f") - static boolean field1397; - @ObfuscatedName("m") - static float[] field1391; - @ObfuscatedName("r") - static float[] field1389; - @ObfuscatedName("o") - static float[] field1388; - @ObfuscatedName("j") - static float[] field1382; - @ObfuscatedName("ay") - static float[] field1392; - @ObfuscatedName("am") - static float[] field1383; - @ObfuscatedName("ag") - static float[] field1394; - @ObfuscatedName("ae") - static int[] field1375; + @ObfuscatedName("t") + static boolean field481; + @ObfuscatedName("a") + static float[] field489; + @ObfuscatedName("w") + static float[] field490; + @ObfuscatedName("s") + static float[] field491; + @ObfuscatedName("y") + static float[] field484; @ObfuscatedName("ac") - static int[] field1396; - @ObfuscatedName("n") - byte[][] field1370; - @ObfuscatedName("v") + static float[] field482; + @ObfuscatedName("ay") + static float[] field494; + @ObfuscatedName("am") + static float[] field495; + @ObfuscatedName("ag") + static int[] field496; + @ObfuscatedName("aq") + static int[] field497; + @ObfuscatedName("f") + byte[][] field498; + @ObfuscatedName("o") @Export("sampleRate") int sampleRate; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("sampleCount") int sampleCount; - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("start") int start; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("end") int end; - @ObfuscatedName("h") - boolean field1371; - @ObfuscatedName("g") - float[] field1384; - @ObfuscatedName("u") - int field1385; - @ObfuscatedName("t") - int field1386; - @ObfuscatedName("p") - boolean field1393; - @ObfuscatedName("aq") + @ObfuscatedName("e") + boolean field472; + @ObfuscatedName("v") + float[] field474; + @ObfuscatedName("x") + int field486; + @ObfuscatedName("z") + int field487; + @ObfuscatedName("i") + boolean field488; + @ObfuscatedName("at") @Export("samples") byte[] samples; - @ObfuscatedName("at") - int field1398; - @ObfuscatedName("ak") - int field1399; + @ObfuscatedName("aj") + int field499; + @ObfuscatedName("aw") + int field492; static { - field1397 = false; // L: 28 + field481 = false; // L: 28 } VorbisSample(byte[] var1) { this.read(var1); // L: 417 } // L: 418 - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("read") void read(byte[] var1) { Buffer var2 = new Buffer(var1); // L: 89 @@ -121,11 +121,11 @@ public class VorbisSample extends Node { this.end = var2.readInt(); // L: 93 if (this.end < 0) { // L: 94 this.end = ~this.end; // L: 95 - this.field1371 = true; // L: 96 + this.field472 = true; // L: 96 } int var3 = var2.readInt(); // L: 98 - this.field1370 = new byte[var3][]; // L: 99 + this.field498 = new byte[var3][]; // L: 99 for (int var4 = 0; var4 < var3; ++var4) { // L: 100 int var5 = 0; // L: 101 @@ -138,16 +138,16 @@ public class VorbisSample extends Node { byte[] var7 = new byte[var5]; // L: 107 var2.readBytes(var7, 0, var5); // L: 108 - this.field1370[var4] = var7; // L: 109 + this.field498[var4] = var7; // L: 109 } } // L: 111 - @ObfuscatedName("z") - float[] method2562(int var1) { - VorbisSample_setData(this.field1370[var1], 0); // L: 198 + @ObfuscatedName("k") + float[] method1104(int var1) { + VorbisSample_setData(this.field498[var1], 0); // L: 198 readBit(); // L: 199 - int var2 = readBits(Coord.iLog(VorbisSample_mapping.length - 1)); // L: 200 + int var2 = readBits(GrandExchangeEvent.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 @@ -192,27 +192,27 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244 VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245 - float[] var44 = field1391; // L: 246 - var42.method2696(var44, var4 >> 1, var45); // L: 247 + float[] var44 = field489; // L: 246 + var42.method891(var44, var4 >> 1, var45); // L: 247 } int var18; if (!var15) { // L: 250 var17 = var14.mappingMux; // L: 251 var18 = var14.submapFloor[var17]; // L: 252 - VorbisSample_floors[var18].method2590(field1391, var4 >> 1); // L: 253 + VorbisSample_floors[var18].method790(field489, var4 >> 1); // L: 253 } int var19; if (var15) { // L: 256 for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257 - field1391[var17] = 0.0F; + field489[var17] = 0.0F; } } else { var17 = var4 >> 1; // L: 260 var18 = var4 >> 2; // L: 261 var19 = var4 >> 3; // L: 262 - float[] var20 = field1391; // L: 263 + float[] var20 = field489; // L: 263 int var21; for (var21 = 0; var21 < var17; ++var21) { // L: 264 @@ -223,10 +223,10 @@ public class VorbisSample extends Node { var20[var21] = -var20[var4 - var21 - 1]; } - float[] var40 = var3 ? field1392 : field1389; // L: 266 - float[] var22 = var3 ? field1383 : field1388; // L: 267 - float[] var23 = var3 ? field1394 : field1382; // L: 268 - int[] var24 = var3 ? field1396 : field1375; // L: 269 + float[] var40 = var3 ? field482 : field490; // L: 266 + float[] var22 = var3 ? field494 : field491; // L: 267 + float[] var23 = var3 ? field495 : field484; // L: 268 + int[] var24 = var3 ? field497 : field496; // L: 269 int var25; float var26; @@ -257,7 +257,7 @@ public class VorbisSample extends Node { var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288 } - var25 = Coord.iLog(var4 - 1); // L: 290 + var25 = GrandExchangeEvent.iLog(var4 - 1); // L: 290 int var46; int var47; @@ -357,49 +357,49 @@ public class VorbisSample extends Node { float[] var10000; for (var46 = var8; var46 < var9; ++var46) { // L: 361 var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362 - var10000 = field1391; // L: 363 + var10000 = field489; // L: 363 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } for (var46 = var11; var46 < var12; ++var46) { // L: 365 var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366 - var10000 = field1391; // L: 367 + var10000 = field489; // L: 367 var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } float[] var41 = null; // L: 370 - if (this.field1385 > 0) { // L: 371 - var18 = var4 + this.field1385 >> 2; // L: 372 + if (this.field486 > 0) { // L: 371 + var18 = var4 + this.field486 >> 2; // L: 372 var41 = new float[var18]; // L: 373 int var43; - if (!this.field1393) { // L: 374 - for (var19 = 0; var19 < this.field1386; ++var19) { // L: 375 - var43 = var19 + (this.field1385 >> 1); // L: 376 - var41[var19] += this.field1384[var43]; // L: 377 + if (!this.field488) { // L: 374 + for (var19 = 0; var19 < this.field487; ++var19) { // L: 375 + var43 = var19 + (this.field486 >> 1); // L: 376 + var41[var19] += this.field474[var43]; // L: 377 } } if (!var15) { // L: 380 for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381 var43 = var41.length - (var4 >> 1) + var19; // L: 382 - var41[var43] += field1391[var19]; // L: 383 + var41[var43] += field489[var19]; // L: 383 } } } - float[] var54 = this.field1384; // L: 387 - this.field1384 = field1391; // L: 388 - field1391 = var54; // L: 389 - this.field1385 = var4; // L: 390 - this.field1386 = var12 - (var4 >> 1); // L: 391 - this.field1393 = var15; // L: 392 + float[] var54 = this.field474; // L: 387 + this.field474 = field489; // L: 388 + field489 = var54; // L: 389 + this.field486 = var4; // L: 390 + this.field487 = var12 - (var4 >> 1); // L: 391 + this.field488 = var15; // L: 392 return var41; // L: 393 } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "([I)Ldm;" + descriptor = "([I)Lah;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { // L: 422 - this.field1385 = 0; // L: 423 - this.field1384 = new float[VorbisSample_blockSize1]; // L: 424 + this.field486 = 0; // L: 423 + this.field474 = new float[VorbisSample_blockSize1]; // L: 424 this.samples = new byte[this.sampleCount]; // L: 425 - this.field1398 = 0; // L: 426 - this.field1399 = 0; // L: 427 + this.field499 = 0; // L: 426 + this.field492 = 0; // L: 427 } - for (; this.field1399 < this.field1370.length; ++this.field1399) { // L: 429 444 + for (; this.field492 < this.field498.length; ++this.field492) { // L: 429 444 if (var1 != null && var1[0] <= 0) { // L: 430 return null; } - float[] var2 = this.method2562(this.field1399); // L: 431 + float[] var2 = this.method1104(this.field492); // L: 431 if (var2 != null) { // L: 432 - int var3 = this.field1398; // L: 433 + int var3 = this.field499; // L: 433 int var4 = var2.length; // L: 434 if (var4 > this.sampleCount - var3) { // L: 435 var4 = this.sampleCount - var3; @@ -437,21 +437,21 @@ public class VorbisSample extends Node { } if (var1 != null) { // L: 441 - var1[0] -= var3 - this.field1398; + var1[0] -= var3 - this.field499; } - this.field1398 = var3; // L: 442 + this.field499 = var3; // L: 442 } } - this.field1384 = null; // L: 446 + this.field474 = 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.field1371); // L: 449 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field472); // L: 449 } } - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("float32Unpack") static float float32Unpack(int var0) { int var1 = var0 & 2097151; // L: 47 @@ -464,7 +464,7 @@ public class VorbisSample extends Node { return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { VorbisSample_bytes = var0; // L: 55 @@ -472,7 +472,7 @@ public class VorbisSample extends Node { VorbisSample_bitOffset = 0; // L: 57 } // L: 58 - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("readBit") static int readBit() { int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 @@ -482,7 +482,7 @@ public class VorbisSample extends Node { return var0; // L: 65 } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("readBits") static int readBits(int var0) { int var1 = 0; // L: 69 @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; // L: 85 } - @ObfuscatedName("h") - static void method2538(byte[] var0) { + @ObfuscatedName("e") + static void method1081(byte[] var0) { VorbisSample_setData(var0, 0); // L: 114 VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 - field1391 = new float[VorbisSample_blockSize1]; // L: 117 + field489 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; @@ -546,7 +546,7 @@ public class VorbisSample extends Node { } int[] var21 = new int[var5]; // L: 138 - int var10 = Coord.iLog(var5 - 1); // L: 139 + int var10 = GrandExchangeEvent.iLog(var5 - 1); // L: 139 for (int var11 = 0; var11 < var5; ++var11) { // L: 140 int var15 = var11; // L: 144 @@ -562,15 +562,15 @@ public class VorbisSample extends Node { } if (var1 != 0) { // L: 157 - field1392 = var18; // L: 158 - field1383 = var19; // L: 159 - field1394 = var20; // L: 160 - field1396 = var21; // L: 161 + field482 = var18; // L: 158 + field494 = var19; // L: 159 + field495 = var20; // L: 160 + field497 = var21; // L: 161 } else { - field1389 = var18; // L: 164 - field1388 = var19; // L: 165 - field1382 = var20; // L: 166 - field1375 = var21; // L: 167 + field490 = var18; // L: 164 + field491 = var19; // L: 165 + field484 = var20; // L: 166 + field496 = var21; // L: 167 } } @@ -621,31 +621,31 @@ public class VorbisSample extends Node { } // L: 195 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lig;)Z" + descriptor = "(Lir;)Z" ) - static boolean method2575(AbstractArchive var0) { - if (!field1397) { // L: 397 + static boolean method1078(AbstractArchive var0) { + if (!field481) { // L: 397 byte[] var1 = var0.takeFile(0, 0); // L: 398 if (var1 == null) { // L: 399 return false; } - method2538(var1); // L: 400 - field1397 = true; // L: 401 + method1081(var1); // L: 400 + field481 = true; // L: 401 } return true; // L: 403 } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lig;II)Ldl;" + descriptor = "(Lir;II)Lbp;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2575(var0)) { // L: 407 + if (!method1078(var0)) { // L: 407 var0.tryLoadFile(var1, var2); // L: 408 return null; // L: 409 } else { diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 03c490c575..0d53880063 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,145 +4,135 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("gh") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 964756049 + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lho;" ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("n") + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("ny") + @ObfuscatedSignature( + descriptor = "[Lhu;" + ) + static Widget[] field2179; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 719575047 + intValue = 1866984259 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -920611555 + intValue = -1233523215 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -730740551 + intValue = 1569724115 ) @Export("y") int y; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 333766323 + intValue = -1106091565 ) @Export("orientation") int orientation; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1617230319 + intValue = -790495867 ) @Export("orientation2") int orientation2; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2092861143 + intValue = 1527389689 ) @Export("xOffset") int xOffset; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1518269047 + intValue = 221325297 ) @Export("yOffset") int yOffset; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("renderable1") public Renderable renderable1; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lem;" + descriptor = "Lfm;" ) @Export("renderable2") public Renderable renderable2; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 1249498855339190201L + longValue = -7920256203386986359L ) @Export("tag") public long tag; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1390179163 + intValue = -1583095637 ) @Export("flags") int flags; WallDecoration() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 13 + this.flags = 0; // L: 14 + } // L: 16 - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "699816166" + descriptor = "(IIII)I", + garbageValue = "89979729" ) - public static String method3450(CharSequence var0) { - int var1 = var0.length(); // L: 11 - StringBuilder var2 = new StringBuilder(var1); // L: 12 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 13 - char var4 = var0.charAt(var3); // L: 14 - if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 - if (var4 == ' ') { // L: 16 - var2.append('+'); - } else { - byte var5 = LoginPacket.charToByteCp1252(var4); // L: 18 - var2.append('%'); // L: 19 - int var6 = var5 >> 4 & 15; // L: 20 - if (var6 >= 10) { // L: 21 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); // L: 22 - } - - var6 = var5 & 15; // L: 23 - if (var6 >= 10) { // L: 24 - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); // L: 25 - } + static int method3808(int var0, int var1, int var2) { + if (var2 > 179) { // L: 55 + var1 /= 2; } - return var2.toString(); // L: 28 + if (var2 > 192) { // L: 56 + var1 /= 2; + } + + if (var2 > 217) { // L: 57 + var1 /= 2; + } + + if (var2 > 243) { // L: 58 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 59 + return var3; // L: 60 } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(II)Ljo;", - garbageValue = "1862361389" + descriptor = "(I)[Lit;", + garbageValue = "-1357735054" ) - public static FloorOverlayDefinition method3449(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 30 - if (var1 != null) { // L: 31 - return var1; - } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 32 - var1 = new FloorOverlayDefinition(); // L: 33 - if (var2 != null) { // L: 34 - var1.decode(new Buffer(var2), var0); - } + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ironman, PlayerType.field3226, PlayerType.PlayerType_normal}; // L: 20 + } - var1.postDecode(); // L: 35 - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 36 - return var1; // L: 37 - } + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "-1850423672" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + return var1 && var0 >= 0 ? class44.method521(var0, 10, var1) : Integer.toString(var0); // L: 135 136 } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 2c7872f924..28cb384a90 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -3,682 +3,688 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hz") +@ObfuscatedName("hu") @Implements("Widget") public class Widget extends Node { @ObfuscatedName("e") - @Export("Widget_loadedInterfaces") - public static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("a") + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "[[Lhu;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgf;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("x") - public static boolean field2591; - @ObfuscatedName("f") + @ObfuscatedName("q") + public static boolean field2622; + @ObfuscatedName("t") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 584503877 + intValue = 516202957 ) @Export("id") public int id; - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -572555511 + intValue = 1704710587 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1058288237 + intValue = 812287217 ) @Export("type") public int type; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1437398639 + intValue = 930394621 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 950643501 + intValue = 2019337075 ) @Export("contentType") public int contentType; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1444067651 + intValue = 188435577 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 61587371 + intValue = -1709656523 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("j") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -748645369 + intValue = 728571695 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1468744315 + intValue = -745936495 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 103560479 + intValue = -350194089 ) @Export("rawX") public int rawX; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -519325005 + intValue = 990647639 ) @Export("rawY") public int rawY; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -76139235 + intValue = -787516857 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -776487251 + intValue = 1615336231 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("aq") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 858952753 + intValue = -722762479 ) @Export("x") public int x; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1333739283 + intValue = -1586546691 ) @Export("y") public int y; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1593306137 + intValue = 1340111239 ) @Export("width") public int width; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -937018705 + intValue = -834307829 ) @Export("height") public int height; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 2022992129 + intValue = -598841187 ) - public int field2610; - @ObfuscatedName("al") + public int field2614; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1312652811 + intValue = -365488349 ) - public int field2611; - @ObfuscatedName("aa") + public int field2642; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -624975397 + intValue = -1589172375 ) @Export("parentId") public int parentId; - @ObfuscatedName("as") + @ObfuscatedName("af") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("aw") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -963861053 + intValue = -1529220539 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1198753763 + intValue = 1431413215 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ah") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 262059497 + intValue = 1255368413 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("ap") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1576927071 + intValue = -639002299 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("aj") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 23277245 + intValue = -1774033701 ) @Export("color") public int color; - @ObfuscatedName("an") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -164131939 + intValue = -1100945301 ) @Export("color2") public int color2; - @ObfuscatedName("ai") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -71444347 + intValue = -1200561941 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("ab") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1701318471 + intValue = -160089127 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("fill") public boolean fill; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Lox;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("af") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -517594781 + intValue = -1037045283 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("av") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 703155759 + intValue = -1529069059 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ao") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -434003147 + intValue = -757656999 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bj") - public boolean field2627; - @ObfuscatedName("bn") + @ObfuscatedName("bh") + public boolean field2727; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1886053401 + intValue = 1779540973 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bi") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 506442589 + intValue = 718176713 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bp") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 302006269 + intValue = -609319985 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("br") + @ObfuscatedName("bb") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bq") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 790935343 + intValue = -1156505419 ) @Export("outline") public int outline; - @ObfuscatedName("bx") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -319259827 + intValue = -2056543533 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bc") + @ObfuscatedName("ba") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bw") + @ObfuscatedName("be") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bv") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1855366631 + intValue = 1125239001 ) @Export("modelType") public int modelType; - @ObfuscatedName("bt") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1644049389 + intValue = -1279491537 ) @Export("modelId") public int modelId; - @ObfuscatedName("bl") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 720841123 + intValue = 1632912361 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -376137673 + intValue = -1784046267 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bz") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1628856543 + intValue = 1638579631 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bg") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1256829773 + intValue = -440155799 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bm") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = -1988544673 + intValue = -1697744779 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bf") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1084480665 + intValue = 1772660447 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("be") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -253353483 + intValue = 32750401 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bs") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 324297009 + intValue = 1631404785 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("by") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1451560447 + intValue = -962772699 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bb") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = -1608940237 + intValue = -1961993049 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bd") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -830126165 + intValue = 1304752559 ) - public int field2648; - @ObfuscatedName("ba") + public int field2720; + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 539011583 + intValue = -556877877 ) - public int field2649; - @ObfuscatedName("bk") + public int field2680; + @ObfuscatedName("bu") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bu") + @ObfuscatedName("bl") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bo") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 565005291 + intValue = -1625407889 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cv") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 518745989 + intValue = 1150086731 ) @Export("fontId") public int fontId; - @ObfuscatedName("cd") + @ObfuscatedName("cf") @Export("text") public String text; - @ObfuscatedName("cq") + @ObfuscatedName("co") @Export("text2") public String text2; - @ObfuscatedName("cb") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -562457883 + intValue = 1148032829 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cf") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -1758780327 + intValue = -1334007947 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cp") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 849313675 + intValue = -283419665 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("ck") + @ObfuscatedName("ce") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cn") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1465907063 + intValue = -624611843 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cj") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1082787047 + intValue = 1918897871 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cr") + @ObfuscatedName("cn") @Export("inventoryXOffsets") public int[] inventoryXOffsets; @ObfuscatedName("ca") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cz") + @ObfuscatedName("ch") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cs") + @ObfuscatedName("cq") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ce") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 980328243 + intValue = -960682031 ) @Export("flags") public int flags; @ObfuscatedName("cu") - public boolean field2667; - @ObfuscatedName("ci") - public byte[][] field2668; + public boolean field2698; + @ObfuscatedName("cb") + public byte[][] field2699; + @ObfuscatedName("cv") + public byte[][] field2747; + @ObfuscatedName("cj") + public int[] field2701; @ObfuscatedName("cy") - public byte[][] field2669; - @ObfuscatedName("cx") - public int[] field2686; - @ObfuscatedName("cg") - public int[] field2599; - @ObfuscatedName("dx") + public int[] field2692; + @ObfuscatedName("ci") @Export("dataText") public String dataText; - @ObfuscatedName("do") + @ObfuscatedName("cm") @Export("actions") public String[] actions; - @ObfuscatedName("du") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lhu;" ) @Export("parent") public Widget parent; - @ObfuscatedName("di") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = 886736563 + intValue = 2060963123 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dk") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = 997775527 + intValue = -1057442763 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dd") + @ObfuscatedName("dy") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("db") + @ObfuscatedName("dg") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dl") + @ObfuscatedName("dq") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dm") + @ObfuscatedName("dl") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dj") + @ObfuscatedName("dc") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dh") + @ObfuscatedName("dn") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("ds") + @ObfuscatedName("de") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dp") + @ObfuscatedName("da") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dy") + @ObfuscatedName("dz") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dv") + @ObfuscatedName("dr") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("dr") + @ObfuscatedName("dh") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dc") + @ObfuscatedName("du") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dq") + @ObfuscatedName("di") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dt") + @ObfuscatedName("dp") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("de") + @ObfuscatedName("db") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dw") + @ObfuscatedName("ds") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dz") + @ObfuscatedName("dv") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dg") + @ObfuscatedName("dk") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dn") + @ObfuscatedName("df") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("da") + @ObfuscatedName("dx") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("df") + @ObfuscatedName("dj") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ek") + @ObfuscatedName("dt") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("eo") + @ObfuscatedName("dd") @Export("onOp") public Object[] onOp; - @ObfuscatedName("en") + @ObfuscatedName("dw") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("ep") + @ObfuscatedName("ec") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("eg") + @ObfuscatedName("ek") @Export("onKey") public Object[] onKey; - @ObfuscatedName("es") + @ObfuscatedName("ei") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ef") + @ObfuscatedName("ep") @Export("onClanTransmit") public Object[] onClanTransmit; + @ObfuscatedName("et") + public Object[] field2736; + @ObfuscatedName("el") + public Object[] field2655; @ObfuscatedName("eb") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("eh") + @ObfuscatedName("eg") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("et") + @ObfuscatedName("em") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ec") + @ObfuscatedName("eh") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ev") + @ObfuscatedName("ey") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("eq") - public Object[] field2678; - @ObfuscatedName("ey") + @ObfuscatedName("eu") + public Object[] field2743; + @ObfuscatedName("en") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("em") + @ObfuscatedName("eq") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ee") + @ObfuscatedName("ew") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("er") + @ObfuscatedName("ez") @ObfuscatedGetter( - intValue = 1386091893 + intValue = -1860696897 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("el") + @ObfuscatedName("ef") @Export("spellName") public String spellName; - @ObfuscatedName("ew") + @ObfuscatedName("ev") @Export("buttonText") public String buttonText; - @ObfuscatedName("ea") + @ObfuscatedName("er") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("eu") + @ObfuscatedName("es") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ej") + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = 1781492575 + intValue = 830132731 ) @Export("itemId") public int itemId; @ObfuscatedName("ed") @ObfuscatedGetter( - intValue = 717373231 + intValue = 1175523821 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ei") + @ObfuscatedName("ee") @ObfuscatedGetter( - intValue = -1513891293 + intValue = -972274073 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ex") + @ObfuscatedName("eo") @ObfuscatedGetter( - intValue = 1411252919 + intValue = -1021336893 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ez") + @ObfuscatedName("ej") @ObfuscatedSignature( - descriptor = "[Lhz;" + descriptor = "[Lhu;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fi") + @ObfuscatedName("ea") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fa") + @ObfuscatedName("fi") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fh") + @ObfuscatedName("fy") @ObfuscatedGetter( - intValue = 1159743735 + intValue = -149116897 ) - public int field2719; - @ObfuscatedName("ft") + public int field2759; + @ObfuscatedName("fo") @ObfuscatedGetter( - intValue = 1951762573 + intValue = 1251998105 ) - public int field2727; - @ObfuscatedName("fb") + public int field2760; + @ObfuscatedName("fe") @ObfuscatedGetter( - intValue = 2104952635 + intValue = -1199991373 ) - public int field2728; - @ObfuscatedName("fs") + public int field2748; + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = -1295480183 + intValue = 290924521 ) - public int field2729; - @ObfuscatedName("fq") + public int field2754; + @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = -1168412841 + intValue = 738866907 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fn") + @ObfuscatedName("fl") @ObfuscatedGetter( - intValue = 1829947671 + intValue = 11649141 ) @Export("cycle") public int cycle; - @ObfuscatedName("fc") - public int[] field2660; - @ObfuscatedName("fg") + @ObfuscatedName("fv") + public int[] field2653; + @ObfuscatedName("fr") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fv") + @ObfuscatedName("fw") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fy") + @ObfuscatedName("fp") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; @@ -687,7 +693,7 @@ public class Widget extends Node { Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32 Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33 Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34 - field2591 = false; // L: 35 + field2622 = false; // L: 35 } public Widget() { @@ -706,27 +712,27 @@ public class Widget extends Node { 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.field2610 = 1; // L: 54 - this.field2611 = 1; // L: 55 - this.parentId = -1; // L: 56 - this.isHidden = false; // L: 57 - this.scrollX = 0; // L: 58 - this.scrollY = 0; // L: 59 + this.width = 0; + this.height = 0; + this.field2614 = 1; + this.field2642 = 1; // L: 55 + this.parentId = -1; + this.isHidden = false; + this.scrollX = 0; + this.scrollY = 0; 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.scrollHeight = 0; + this.color = 0; + this.color2 = 0; + this.mouseOverColor = 0; 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.fill = false; + this.fillMode = FillMode.SOLID; + this.transparencyTop = 0; + this.transparencyBot = 0; this.lineWid = 1; // L: 70 - this.field2627 = false; // L: 71 - this.spriteId2 = -1; // L: 72 + this.field2727 = false; // L: 71 + this.spriteId2 = -1; this.spriteId = -1; // L: 73 this.spriteAngle = 0; // L: 74 this.spriteTiling = false; // L: 75 @@ -744,8 +750,8 @@ public class Widget extends Node { this.modelAngleY = 0; // L: 89 this.modelAngleZ = 0; // L: 90 this.modelZoom = 100; // L: 91 - this.field2648 = 0; // L: 92 - this.field2649 = 0; // L: 93 + this.field2720 = 0; // L: 92 + this.field2680 = 0; // L: 93 this.modelOrthog = false; // L: 94 this.modelTransparency = false; // L: 95 this.itemQuantityMode = 2; // L: 96 @@ -759,7 +765,7 @@ public class Widget extends Node { this.paddingX = 0; // L: 104 this.paddingY = 0; // L: 105 this.flags = 0; // L: 110 - this.field2667 = false; // L: 111 + this.field2698 = false; // L: 111 this.dataText = ""; // L: 120 this.parent = null; // L: 122 this.dragZoneSize = 0; // L: 123 @@ -767,632 +773,599 @@ public class Widget extends Node { this.isScrollBar = false; // L: 125 this.spellActionName = ""; // L: 126 this.hasListener = false; // L: 127 - this.mouseOverRedirect = -1; // L: 162 - this.spellName = ""; // L: 163 - this.buttonText = "Ok"; // L: 164 - this.itemId = -1; // L: 167 - this.itemQuantity = 0; // L: 168 - this.modelFrame = 0; // L: 169 - this.modelFrameCycle = 0; // L: 170 - this.containsMouse = false; // L: 172 - this.isClicked = false; // L: 173 - this.field2719 = -1; // L: 174 - this.field2727 = 0; // L: 175 - this.field2728 = 0; // L: 176 - this.field2729 = 0; // L: 177 - this.rootIndex = -1; // L: 178 - this.cycle = -1; // L: 179 - this.noClickThrough = false; // L: 181 - this.noScrollThrough = false; // L: 182 - this.prioritizeMenuEntry = false; // L: 183 - } // L: 737 + this.mouseOverRedirect = -1; // L: 164 + this.spellName = ""; // L: 165 + this.buttonText = "Ok"; // L: 166 + this.itemId = -1; // L: 169 + this.itemQuantity = 0; // L: 170 + this.modelFrame = 0; // L: 171 + this.modelFrameCycle = 0; // L: 172 + this.containsMouse = false; // L: 174 + this.isClicked = false; // L: 175 + this.field2759 = -1; // L: 176 + this.field2760 = 0; // L: 177 + this.field2748 = 0; // L: 178 + this.field2754 = 0; // L: 179 + this.rootIndex = -1; // L: 180 + this.cycle = -1; // L: 181 + this.noClickThrough = false; // L: 183 + this.noScrollThrough = false; // L: 184 + this.prioritizeMenuEntry = false; // L: 185 + } // L: 707 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "14" + descriptor = "(Lnu;B)V", + garbageValue = "4" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { - this.isIf3 = false; // L: 236 - this.type = var1.readUnsignedByte(); // L: 237 - this.buttonType = var1.readUnsignedByte(); // L: 238 - this.contentType = var1.readUnsignedShort(); // L: 239 - this.rawX = var1.readShort(); // L: 240 - this.rawY = var1.readShort(); // L: 241 - this.rawWidth = var1.readUnsignedShort(); // L: 242 - this.rawHeight = var1.readUnsignedShort(); // L: 243 - this.transparencyTop = var1.readUnsignedByte(); // L: 244 - this.parentId = var1.readUnsignedShort(); // L: 245 - if (this.parentId == 65535) { // L: 246 + this.isIf3 = false; // L: 245 + this.type = var1.readUnsignedByte(); // L: 246 + this.buttonType = var1.readUnsignedByte(); // L: 247 + this.contentType = var1.readUnsignedShort(); // L: 248 + this.rawX = var1.readShort(); // L: 249 + this.rawY = var1.readShort(); // L: 250 + this.rawWidth = var1.readUnsignedShort(); // L: 251 + this.rawHeight = var1.readUnsignedShort(); // L: 252 + this.transparencyTop = var1.readUnsignedByte(); // L: 253 + this.parentId = var1.readUnsignedShort(); // L: 254 + if (this.parentId == 65535) { // L: 255 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 247 + this.parentId += this.id & -65536; // L: 256 } - this.mouseOverRedirect = var1.readUnsignedShort(); // L: 248 - if (this.mouseOverRedirect == 65535) { // L: 249 + this.mouseOverRedirect = var1.readUnsignedShort(); // L: 257 + if (this.mouseOverRedirect == 65535) { // L: 258 this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); // L: 250 + int var2 = var1.readUnsignedByte(); // L: 259 int var3; - if (var2 > 0) { // L: 251 - this.cs1Comparisons = new int[var2]; // L: 252 - this.cs1ComparisonValues = new int[var2]; // L: 253 + if (var2 > 0) { // L: 260 + this.cs1Comparisons = new int[var2]; // L: 261 + this.cs1ComparisonValues = new int[var2]; // L: 262 - for (var3 = 0; var3 < var2; ++var3) { // L: 254 - this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 255 - this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 256 + for (var3 = 0; var3 < var2; ++var3) { // L: 263 + this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 264 + this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 265 } } - var3 = var1.readUnsignedByte(); // L: 259 + var3 = var1.readUnsignedByte(); // L: 268 int var4; int var5; int var6; - if (var3 > 0) { // L: 260 - this.cs1Instructions = new int[var3][]; // L: 261 + if (var3 > 0) { // L: 269 + this.cs1Instructions = new int[var3][]; // L: 270 - for (var4 = 0; var4 < var3; ++var4) { // L: 262 - var5 = var1.readUnsignedShort(); // L: 263 - this.cs1Instructions[var4] = new int[var5]; // L: 264 + for (var4 = 0; var4 < var3; ++var4) { // L: 271 + var5 = var1.readUnsignedShort(); // L: 272 + this.cs1Instructions[var4] = new int[var5]; // L: 273 - for (var6 = 0; var6 < var5; ++var6) { // L: 265 - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 266 - if (this.cs1Instructions[var4][var6] == 65535) { // L: 267 + for (var6 = 0; var6 < var5; ++var6) { // L: 274 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 275 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 276 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { // L: 271 - this.scrollHeight = var1.readUnsignedShort(); // L: 272 - this.isHidden = var1.readUnsignedByte() == 1; // L: 273 + if (this.type == 0) { // L: 280 + this.scrollHeight = var1.readUnsignedShort(); // L: 281 + this.isHidden = var1.readUnsignedByte() == 1; // L: 282 } - if (this.type == 1) { // L: 275 - var1.readUnsignedShort(); // L: 276 - var1.readUnsignedByte(); // L: 277 + if (this.type == 1) { // L: 284 + var1.readUnsignedShort(); // L: 285 + var1.readUnsignedByte(); // L: 286 } - if (this.type == 2) { // L: 279 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 280 - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 281 - var4 = var1.readUnsignedByte(); // L: 282 - if (var4 == 1) { // L: 283 + if (this.type == 2) { // L: 288 + this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 289 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 290 + var4 = var1.readUnsignedByte(); // L: 291 + if (var4 == 1) { // L: 292 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); // L: 284 - if (var5 == 1) { // L: 285 + var5 = var1.readUnsignedByte(); // L: 293 + if (var5 == 1) { // L: 294 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); // L: 286 - if (var6 == 1) { // L: 287 + var6 = var1.readUnsignedByte(); // L: 295 + if (var6 == 1) { // L: 296 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); // L: 288 - if (var7 == 1) { // L: 289 + int var7 = var1.readUnsignedByte(); // L: 297 + if (var7 == 1) { // L: 298 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); // L: 290 - this.paddingY = var1.readUnsignedByte(); // L: 291 - this.inventoryXOffsets = new int[20]; // L: 292 - this.inventoryYOffsets = new int[20]; // L: 293 - this.inventorySprites = new int[20]; // L: 294 + this.paddingX = var1.readUnsignedByte(); // L: 299 + this.paddingY = var1.readUnsignedByte(); // L: 300 + this.inventoryXOffsets = new int[20]; // L: 301 + this.inventoryYOffsets = new int[20]; // L: 302 + this.inventorySprites = new int[20]; // L: 303 int var8; - for (var8 = 0; var8 < 20; ++var8) { // L: 295 - int var11 = var1.readUnsignedByte(); // L: 296 - if (var11 == 1) { // L: 297 - this.inventoryXOffsets[var8] = var1.readShort(); // L: 298 - this.inventoryYOffsets[var8] = var1.readShort(); // L: 299 - this.inventorySprites[var8] = var1.readInt(); // L: 300 + for (var8 = 0; var8 < 20; ++var8) { // L: 304 + int var11 = var1.readUnsignedByte(); // L: 305 + if (var11 == 1) { // L: 306 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 307 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 308 + this.inventorySprites[var8] = var1.readInt(); // L: 309 } else { - this.inventorySprites[var8] = -1; // L: 302 + this.inventorySprites[var8] = -1; // L: 311 } } - this.itemActions = new String[5]; // L: 304 + this.itemActions = new String[5]; // L: 313 - for (var8 = 0; var8 < 5; ++var8) { // L: 305 - String var9 = var1.readStringCp1252NullTerminated(); // L: 306 - if (var9.length() > 0) { // L: 307 - this.itemActions[var8] = var9; // L: 308 - this.flags |= 1 << var8 + 23; // L: 309 + for (var8 = 0; var8 < 5; ++var8) { // L: 314 + String var9 = var1.readStringCp1252NullTerminated(); // L: 315 + if (var9.length() > 0) { // L: 316 + this.itemActions[var8] = var9; // L: 317 + this.flags |= 1 << var8 + 23; // L: 318 } } } - if (this.type == 3) { // L: 313 - this.fill = var1.readUnsignedByte() == 1; // L: 314 + if (this.type == 3) { // L: 322 + this.fill = var1.readUnsignedByte() == 1; // L: 323 } - if (this.type == 4 || this.type == 1) { // L: 316 - this.textXAlignment = var1.readUnsignedByte(); // L: 317 - this.textYAlignment = var1.readUnsignedByte(); // L: 318 - this.textLineHeight = var1.readUnsignedByte(); // L: 319 - this.fontId = var1.readUnsignedShort(); // L: 320 - if (this.fontId == 65535) { // L: 321 + if (this.type == 4 || this.type == 1) { // L: 325 + this.textXAlignment = var1.readUnsignedByte(); // L: 326 + this.textYAlignment = var1.readUnsignedByte(); // L: 327 + this.textLineHeight = var1.readUnsignedByte(); // L: 328 + this.fontId = var1.readUnsignedShort(); // L: 329 + if (this.fontId == 65535) { // L: 330 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 322 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 331 } - if (this.type == 4) { // L: 324 - this.text = var1.readStringCp1252NullTerminated(); // L: 325 - this.text2 = var1.readStringCp1252NullTerminated(); // L: 326 + if (this.type == 4) { // L: 333 + this.text = var1.readStringCp1252NullTerminated(); // L: 334 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 335 } - if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 328 + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 337 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { // L: 329 - this.color2 = var1.readInt(); // L: 330 - this.mouseOverColor = var1.readInt(); // L: 331 - this.mouseOverColor2 = var1.readInt(); // L: 332 + if (this.type == 3 || this.type == 4) { // L: 338 + this.color2 = var1.readInt(); // L: 339 + this.mouseOverColor = var1.readInt(); // L: 340 + this.mouseOverColor2 = var1.readInt(); // L: 341 } - if (this.type == 5) { // L: 334 - this.spriteId2 = var1.readInt(); // L: 335 - this.spriteId = var1.readInt(); // L: 336 + if (this.type == 5) { // L: 343 + this.spriteId2 = var1.readInt(); // L: 344 + this.spriteId = var1.readInt(); // L: 345 } - if (this.type == 6) { // L: 338 - this.modelType = 1; // L: 339 - this.modelId = var1.readUnsignedShort(); // L: 340 - if (this.modelId == 65535) { // L: 341 + if (this.type == 6) { // L: 347 + this.modelType = 1; // L: 348 + this.modelId = var1.readUnsignedShort(); // L: 349 + if (this.modelId == 65535) { // L: 350 this.modelId = -1; } - this.modelType2 = 1; // L: 342 - this.modelId2 = var1.readUnsignedShort(); // L: 343 - if (this.modelId2 == 65535) { // L: 344 + this.modelType2 = 1; // L: 351 + this.modelId2 = var1.readUnsignedShort(); // L: 352 + if (this.modelId2 == 65535) { // L: 353 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); // L: 345 - if (this.sequenceId == 65535) { // L: 346 + this.sequenceId = var1.readUnsignedShort(); // L: 354 + if (this.sequenceId == 65535) { // L: 355 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); // L: 347 - if (this.sequenceId2 == 65535) { // L: 348 + this.sequenceId2 = var1.readUnsignedShort(); // L: 356 + if (this.sequenceId2 == 65535) { // L: 357 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); // L: 349 - this.modelAngleX = var1.readUnsignedShort(); // L: 350 - this.modelAngleY = var1.readUnsignedShort(); // L: 351 + this.modelZoom = var1.readUnsignedShort(); // L: 358 + this.modelAngleX = var1.readUnsignedShort(); // L: 359 + this.modelAngleY = var1.readUnsignedShort(); // L: 360 } - if (this.type == 7) { // L: 353 - this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 354 - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 355 - this.textXAlignment = var1.readUnsignedByte(); // L: 356 - this.fontId = var1.readUnsignedShort(); // L: 357 - if (this.fontId == 65535) { // L: 358 + if (this.type == 7) { // L: 362 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 363 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 364 + this.textXAlignment = var1.readUnsignedByte(); // L: 365 + this.fontId = var1.readUnsignedShort(); // L: 366 + if (this.fontId == 65535) { // L: 367 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; // L: 359 - this.color = var1.readInt(); // L: 360 - this.paddingX = var1.readShort(); // L: 361 - this.paddingY = var1.readShort(); // L: 362 - var4 = var1.readUnsignedByte(); // L: 363 - if (var4 == 1) { // L: 364 - this.flags |= 1073741824; + this.textShadowed = var1.readUnsignedByte() == 1; // L: 368 + this.color = var1.readInt(); // L: 369 + this.paddingX = var1.readShort(); // L: 370 + this.paddingY = var1.readShort(); // L: 371 + var4 = var1.readUnsignedByte(); // L: 372 + if (var4 == 1) { + this.flags |= 1073741824; // L: 373 } - this.itemActions = new String[5]; // L: 365 + this.itemActions = new String[5]; // L: 374 - for (var5 = 0; var5 < 5; ++var5) { // L: 366 - String var10 = var1.readStringCp1252NullTerminated(); // L: 367 - if (var10.length() > 0) { // L: 368 - this.itemActions[var5] = var10; // L: 369 - this.flags |= 1 << var5 + 23; // L: 370 + for (var5 = 0; var5 < 5; ++var5) { // L: 375 + String var10 = var1.readStringCp1252NullTerminated(); // L: 376 + if (var10.length() > 0) { // L: 377 + this.itemActions[var5] = var10; // L: 378 + this.flags |= 1 << var5 + 23; // L: 379 } } } - if (this.type == 8) { // L: 374 - this.text = var1.readStringCp1252NullTerminated(); // L: 375 + if (this.type == 8) { // L: 383 + this.text = var1.readStringCp1252NullTerminated(); // L: 384 } - if (this.buttonType == 2 || this.type == 2) { // L: 377 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 378 - this.spellName = var1.readStringCp1252NullTerminated(); // L: 379 - var4 = var1.readUnsignedShort() & 63; // L: 380 - this.flags |= var4 << 11; // L: 381 + if (this.buttonType == 2 || this.type == 2) { // L: 386 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 387 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 388 + var4 = var1.readUnsignedShort() & 63; // L: 389 + this.flags |= var4 << 11; // L: 390 } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 383 - this.buttonText = var1.readStringCp1252NullTerminated(); // L: 384 - if (this.buttonText.length() == 0) { // L: 385 - if (this.buttonType == 1) { // L: 386 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 392 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 393 + if (this.buttonText.length() == 0) { // L: 394 + if (this.buttonType == 1) { // L: 395 this.buttonText = "Ok"; } - if (this.buttonType == 4) { // L: 387 + if (this.buttonType == 4) { // L: 396 this.buttonText = "Select"; } - if (this.buttonType == 5) { // L: 388 + if (this.buttonType == 5) { // L: 397 this.buttonText = "Select"; } - if (this.buttonType == 6) { // L: 389 + if (this.buttonType == 6) { // L: 398 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 392 - this.flags |= 4194304; // L: 393 + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 401 + this.flags |= 4194304; // L: 402 } - if (this.buttonType == 6) { // L: 395 - this.flags |= 1; // L: 396 + if (this.buttonType == 6) { // L: 404 + this.flags |= 1; // L: 405 } - } // L: 398 + } // L: 407 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-327034944" + descriptor = "(Lnu;B)V", + garbageValue = "-47" ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); // L: 401 - this.isIf3 = true; // L: 402 - this.type = var1.readUnsignedByte(); // L: 403 - this.contentType = var1.readUnsignedShort(); // L: 404 - this.rawX = var1.readShort(); // L: 405 - this.rawY = var1.readShort(); // L: 406 - this.rawWidth = var1.readUnsignedShort(); // L: 407 - if (this.type == 9) { // L: 408 + var1.readUnsignedByte(); // L: 410 + this.isIf3 = true; // L: 411 + this.type = var1.readUnsignedByte(); // L: 412 + this.contentType = var1.readUnsignedShort(); // L: 413 + this.rawX = var1.readShort(); // L: 414 + this.rawY = var1.readShort(); // L: 415 + this.rawWidth = var1.readUnsignedShort(); // L: 416 + if (this.type == 9) { // L: 417 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); // L: 409 + this.rawHeight = var1.readUnsignedShort(); // L: 418 } - this.widthAlignment = var1.readByte(); // L: 410 - this.heightAlignment = var1.readByte(); // L: 411 - this.xAlignment = var1.readByte(); // L: 412 - this.yAlignment = var1.readByte(); // L: 413 - this.parentId = var1.readUnsignedShort(); // L: 414 - if (this.parentId == 65535) { // L: 415 + this.widthAlignment = var1.readByte(); // L: 419 + this.heightAlignment = var1.readByte(); // L: 420 + this.xAlignment = var1.readByte(); // L: 421 + this.yAlignment = var1.readByte(); // L: 422 + this.parentId = var1.readUnsignedShort(); // L: 423 + if (this.parentId == 65535) { // L: 424 this.parentId = -1; } else { - this.parentId += this.id & -65536; // L: 416 + this.parentId += this.id & -65536; // L: 425 } - this.isHidden = var1.readUnsignedByte() == 1; // L: 417 - if (this.type == 0) { // L: 418 - this.scrollWidth = var1.readUnsignedShort(); // L: 419 - this.scrollHeight = var1.readUnsignedShort(); // L: 420 - this.noClickThrough = var1.readUnsignedByte() == 1; // L: 421 + this.isHidden = var1.readUnsignedByte() == 1; // L: 426 + if (this.type == 0) { // L: 427 + this.scrollWidth = var1.readUnsignedShort(); // L: 428 + this.scrollHeight = var1.readUnsignedShort(); // L: 429 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 430 } - if (this.type == 5) { // L: 423 - this.spriteId2 = var1.readInt(); // L: 424 - this.spriteAngle = var1.readUnsignedShort(); // L: 425 - this.spriteTiling = var1.readUnsignedByte() == 1; // L: 426 - this.transparencyTop = var1.readUnsignedByte(); // L: 427 - this.outline = var1.readUnsignedByte(); // L: 428 - this.spriteShadow = var1.readInt(); // L: 429 - this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 430 - this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 431 + if (this.type == 5) { // L: 432 + this.spriteId2 = var1.readInt(); // L: 433 + this.spriteAngle = var1.readUnsignedShort(); // L: 434 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 435 + this.transparencyTop = var1.readUnsignedByte(); // L: 436 + this.outline = var1.readUnsignedByte(); // L: 437 + this.spriteShadow = var1.readInt(); // L: 438 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 439 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 440 } - if (this.type == 6) { // L: 433 - this.modelType = 1; // L: 434 - this.modelId = var1.readUnsignedShort(); // L: 435 - if (this.modelId == 65535) { // L: 436 + if (this.type == 6) { // L: 442 + this.modelType = 1; // L: 443 + this.modelId = var1.readUnsignedShort(); // L: 444 + if (this.modelId == 65535) { // L: 445 this.modelId = -1; } - this.modelOffsetX = var1.readShort(); // L: 437 - this.modelOffsetY = var1.readShort(); // L: 438 - this.modelAngleX = var1.readUnsignedShort(); // L: 439 - this.modelAngleY = var1.readUnsignedShort(); // L: 440 - this.modelAngleZ = var1.readUnsignedShort(); // L: 441 - this.modelZoom = var1.readUnsignedShort(); // L: 442 - this.sequenceId = var1.readUnsignedShort(); // L: 443 - if (this.sequenceId == 65535) { // L: 444 + this.modelOffsetX = var1.readShort(); // L: 446 + this.modelOffsetY = var1.readShort(); // L: 447 + this.modelAngleX = var1.readUnsignedShort(); // L: 448 + this.modelAngleY = var1.readUnsignedShort(); // L: 449 + this.modelAngleZ = var1.readUnsignedShort(); // L: 450 + this.modelZoom = var1.readUnsignedShort(); // L: 451 + this.sequenceId = var1.readUnsignedShort(); // L: 452 + if (this.sequenceId == 65535) { // L: 453 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; // L: 445 - var1.readUnsignedShort(); // L: 446 - if (this.widthAlignment != 0) { // L: 447 - this.field2648 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 454 + var1.readUnsignedShort(); // L: 455 + if (this.widthAlignment != 0) { // L: 456 + this.field2720 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { // L: 448 - var1.readUnsignedShort(); // L: 449 + if (this.heightAlignment != 0) { // L: 457 + var1.readUnsignedShort(); // L: 458 } } - if (this.type == 4) { // L: 452 - this.fontId = var1.readUnsignedShort(); // L: 453 - if (this.fontId == 65535) { // L: 454 + if (this.type == 4) { // L: 461 + this.fontId = var1.readUnsignedShort(); // L: 462 + if (this.fontId == 65535) { // L: 463 this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); // L: 455 - this.textLineHeight = var1.readUnsignedByte(); // L: 456 - this.textXAlignment = var1.readUnsignedByte(); // L: 457 - this.textYAlignment = var1.readUnsignedByte(); // L: 458 - this.textShadowed = var1.readUnsignedByte() == 1; // L: 459 - this.color = var1.readInt(); // L: 460 - } - - if (this.type == 3) { // L: 462 - this.color = var1.readInt(); // L: 463 - this.fill = var1.readUnsignedByte() == 1; // L: 464 - this.transparencyTop = var1.readUnsignedByte(); // L: 465 - } - - if (this.type == 9) { // L: 467 - this.lineWid = var1.readUnsignedByte(); // L: 468 + this.text = var1.readStringCp1252NullTerminated(); // L: 464 + this.textLineHeight = var1.readUnsignedByte(); // L: 465 + this.textXAlignment = var1.readUnsignedByte(); // L: 466 + this.textYAlignment = var1.readUnsignedByte(); // L: 467 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 468 this.color = var1.readInt(); // L: 469 - this.field2627 = var1.readUnsignedByte() == 1; // L: 470 } - this.flags = var1.readMedium(); // L: 472 - this.dataText = var1.readStringCp1252NullTerminated(); // L: 473 - int var2 = var1.readUnsignedByte(); // L: 474 - if (var2 > 0) { // L: 475 - this.actions = new String[var2]; // L: 476 + if (this.type == 3) { // L: 471 + this.color = var1.readInt(); // L: 472 + this.fill = var1.readUnsignedByte() == 1; // L: 473 + this.transparencyTop = var1.readUnsignedByte(); // L: 474 + } - for (int var3 = 0; var3 < var2; ++var3) { // L: 477 + if (this.type == 9) { // L: 476 + this.lineWid = var1.readUnsignedByte(); // L: 477 + this.color = var1.readInt(); // L: 478 + this.field2727 = var1.readUnsignedByte() == 1; // L: 479 + } + + this.flags = var1.readMedium(); // L: 481 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 482 + int var2 = var1.readUnsignedByte(); // L: 483 + if (var2 > 0) { // L: 484 + this.actions = new String[var2]; // L: 485 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 486 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); // L: 479 - this.dragThreshold = var1.readUnsignedByte(); // L: 480 - this.isScrollBar = var1.readUnsignedByte() == 1; // L: 481 - this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 482 - this.onLoad = this.readListener(var1); // L: 483 - this.onMouseOver = this.readListener(var1); // L: 484 - this.onMouseLeave = this.readListener(var1); // L: 485 - this.onTargetLeave = this.readListener(var1); // L: 486 - this.onTargetEnter = this.readListener(var1); // L: 487 - this.onVarTransmit = this.readListener(var1); // L: 488 - this.onInvTransmit = this.readListener(var1); // L: 489 - this.onStatTransmit = this.readListener(var1); // L: 490 - this.onTimer = this.readListener(var1); // L: 491 - this.onOp = this.readListener(var1); // L: 492 - this.onMouseRepeat = this.readListener(var1); // L: 493 - this.onClick = this.readListener(var1); // L: 494 - this.onClickRepeat = this.readListener(var1); // L: 495 - this.onRelease = this.readListener(var1); // L: 496 - this.onHold = this.readListener(var1); // L: 497 - this.onDrag = this.readListener(var1); // L: 498 - this.onDragComplete = this.readListener(var1); // L: 499 - this.onScroll = this.readListener(var1); // L: 500 - this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 501 - this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 502 - this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 503 - } // L: 504 + this.dragZoneSize = var1.readUnsignedByte(); // L: 488 + this.dragThreshold = var1.readUnsignedByte(); // L: 489 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 490 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 491 + this.onLoad = this.readListener(var1); // L: 492 + this.onMouseOver = this.readListener(var1); // L: 493 + this.onMouseLeave = this.readListener(var1); // L: 494 + this.onTargetLeave = this.readListener(var1); // L: 495 + this.onTargetEnter = this.readListener(var1); // L: 496 + this.onVarTransmit = this.readListener(var1); // L: 497 + this.onInvTransmit = this.readListener(var1); // L: 498 + this.onStatTransmit = this.readListener(var1); // L: 499 + this.onTimer = this.readListener(var1); // L: 500 + this.onOp = this.readListener(var1); // L: 501 + this.onMouseRepeat = this.readListener(var1); // L: 502 + this.onClick = this.readListener(var1); // L: 503 + this.onClickRepeat = this.readListener(var1); // L: 504 + this.onRelease = this.readListener(var1); // L: 505 + this.onHold = this.readListener(var1); // L: 506 + this.onDrag = this.readListener(var1); // L: 507 + this.onDragComplete = this.readListener(var1); // L: 508 + this.onScroll = this.readListener(var1); // L: 509 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 510 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 511 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 512 + } // L: 513 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkx;B)[Ljava/lang/Object;", - garbageValue = "-123" + descriptor = "(Lnu;I)[Ljava/lang/Object;", + garbageValue = "1322277036" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 507 - if (var2 == 0) { // L: 508 + int var2 = var1.readUnsignedByte(); // L: 516 + if (var2 == 0) { // L: 517 return null; } else { - Object[] var3 = new Object[var2]; // L: 509 + Object[] var3 = new Object[var2]; // L: 518 - for (int var4 = 0; var4 < var2; ++var4) { // L: 510 - int var5 = var1.readUnsignedByte(); // L: 511 + for (int var4 = 0; var4 < var2; ++var4) { // L: 519 + int var5 = var1.readUnsignedByte(); // L: 520 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); // L: 512 - } else if (var5 == 1) { // L: 513 + var3[var4] = new Integer(var1.readInt()); // L: 521 + } else if (var5 == 1) { // L: 522 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; // L: 515 - return var3; // L: 516 + this.hasListener = true; // L: 524 + return var3; // L: 525 } } - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lkx;I)[I", - garbageValue = "-892606734" + descriptor = "(Lnu;B)[I", + garbageValue = "-45" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); // L: 520 - if (var2 == 0) { // L: 521 + int var2 = var1.readUnsignedByte(); // L: 529 + if (var2 == 0) { // L: 530 return null; } else { - int[] var3 = new int[var2]; // L: 522 + int[] var3 = new int[var2]; // L: 531 - for (int var4 = 0; var4 < var2; ++var4) { // L: 523 - var3[var4] = var1.readInt(); // L: 524 + for (int var4 = 0; var4 < var2; ++var4) { // L: 532 + var3[var4] = var1.readInt(); // L: 533 } - return var3; // L: 526 + return var3; // L: 535 } } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "42" + garbageValue = "47" ) @Export("swapItems") public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; // L: 530 - this.itemIds[var2] = this.itemIds[var1]; // L: 531 - this.itemIds[var1] = var3; // L: 532 - var3 = this.itemQuantities[var2]; // L: 533 - this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 534 - this.itemQuantities[var1] = var3; // L: 535 - } // L: 536 + int var3 = this.itemIds[var2]; // L: 539 + this.itemIds[var2] = this.itemIds[var1]; // L: 540 + this.itemIds[var1] = var3; // L: 541 + var3 = this.itemQuantities[var2]; // L: 542 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 543 + this.itemQuantities[var1] = var3; // L: 544 + } // L: 545 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(ZI)Llm;", - garbageValue = "1522680461" + descriptor = "(ZB)Loh;", + garbageValue = "-10" ) @Export("getSprite") public SpritePixels getSprite(boolean var1) { - field2591 = false; // L: 539 + field2622 = false; // L: 548 int var2; - if (var1) { // L: 541 + if (var1) { // L: 550 var2 = this.spriteId; } else { - var2 = this.spriteId2; // L: 542 + var2 = this.spriteId2; // L: 551 } - if (var2 == -1) { // L: 543 + if (var2 == -1) { // L: 552 return null; } else { - long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 544 - SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 545 - if (var5 != null) { // L: 546 + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 553 + SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 554 + if (var5 != null) { // L: 555 return var5; } else { - var5 = BufferedSource.SpriteBuffer_getSprite(InterfaceParent.Widget_spritesArchive, var2, 0); // L: 547 - if (var5 == null) { // L: 548 - field2591 = true; // L: 549 - return null; // L: 550 + var5 = ModelData0.SpriteBuffer_getSprite(UrlRequest.Widget_spritesArchive, var2, 0); // L: 556 + if (var5 == null) { // L: 557 + field2622 = true; // L: 558 + return null; // L: 559 } else { - if (this.spriteFlipV) { // L: 552 + if (this.spriteFlipV) { // L: 561 var5.flipVertically(); } - if (this.spriteFlipH) { // L: 553 + if (this.spriteFlipH) { // L: 562 var5.flipHorizontally(); } - if (this.outline > 0) { // L: 554 + if (this.outline > 0) { // L: 563 var5.pad(this.outline); } - if (this.outline >= 1) { // L: 555 + if (this.outline >= 1) { // L: 564 var5.outline(1); } - if (this.outline >= 2) { // L: 556 + if (this.outline >= 2) { // L: 565 var5.outline(16777215); } - if (this.spriteShadow != 0) { // L: 557 + if (this.spriteShadow != 0) { // L: 566 var5.shadow(this.spriteShadow); } - Widget_cachedSprites.put(var5, var3); // L: 558 - return var5; // L: 559 + Widget_cachedSprites.put(var5, var3); // L: 567 + return var5; // L: 568 } } } } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Lkl;", - garbageValue = "1746762389" + descriptor = "(I)Lkq;", + garbageValue = "1091608415" ) @Export("getFont") public Font getFont() { - field2591 = false; // L: 563 - if (this.fontId == -1) { // L: 564 + field2622 = false; // L: 572 + if (this.fontId == -1) { // L: 573 return null; } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 565 - if (var1 != null) { // L: 566 + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 574 + if (var1 != null) { // L: 575 return var1; } else { - AbstractArchive var3 = InterfaceParent.Widget_spritesArchive; // L: 568 - AbstractArchive var4 = Widget_fontsArchive; // L: 569 - int var5 = this.fontId; // L: 570 - byte[] var7 = var3.takeFile(var5, 0); // L: 574 - boolean var6; - if (var7 == null) { // L: 575 - var6 = false; // L: 576 + var1 = class236.method4378(UrlRequest.Widget_spritesArchive, class32.Widget_fontsArchive, this.fontId, 0); // L: 576 + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); // L: 577 } else { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var7); // L: 579 - var6 = true; // L: 580 + field2622 = true; // L: 578 } - Font var2; - if (!var6) { // L: 582 - var2 = null; // L: 583 - } else { - byte[] var8 = var4.takeFile(var5, 0); // L: 587 - Font var10; - if (var8 == null) { // L: 589 - var10 = null; // L: 590 - } else { - Font var9 = new Font(var8, class105.SpriteBuffer_xOffsets, class336.SpriteBuffer_yOffsets, class336.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, HorizontalAlignment.SpriteBuffer_spritePalette, class2.SpriteBuffer_pixels); // L: 593 - class105.SpriteBuffer_xOffsets = null; // L: 595 - class336.SpriteBuffer_yOffsets = null; // L: 596 - class336.SpriteBuffer_spriteWidths = null; // L: 597 - class225.SpriteBuffer_spriteHeights = null; // L: 598 - HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 599 - class2.SpriteBuffer_pixels = null; // L: 600 - var10 = var9; // L: 602 - } - - var2 = var10; // L: 604 - } - - if (var2 != null) { // L: 607 - Widget_cachedFonts.put(var2, (long)this.fontId); - } else { - field2591 = true; // L: 608 - } - - return var2; // L: 609 + return var1; // L: 579 } } } - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)Llm;", - garbageValue = "-33" + descriptor = "(IB)Loh;", + garbageValue = "0" ) @Export("getInventorySprite") public SpritePixels getInventorySprite(int var1) { - field2591 = false; // L: 613 - if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 614 - int var2 = this.inventorySprites[var1]; // L: 615 - if (var2 == -1) { // L: 616 + field2622 = false; // L: 583 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 584 + int var2 = this.inventorySprites[var1]; // L: 585 + if (var2 == -1) { // L: 586 return null; } else { - SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 617 - if (var3 != null) { // L: 618 + SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 587 + if (var3 != null) { // L: 588 return var3; } else { - var3 = BufferedSource.SpriteBuffer_getSprite(InterfaceParent.Widget_spritesArchive, var2, 0); // L: 619 - if (var3 != null) { // L: 620 + var3 = ModelData0.SpriteBuffer_getSprite(UrlRequest.Widget_spritesArchive, var2, 0); // L: 589 + if (var3 != null) { // L: 590 Widget_cachedSprites.put(var3, (long)var2); } else { - field2591 = true; // L: 621 + field2622 = true; // L: 591 } - return var3; // L: 622 + return var3; // L: 592 } } } else { @@ -1400,187 +1373,198 @@ public class Widget extends Node { } } - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Ljs;IZLhu;B)Lef;", - garbageValue = "-25" + descriptor = "(Lkw;IZLht;B)Lgv;", + garbageValue = "-63" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) { - field2591 = false; // L: 626 + field2622 = false; // L: 596 int var5; int var6; - if (var3) { // L: 629 - var5 = this.modelType2; // L: 630 - var6 = this.modelId2; // L: 631 + if (var3) { // L: 599 + var5 = this.modelType2; // L: 600 + var6 = this.modelId2; // L: 601 } else { - var5 = this.modelType; // L: 634 - var6 = this.modelId; // L: 635 + var5 = this.modelType; // L: 604 + var6 = this.modelId; // L: 605 } - if (var5 == 0) { // L: 637 + if (var5 == 0) { // L: 607 return null; - } else if (var5 == 1 && var6 == -1) { // L: 638 + } else if (var5 == 1 && var6 == -1) { // L: 608 return null; } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 639 - if (var7 == null) { // L: 640 + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 609 + if (var7 == null) { // L: 610 ModelData var8; - if (var5 == 1) { // L: 642 - var8 = ModelData.ModelData_get(DirectByteArrayCopier.Widget_modelsArchive, var6, 0); // L: 643 - if (var8 == null) { // L: 644 - field2591 = true; // L: 645 - return null; // L: 646 + if (var5 == 1) { // L: 612 + var8 = ModelData.ModelData_get(WorldMapDecoration.Widget_modelsArchive, var6, 0); // L: 613 + if (var8 == null) { // L: 614 + field2622 = true; // L: 615 + return null; // L: 616 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 648 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 618 } - if (var5 == 2) { // L: 650 - var8 = class90.getNpcDefinition(var6).getModelData(); // L: 651 - if (var8 == null) { // L: 652 - field2591 = true; // L: 653 - return null; // L: 654 + if (var5 == 2) { // L: 620 + var8 = GraphicsObject.getNpcDefinition(var6).getModelData(); // L: 621 + if (var8 == null) { // L: 622 + field2622 = true; // L: 623 + return null; // L: 624 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 656 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 626 } - if (var5 == 3) { // L: 658 - if (var4 == null) { // L: 659 + if (var5 == 3) { // L: 628 + if (var4 == null) { // L: 629 return null; } - var8 = var4.getModelData(); // L: 660 - if (var8 == null) { // L: 661 - field2591 = true; // L: 662 - return null; // L: 663 + var8 = var4.getModelData(); // L: 630 + if (var8 == null) { // L: 631 + field2622 = true; // L: 632 + return null; // L: 633 } - var7 = var8.toModel(64, 768, -50, -10, -50); // L: 665 + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 635 } - if (var5 == 4) { // L: 667 - ItemComposition var9 = class281.ItemDefinition_get(var6); // L: 668 - var8 = var9.getModelData(10); // L: 669 - if (var8 == null) { // L: 670 - field2591 = true; // L: 671 - return null; // L: 672 + if (var5 == 4) { // L: 637 + ItemComposition var9 = class23.ItemDefinition_get(var6); // L: 638 + var8 = var9.getModelData(10); // L: 639 + if (var8 == null) { // L: 640 + field2622 = true; // L: 641 + return null; // L: 642 } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 674 + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 644 } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 676 + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 646 } - if (var1 != null) { // L: 678 - var7 = var1.transformWidgetModel(var7, var2); // L: 679 + if (var1 != null) { // L: 648 + var7 = var1.transformWidgetModel(var7, var2); // L: 649 } - return var7; // L: 681 + return var7; // L: 651 } } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ZI)Lht;", - garbageValue = "202613287" + descriptor = "(ZI)Lhh;", + garbageValue = "-791835766" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { // L: 685 + if (this.spriteId == -1) { // L: 655 var1 = false; } - int var2 = var1 ? this.spriteId * 506442589 * 79771893 : this.spriteId2 * -1146894377 * -1886053401; // L: 686 - if (var2 == -1) { // L: 687 + int var2 = var1 ? this.spriteId * 802383993 * 718176713 : this.spriteId2 * 1779540973 * 708325861; // L: 656 + if (var2 == -1) { // L: 657 return null; } else { - long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.spriteShadow << 40); // L: 688 - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 689 - if (var5 != null) { // L: 690 + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 658 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 659 + if (var5 != null) { // L: 660 return var5; } else { - SpritePixels var6 = this.getSprite(var1); // L: 691 - if (var6 == null) { // L: 692 + SpritePixels var6 = this.getSprite(var1); // L: 661 + if (var6 == null) { // L: 662 return null; } else { - SpritePixels var7 = var6.copyNormalized(); // L: 693 - int[] var8 = new int[var7.subHeight]; // L: 694 - int[] var9 = new int[var7.subHeight]; // L: 695 + SpritePixels var7 = var6.copyNormalized(); // L: 663 + int[] var8 = new int[var7.subHeight]; // L: 664 + int[] var9 = new int[var7.subHeight]; // L: 665 - for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 696 - int var11 = 0; // L: 697 - int var12 = var7.subWidth; // L: 698 + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 666 + int var11 = 0; // L: 667 + int var12 = var7.subWidth; // L: 668 int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 699 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 700 - var11 = var13; // L: 701 + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 669 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 670 + var11 = var13; // L: 671 break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 705 - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 706 - var12 = var13 + 1; // L: 707 + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 675 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 676 + var12 = var13 + 1; // L: 677 break; } } - var8[var10] = var11; // L: 711 - var9[var10] = var12 - var11; // L: 712 + var8[var10] = var11; // L: 681 + var9[var10] = var12 - var11; // L: 682 } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 714 - Widget_cachedSpriteMasks.put(var5, var3); // L: 715 - return var5; // L: 716 + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 684 + Widget_cachedSpriteMasks.put(var5, var3); // L: 685 + return var5; // L: 686 } } } } - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-44" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "2040886071" ) @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { // L: 727 - String[] var3 = new String[var1 + 1]; // L: 728 - if (this.actions != null) { // L: 729 - for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 730 + if (this.actions == null || this.actions.length <= var1) { // L: 697 + String[] var3 = new String[var1 + 1]; // L: 698 + if (this.actions != null) { // L: 699 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 700 var3[var4] = this.actions[var4]; } } - this.actions = var3; // L: 732 + this.actions = var3; // L: 702 } - this.actions[var1] = var2; // L: 734 - } // L: 735 + this.actions[var1] = var2; // L: 704 + } // L: 705 - @ObfuscatedName("as") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-2098441807" + descriptor = "(IIB)Lcc;", + garbageValue = "42" ) - static int method4292(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { // L: 3257 - Client.logoutTimer = 250; // L: 3258 - return 1; // L: 3259 - } else if (var0 != 5631 && var0 != 5633) { // L: 3261 - if (var0 == 5632) { // L: 3265 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 26; // L: 3266 - return 1; // L: 3267 - } else { - return 2; // L: 3269 - } + static Script method4292(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 52 + if (var2 != null) { // L: 53 + return var2; // L: 54 } else { - Interpreter.Interpreter_stringStackSize -= 2; // L: 3262 - return 1; // L: 3263 + String var3 = String.valueOf(var0); // L: 56 + int var4 = BuddyRankComparator.archive12.getGroupId(var3); // L: 57 + if (var4 == -1) { // L: 58 + return null; // L: 59 + } else { + byte[] var5 = BuddyRankComparator.archive12.takeFileFlat(var4); // L: 61 + if (var5 != null) { // L: 62 + if (var5.length <= 1) { // L: 63 + return null; // L: 64 + } + + var2 = WorldMapIcon_1.newScript(var5); // L: 66 + if (var2 != null) { // L: 67 + Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 68 + return var2; // L: 69 + } + } + + return null; // L: 72 + } } } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index ccc5682afa..590cc3a082 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -1,86 +1,75 @@ -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("cq") +@ObfuscatedName("bu") @Implements("World") public class World { - @ObfuscatedName("qf") - @ObfuscatedSignature( - descriptor = "Ldq;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "[Lcq;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1883151611 + intValue = -466976069 ) @Export("World_count") static int World_count; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1211509963 + intValue = 284068341 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("bl") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "Lda;" ) - static IndexedSprite field1039; - @ObfuscatedName("ds") - @ObfuscatedGetter( - longValue = 4616072820016449217L + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Low;" ) - static long field1036; - @ObfuscatedName("s") + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1941942941 + intValue = -53330073 ) @Export("id") int id; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2050399625 + intValue = -1889608255 ) @Export("properties") int properties; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -602749729 + intValue = 677246703 ) @Export("population") int population; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("host") String host; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("activity") String activity; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -175273101 + intValue = 931546619 ) @Export("location") int location; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 865975071 + intValue = 1351760003 ) @Export("index") int index; @@ -95,222 +84,105 @@ public class World { World() { } // L: 27 - @ObfuscatedName("l") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1593793917" + garbageValue = "-19498881" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; // L: 247 + return (1 & this.properties) != 0; // L: 257 } - @ObfuscatedName("s") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1662495711" + garbageValue = "2123080773" ) - boolean method1878() { - return (2 & this.properties) != 0; // L: 251 + boolean method1672() { + return (2 & this.properties) != 0; // L: 261 } - @ObfuscatedName("b") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1886649606" + descriptor = "(B)Z", + garbageValue = "8" ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; // L: 255 + return (4 & this.properties) != 0; // L: 265 } - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1928708058" + descriptor = "(S)Z", + garbageValue = "-30852" ) - boolean method1880() { - return (8 & this.properties) != 0; // L: 259 + boolean method1695() { + return (8 & this.properties) != 0; // L: 269 } - @ObfuscatedName("w") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "28" + garbageValue = "118" ) @Export("isDeadman") boolean isDeadman() { - return (536870912 & this.properties) != 0; // L: 263 - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1939241099" - ) - @Export("isBeta") - boolean isBeta() { - return (33554432 & this.properties) != 0; // L: 267 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "4" - ) - boolean method1883() { - return (1073741824 & this.properties) != 0; // L: 271 + return (536870912 & this.properties) != 0; // L: 273 } @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1636550910" + descriptor = "(B)Z", + garbageValue = "54" ) - public static void method1924() { - VarpDefinition.VarpDefinition_cached.clear(); // L: 41 - } // L: 42 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lkd;IS)Z", - garbageValue = "-20652" - ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); // L: 370 - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { // L: 371 - if (var0.readBits(1) != 0) { // L: 372 - updateExternalPlayer(var0, var1); - } - - var3 = var0.readBits(13); // L: 373 - var4 = var0.readBits(13); // L: 374 - boolean var12 = var0.readBits(1) == 1; // L: 375 - if (var12) { // L: 376 - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { // L: 377 - throw new RuntimeException(); // L: 378 - } else { - Player var11 = Client.players[var1] = new Player(); // L: 380 - var11.index = var1; // L: 381 - if (Players.field1269[var1] != null) { // L: 382 - var11.read(Players.field1269[var1]); - } - - var11.orientation = Players.Players_orientations[var1]; // L: 383 - var11.targetIndex = Players.Players_targetIndices[var1]; // L: 384 - var7 = Players.Players_regions[var1]; // L: 385 - var8 = var7 >> 28; // L: 386 - var9 = var7 >> 14 & 255; // L: 387 - var10 = var7 & 255; // L: 388 - var11.pathTraversed[0] = Players.field1274[var1]; // L: 389 - var11.plane = (byte)var8; // L: 390 - var11.resetPath((var9 << 13) + var3 - GrandExchangeOfferNameComparator.baseX, (var10 << 13) + var4 - NetCache.baseY); // L: 391 - var11.field652 = false; // L: 392 - return true; // L: 393 - } - } else if (var2 == 1) { // L: 395 - var3 = var0.readBits(2); // L: 396 - var4 = Players.Players_regions[var1]; // L: 397 - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 398 - return false; // L: 399 - } else { - int var5; - int var6; - if (var2 == 2) { // L: 401 - var3 = var0.readBits(5); // L: 402 - var4 = var3 >> 3; // L: 403 - var5 = var3 & 7; // L: 404 - var6 = Players.Players_regions[var1]; // L: 405 - var7 = (var6 >> 28) + var4 & 3; // L: 406 - var8 = var6 >> 14 & 255; // L: 407 - var9 = var6 & 255; // L: 408 - if (var5 == 0) { // L: 409 - --var8; // L: 410 - --var9; // L: 411 - } - - if (var5 == 1) { // L: 413 - --var9; - } - - if (var5 == 2) { // L: 414 - ++var8; // L: 415 - --var9; // L: 416 - } - - if (var5 == 3) { // L: 418 - --var8; - } - - if (var5 == 4) { // L: 419 - ++var8; - } - - if (var5 == 5) { // L: 420 - --var8; // L: 421 - ++var9; // L: 422 - } - - if (var5 == 6) { // L: 424 - ++var9; - } - - if (var5 == 7) { // L: 425 - ++var8; // L: 426 - ++var9; // L: 427 - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 429 - return false; // L: 430 - } else { - var3 = var0.readBits(18); // L: 432 - var4 = var3 >> 16; // L: 433 - var5 = var3 >> 8 & 255; // L: 434 - var6 = var3 & 255; // L: 435 - var7 = Players.Players_regions[var1]; // L: 436 - var8 = (var7 >> 28) + var4 & 3; // L: 437 - var9 = var5 + (var7 >> 14) & 255; // L: 438 - var10 = var6 + var7 & 255; // L: 439 - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 440 - return false; // L: 441 - } - } + @Export("isBeta") + boolean isBeta() { + return (33554432 & this.properties) != 0; // L: 277 } - @ObfuscatedName("z") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "14756" + descriptor = "(B)Z", + garbageValue = "-91" ) - static void method1923() { - Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 59 + boolean method1677() { + return (1073741824 & this.properties) != 0; // L: 281 + } - while (var0.hasNext()) { // L: 64 - Message var1 = (Message)var0.next(); // L: 60 - var1.clearIsFromIgnored(); // L: 62 + @ObfuscatedName("ib") + @ObfuscatedSignature( + descriptor = "(Lhu;Lko;IIZI)V", + garbageValue = "-1691139839" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 10185 + byte var6 = -1; // L: 10186 + String var7 = null; // L: 10187 + if (var5 != null && var5[var3] != null) { // L: 10188 + if (var3 == 0) { // L: 10189 + var6 = 33; + } else if (var3 == 1) { // L: 10190 + var6 = 34; + } else if (var3 == 2) { // L: 10191 + var6 = 35; + } else if (var3 == 3) { // L: 10192 + var6 = 36; + } else { + var6 = 37; // L: 10193 + } + + var7 = var5[var3]; // L: 10194 + } else if (var3 == 4) { // L: 10197 + var6 = 37; // L: 10198 + var7 = "Drop"; // L: 10199 } - } // L: 65 - - @ObfuscatedName("gb") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "37330821" - ) - static void method1925() { - if (UserComparator9.localPlayer.x >> 7 == Client.destinationX && UserComparator9.localPlayer.y >> 7 == Client.destinationY) { // L: 4252 - Client.destinationX = 0; // L: 4253 + if (var6 != -1 && var7 != null) { // L: 10202 + AbstractByteArrayCopier.insertMenuItem(var7, DefaultsGroup.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10203 } - } // L: 4255 + } // L: 10205 } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index ce3c72ed5e..72b35557b2 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mf") +@ObfuscatedName("mr") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lmv;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lkl;" + descriptor = "Lkq;" ) @Export("font") Font font; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("fonts") HashMap fonts; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Low;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("i") + @ObfuscatedName("r") @Export("details") HashMap details; - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Leq;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("f") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Leq;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("g") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Leq;" ) - WorldMapArea field4001; - @ObfuscatedName("u") + WorldMapArea field4007; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Lez;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmj;" + descriptor = "Lml;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1485160707 + intValue = 1751776365 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 468675207 + intValue = -1683320435 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("r") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -552998349 + intValue = -751777809 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -103147929 + intValue = -336489583 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("j") + @ObfuscatedName("y") @Export("zoom") float zoom; - @ObfuscatedName("ay") + @ObfuscatedName("ac") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("am") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 2118998885 + intValue = -1643261397 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1890808813 + intValue = -1632358729 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ae") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -2127306477 + intValue = -1337127919 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -511724315 + intValue = -1148708503 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("aq") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 430742145 + intValue = 1727442279 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -2091000699 + intValue = 1918242041 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("ak") + @ObfuscatedName("aw") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("ax") + @ObfuscatedName("ap") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -668167233 + intValue = -77181029 ) @Export("flashCount") int flashCount; - @ObfuscatedName("al") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 369580101 + intValue = 2142589891 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("aa") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -495293641 - ) - int field3983; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = -717916547 - ) - int field4024; - @ObfuscatedName("aw") - @ObfuscatedGetter( - intValue = -543796417 - ) - int field4022; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = -866652017 - ) - int field4023; - @ObfuscatedName("ah") - @ObfuscatedGetter( - longValue = -8962083882606265099L - ) - long field4040; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = -255624939 - ) - int field4014; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = 795601449 + intValue = 1086120873 ) int field4026; - @ObfuscatedName("an") - boolean field4027; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = 641837143 + ) + int field4012; + @ObfuscatedName("ao") + @ObfuscatedGetter( + intValue = -1952031231 + ) + int field4028; + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = -1367433461 + ) + int field4029; + @ObfuscatedName("av") + @ObfuscatedGetter( + longValue = 5480394132200405517L + ) + long field4030; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = 1651460063 + ) + int field4031; @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -1141378953 + ) + int field4032; + @ObfuscatedName("ab") + boolean field4033; + @ObfuscatedName("ar") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ad") + @ObfuscatedName("ak") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("af") + @ObfuscatedName("an") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("av") - HashSet field4032; - @ObfuscatedName("ao") + @ObfuscatedName("ah") + HashSet field4005; + @ObfuscatedName("ae") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bj") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1798825541 + intValue = 736836363 ) - int field3994; - @ObfuscatedName("bi") + int field4021; + @ObfuscatedName("bn") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bp") - List field4035; - @ObfuscatedName("br") + @ObfuscatedName("bi") + List field4047; + @ObfuscatedName("bb") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bq") - HashSet field3992; - @ObfuscatedName("bx") + @ObfuscatedName("bk") + HashSet field4027; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhk;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bc") + @ObfuscatedName("ba") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bw") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Loh;" ) @Export("sprite") SpritePixels sprite; - @ObfuscatedName("bv") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1265489045 + intValue = -1390297175 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bt") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1633065457 + intValue = 744893993 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bl") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1866710929 + intValue = -1355273529 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1184565479 + intValue = -1222034053 ) - int field4044; + int field4039; static { fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; // L: 71 this.flashCount = -1; // L: 72 this.flashCycle = -1; // L: 73 - this.field3983 = -1; // L: 74 - this.field4024 = -1; // L: 75 - this.field4022 = -1; // L: 76 - this.field4023 = -1; // L: 77 - this.field4027 = true; // L: 81 + this.field4026 = -1; // L: 74 + this.field4012 = -1; // L: 75 + this.field4028 = -1; // L: 76 + this.field4029 = -1; // L: 77 + this.field4033 = true; // L: 81 this.enabledElements = new HashSet(); // L: 84 this.enabledCategories = new HashSet(); // L: 85 this.enabledElementIds = new HashSet(); // L: 86 - this.field4032 = new HashSet(); // L: 87 + this.field4005 = new HashSet(); // L: 87 this.elementsDisabled = false; // L: 88 - this.field3994 = 0; // L: 89 + this.field4021 = 0; // L: 89 this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 - this.field3992 = new HashSet(); // L: 94 + this.field4027 = 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.field4044 = -1; // L: 101 + this.field4039 = -1; // L: 101 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;Lig;Lig;Lkl;Ljava/util/HashMap;[Lly;B)V", - garbageValue = "32" + descriptor = "(Lir;Lir;Lir;Lkq;Ljava/util/HashMap;[Low;I)V", + garbageValue = "733115823" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { @@ -341,7 +341,7 @@ public class WorldMap { this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field333.name); // L: 115 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field1768.name); // L: 115 int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 this.details = new HashMap(var8.length); // L: 117 @@ -356,1094 +356,1097 @@ public class WorldMap { } this.setCurrentMapArea(this.mainMapArea); // L: 127 - this.field4001 = null; // L: 128 + this.field4007 = null; // L: 128 } // L: 129 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "85863738" + garbageValue = "-1101698518" ) - public void method6584() { - WorldMapSection1.method671(); // L: 132 - } // L: 133 + public void method6148() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 + } // L: 135 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "230943505" + garbageValue = "-953768475" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - 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.method722(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 + if (this.cacheLoader.isLoaded()) { // L: 138 + this.smoothZoom(); // L: 141 + this.scrollToTarget(); // L: 142 + if (var3) { // L: 143 + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146 + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147 + List var10 = this.worldMapManager.method2936(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 + HashSet var11 = new HashSet(); // L: 149 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); PacketWriter.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.field3992.contains(var13)) { // L: 155 - var14.setType(17); // L: 156 + for (var12 = var10.iterator(); var12.hasNext(); class19.runScriptEvent(var14)) { // L: 150 163 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 151 + var11.add(var13); // L: 153 + var14 = new ScriptEvent(); // L: 154 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 156 + if (this.field4027.contains(var13)) { // L: 157 + var14.setType(17); // L: 158 } else { - var14.setType(15); // L: 159 + var14.setType(15); // L: 161 } } - var12 = this.field3992.iterator(); // L: 164 + var12 = this.field4027.iterator(); // L: 166 while (var12.hasNext()) { - 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 - PacketWriter.runScriptEvent(var14); // L: 172 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 + if (!var11.contains(var13)) { // L: 169 + var14 = new ScriptEvent(); // L: 170 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 172 + var14.setType(16); // L: 173 + class19.runScriptEvent(var14); // L: 174 } } - this.field3992 = var11; // L: 176 + this.field4027 = var11; // L: 178 } } - } // L: 137 142 177 + } // L: 139 144 179 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIZZI)V", - garbageValue = "-1689705014" + descriptor = "(IIZZB)V", + garbageValue = "-86" ) - public void method6525(int var1, int var2, boolean var3, boolean var4) { - long var5 = Tiles.currentTimeMillis(); // L: 180 - this.method6539(var1, var2, var4, var5); // L: 181 - if (this.hasTarget() || !var4 && !var3) { // L: 182 - this.method6527(); // L: 196 + public void method6197(int var1, int var2, boolean var3, boolean var4) { + long var5 = ObjectSound.currentTimeMillis(); // L: 182 + this.method6080(var1, var2, var4, var5); // L: 183 + if (this.hasTarget() || !var4 && !var3) { // L: 184 + this.method6179(); // L: 198 } else { - if (var4) { // L: 183 - this.field4022 = var1; // L: 184 - this.field4023 = var2; // L: 185 - this.field3983 = this.centerTileX; // L: 186 - this.field4024 = this.centerTileY; // L: 187 + if (var4) { // L: 185 + this.field4028 = var1; // L: 186 + this.field4029 = var2; // L: 187 + this.field4026 = this.centerTileX; // L: 188 + this.field4012 = this.centerTileY; // L: 189 } - if (this.field3983 != -1) { // L: 189 - int var7 = var1 - this.field4022; // L: 190 - int var8 = var2 - this.field4023; // L: 191 - this.setWorldMapPosition(this.field3983 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4024, false); // L: 192 + if (this.field4026 != -1) { // L: 191 + int var7 = var1 - this.field4028; // L: 192 + int var8 = var2 - this.field4029; // L: 193 + this.setWorldMapPosition(this.field4026 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4012, false); // L: 194 } } - if (var4) { // L: 198 - this.field4040 = var5; // L: 199 - this.field4014 = var1; // L: 200 - this.field4026 = var2; // L: 201 + if (var4) { // L: 200 + this.field4030 = var5; // L: 201 + this.field4031 = var1; // L: 202 + this.field4032 = var2; // L: 203 } - } // L: 203 + } // L: 205 - @ObfuscatedName("y") - void method6539(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 - int var9; - int var10; - if (TriBool.method5372() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 211 - int var13 = this.mouseCoord.x; // L: 212 - var9 = this.mouseCoord.y; // L: 213 - var10 = this.mouseCoord.plane; // L: 214 - PacketBufferNode var11 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); // L: 217 - var11.packetBuffer.writeShortLE(var9); // L: 218 - var11.packetBuffer.method5883(var10); // L: 219 - var11.packetBuffer.method5736(0); // L: 220 - var11.packetBuffer.writeIntME(var13); // L: 221 - Client.packetWriter.addNode(var11); // L: 222 + @ObfuscatedName("b") + void method6080(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea != null) { // L: 208 + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209 + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210 + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211 + if (this.mouseCoord != null && var3) { // L: 212 + boolean var8 = Client.staffModLevel >= 2; // L: 215 + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217 + class9.method123(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 218 } else { - boolean var8 = true; // L: 226 - if (this.field4027) { // L: 227 - var9 = var1 - this.field4014; // L: 228 - var10 = var2 - this.field4026; // L: 229 - if (var4 - this.field4040 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 230 - var8 = false; // L: 231 + boolean var9 = true; // L: 221 + if (this.field4033) { // L: 222 + int var10 = var1 - this.field4031; // L: 223 + int var11 = var2 - this.field4032; // L: 224 + if (var4 - this.field4030 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 225 + var9 = false; // L: 226 } } - if (var8) { // L: 234 - PacketBufferNode var12 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); // L: 235 - var12.packetBuffer.method5736(this.mouseCoord.packed()); // L: 236 - Client.packetWriter.addNode(var12); // L: 237 - this.field4040 = 0L; // L: 238 + if (var9) { // L: 229 + PacketBufferNode var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); // L: 230 + var12.packetBuffer.method6625(this.mouseCoord.packed()); // L: 231 + Client.packetWriter.addNode(var12); // L: 232 + this.field4030 = 0L; // L: 233 } } } } else { - this.mouseCoord = null; // L: 243 + this.mouseCoord = null; // L: 238 } - } // L: 244 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" - ) - @Export("smoothZoom") - void smoothZoom() { - if (HealthBarUpdate.field1016 != null) { // L: 247 - this.zoom = this.zoomTarget; // L: 248 - } else { - if (this.zoom < this.zoomTarget) { // L: 251 - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); // L: 252 - } - - if (this.zoom > this.zoomTarget) { // L: 254 - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 255 - } - - } - } // L: 249 257 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2023842573" - ) - @Export("scrollToTarget") - void scrollToTarget() { - if (this.hasTarget()) { // L: 260 - int var1 = this.worldMapTargetX - this.centerTileX; // L: 263 - int var2 = this.worldMapTargetY - this.centerTileY; // L: 264 - if (var1 != 0) { // L: 265 - var1 /= Math.min(8, Math.abs(var1)); // L: 266 - } - - if (var2 != 0) { // L: 268 - var2 /= Math.min(8, Math.abs(var2)); // L: 269 - } - - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 271 - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 272 - this.worldMapTargetX = -1; // L: 273 - this.worldMapTargetY = -1; // L: 274 - } - - } - } // L: 261 276 + } // L: 239 @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1837270270" + ) + @Export("smoothZoom") + void smoothZoom() { + if (class105.field1331 != null) { // L: 242 + this.zoom = this.zoomTarget; // L: 243 + } else { + if (this.zoom < this.zoomTarget) { // L: 246 + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 247 + } + + if (this.zoom > this.zoomTarget) { // L: 249 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 250 + } + + } + } // L: 244 252 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1435545327" + ) + @Export("scrollToTarget") + void scrollToTarget() { + if (this.hasTarget()) { // L: 255 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 258 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 259 + if (var1 != 0) { // L: 260 + var1 /= Math.min(8, Math.abs(var1)); // L: 261 + } + + if (var2 != 0) { // L: 263 + var2 /= Math.min(8, Math.abs(var2)); // L: 264 + } + + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 266 + if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 267 + this.worldMapTargetX = -1; // L: 268 + this.worldMapTargetY = -1; // L: 269 + } + + } + } // L: 256 271 + + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "1942318889" + garbageValue = "-1358516193" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; // L: 279 - this.centerTileY = var2; // L: 280 - Tiles.currentTimeMillis(); // L: 281 + this.centerTileX = var1; // L: 274 + this.centerTileY = var2; // L: 275 + ObjectSound.currentTimeMillis(); // L: 276 if (var3) { - this.method6527(); // L: 282 + this.method6179(); // L: 277 } - } // L: 283 + } // L: 278 - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-759849186" + garbageValue = "-1371340744" ) - final void method6527() { - this.field4023 = -1; // L: 286 - this.field4022 = -1; // L: 287 - this.field4024 = -1; // L: 288 - this.field3983 = -1; // L: 289 - } // L: 290 + final void method6179() { + this.field4029 = -1; // L: 281 + this.field4028 = -1; // L: 282 + this.field4012 = -1; // L: 283 + this.field4026 = -1; // L: 284 + } // L: 285 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-172308230" + garbageValue = "1558869849" ) @Export("hasTarget") boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 293 + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 288 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)Lar;", - garbageValue = "1643132565" + descriptor = "(IIII)Leq;", + garbageValue = "-2036677867" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); // L: 297 + Iterator var4 = this.details.values().iterator(); // L: 292 WorldMapArea var5; do { if (!var4.hasNext()) { - return null; // L: 305 + return null; // L: 300 } - var5 = (WorldMapArea)var4.next(); // L: 298 - } while(!var5.containsCoord(var1, var2, var3)); // L: 300 + var5 = (WorldMapArea)var4.next(); // L: 293 + } while(!var5.containsCoord(var1, var2, var3)); // L: 295 - return var5; // L: 301 + return var5; // L: 296 } - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "76619956" + descriptor = "(IIIZB)V", + garbageValue = "-105" ) - public void method6530(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 309 - if (var5 == null) { // L: 310 - if (!var4) { // L: 311 - return; // L: 314 + public void method6116(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 304 + if (var5 == null) { // L: 305 + if (!var4) { // L: 306 + return; // L: 309 } - var5 = this.mainMapArea; // L: 312 + var5 = this.mainMapArea; // L: 307 } - boolean var6 = false; // L: 316 - if (var5 != this.field4001 || var4) { // L: 317 - this.field4001 = var5; // L: 318 - this.setCurrentMapArea(var5); // L: 319 - var6 = true; // L: 320 + boolean var6 = false; // L: 311 + if (var5 != this.field4007 || var4) { // L: 312 + this.field4007 = var5; // L: 313 + this.setCurrentMapArea(var5); // L: 314 + var6 = true; // L: 315 } - if (var6 || var4) { // L: 322 - this.jump(var1, var2, var3); // L: 323 + if (var6 || var4) { // L: 317 + this.jump(var1, var2, var3); // L: 318 } - } // L: 325 + } // L: 320 - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1925451385" + garbageValue = "-278872438" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); // L: 328 - if (var2 != null) { // L: 329 - this.setCurrentMapArea(var2); // L: 330 + WorldMapArea var2 = this.getMapArea(var1); // L: 323 + if (var2 != null) { // L: 324 + this.setCurrentMapArea(var2); // L: 325 } - } // L: 332 + } // L: 327 - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-730626276" + garbageValue = "-549031120" ) @Export("currentMapAreaId") public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 335 336 338 + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 330 331 333 } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(B)Lar;", - garbageValue = "-84" + descriptor = "(B)Leq;", + garbageValue = "13" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; // L: 342 + return this.currentMapArea; // L: 337 + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Leq;S)V", + garbageValue = "14713" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 341 + this.initializeWorldMapManager(var1); // L: 344 + this.jump(-1, -1, -1); // L: 345 + } + } // L: 342 346 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(Leq;B)V", + garbageValue = "1" + ) + @Export("initializeWorldMapManager") + void initializeWorldMapManager(WorldMapArea var1) { + this.currentMapArea = var1; // L: 349 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 350 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 351 + } // L: 352 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Leq;Lhk;Lhk;ZI)V", + garbageValue = "-1033794508" + ) + public void method6264(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 355 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 358 + this.initializeWorldMapManager(var1); // L: 359 + } + + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 361 + this.jump(var2.plane, var2.x, var2.y); // L: 365 + } else { + this.jump(var3.plane, var3.x, var3.y); // L: 362 + } + + } + } // L: 356 367 + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-445360101" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 370 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 373 + if (var4 == null) { // L: 374 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 375 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 377 + this.worldMapTargetX = -1; // L: 378 + this.worldMapTargetY = -1; // L: 379 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 380 + this.zoomTarget = this.zoom; // L: 381 + this.field4047 = null; // L: 382 + this.iconIterator = null; // L: 383 + this.worldMapManager.clearIcons(); // L: 384 + } + } // L: 371 385 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-546604535" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; // L: 388 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 389 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 390 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 391 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 392 + if (var7 < 100) { // L: 393 + this.drawLoading(var1, var2, var3, var4, var7); // L: 394 + } else { + if (!this.worldMapManager.isLoaded()) { // L: 397 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 398 + if (!this.worldMapManager.isLoaded()) { // L: 399 + return; // L: 400 + } + } + + if (this.flashingElements != null) { // L: 403 + ++this.flashCycle; // L: 404 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 405 + this.flashCycle = 0; // L: 406 + ++this.flashCount; // L: 407 + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 409 + this.flashingElements = null; // L: 410 + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 413 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 414 + this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 415 + boolean var10; + if (!this.elementsDisabled) { // L: 416 + var10 = false; // L: 417 + if (var5 - this.field4021 > 100) { // L: 418 + this.field4021 = var5; // L: 419 + var10 = true; // L: 420 + } + + 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.field4005, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 422 + } + + this.method6096(var1, var2, var3, var4, var8, var9); // L: 424 + var10 = Client.staffModLevel >= 2; // L: 427 + if (var10 && this.showCoord && this.mouseCoord != null) { // L: 429 + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; // L: 430 + this.worldMapDisplayHeight = var9; // L: 431 + this.worldMapDisplayX = var1; // L: 432 + this.worldMapDisplayY = var2; // L: 433 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 434 + } + } // L: 395 435 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "-1240841312" + ) + boolean method6095(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 438 + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 439 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 440 + return true; + } else if (this.field4039 != Client.field623) { + return true; // L: 441 + } else if (var3 <= 0 && var4 <= 0) { // L: 442 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 443 + } else { + return true; // L: 444 + } + } else { + return true; + } } @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lar;I)V", - garbageValue = "-248631189" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 346 - this.initializeWorldMapManager(var1); // L: 349 - this.jump(-1, -1, -1); // L: 350 - } - } // L: 347 351 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Lar;I)V", - garbageValue = "1768917402" - ) - @Export("initializeWorldMapManager") - void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; // L: 354 - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 355 - this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 356 - } // L: 357 - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lar;Lhd;Lhd;ZI)V", - garbageValue = "-1378443139" - ) - public void method6536(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { // L: 360 - if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 363 - this.initializeWorldMapManager(var1); // L: 364 - } - - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 366 - this.jump(var2.plane, var2.x, var2.y); // L: 370 - } else { - this.jump(var3.plane, var3.x, var3.y); // L: 367 - } - - } - } // L: 361 372 - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "-10194" - ) - @Export("jump") - void jump(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 375 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 378 - if (var4 == null) { // L: 379 - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 380 - } - - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 382 - this.worldMapTargetX = -1; // L: 383 - this.worldMapTargetY = -1; // L: 384 - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 385 - this.zoomTarget = this.zoom; // L: 386 - this.field4035 = null; // L: 387 - this.iconIterator = null; // L: 388 - this.worldMapManager.clearIcons(); // L: 389 - } - } // L: 376 390 - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "943833316" - ) - @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; // L: 393 - Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 394 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 395 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 396 - int var7 = this.cacheLoader.getPercentLoaded(); // L: 397 - if (var7 < 100) { // L: 398 - this.drawLoading(var1, var2, var3, var4, var7); // L: 399 - } else { - if (!this.worldMapManager.isLoaded()) { // L: 402 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 403 - if (!this.worldMapManager.isLoaded()) { // L: 404 - return; // L: 405 - } - } - - if (this.flashingElements != null) { // L: 408 - ++this.flashCycle; // L: 409 - if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 410 - this.flashCycle = 0; // L: 411 - ++this.flashCount; // L: 412 - } - - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 414 - this.flashingElements = null; // L: 415 - } - } - - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 418 - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 419 - 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: 420 - if (!this.elementsDisabled) { // L: 421 - boolean var10 = false; // L: 422 - if (var5 - this.field3994 > 100) { // L: 423 - this.field3994 = var5; // L: 424 - var10 = true; // L: 425 - } - - 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.field4032, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 427 - } - - this.method6699(var1, var2, var3, var4, var8, var9); // L: 429 - if (TriBool.method5372() && this.showCoord && this.mouseCoord != null) { // L: 430 - this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); - } - - this.worldMapDisplayWidth = var8; // L: 431 - this.worldMapDisplayHeight = var9; // L: 432 - this.worldMapDisplayX = var1; // L: 433 - this.worldMapDisplayY = var2; // L: 434 - Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 435 - } - } // L: 400 436 - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)Z", - garbageValue = "32" - ) - boolean method6633(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { // L: 439 - return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 440 - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 441 - return true; - } else if (this.field4044 != Client.field674) { // L: 442 - return true; - } else if (var3 <= 0 && var4 <= 0) { // L: 443 - return var3 + var1 < var5 || var2 + var4 < var6; // L: 444 - } else { - return true; // L: 445 - } - } else { - return true; - } - } - - @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-1237692088" + garbageValue = "217911820" ) - void method6699(int var1, int var2, int var3, int var4, int var5, int var6) { - if (HealthBarUpdate.field1016 != null) { // L: 449 - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 450 - int var8 = var3 + 512; // L: 451 - int var9 = var4 + 512; // L: 452 - float var10 = 1.0F; // L: 453 - var8 = (int)((float)var8 / var10); // L: 454 - var9 = (int)((float)var9 / var10); // L: 455 - int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 456 - int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 457 - int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 458 - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 459 - if (this.method6633(var8, var9, var13, var14, var3, var4)) { // L: 460 - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 461 - Arrays.fill(this.sprite.pixels, 0); // L: 464 + void method6096(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class105.field1331 != null) { // L: 448 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 449 + int var8 = var3 + 512; // L: 450 + int var9 = var4 + 512; // L: 451 + float var10 = 1.0F; // L: 452 + var8 = (int)((float)var8 / var10); // L: 453 + var9 = (int)((float)var9 / var10); // L: 454 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 455 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 456 + int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 457 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 458 + if (this.method6095(var8, var9, var13, var14, var3, var4)) { // L: 459 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 460 + Arrays.fill(this.sprite.pixels, 0); // L: 463 } else { - this.sprite = new SpritePixels(var8, var9); // L: 462 + this.sprite = new SpritePixels(var8, var9); // L: 461 } - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 465 - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 466 - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 467 - HealthBarUpdate.field1016.method4511(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 468 - this.field4044 = Client.field674; // L: 469 - var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 470 - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 471 + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 464 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 465 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 466 + class105.field1331.method4658(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 467 + this.field4039 = Client.field623; // L: 468 + var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 469 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 470 } - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 473 - if (1.0F == var10) { // L: 474 - this.sprite.method6426(var13, var14, 192); // L: 475 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 472 + if (1.0F == var10) { // L: 473 + this.sprite.method6991(var13, var14, 192); // L: 474 } else { - this.sprite.method6347(var13, var14, (int)((float)var8 * var10), (int)(var10 * (float)var9), 192); // L: 478 + this.sprite.method7010(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 477 } } - } // L: 481 + } // L: 480 - @ObfuscatedName("ay") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1634362123" + garbageValue = "1928614918" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { // L: 484 - if (!this.worldMapManager.isLoaded()) { // L: 487 - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 488 - if (!this.worldMapManager.isLoaded()) { // L: 489 - return; // L: 490 + if (this.cacheLoader.isLoaded()) { // L: 483 + if (!this.worldMapManager.isLoaded()) { // L: 486 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 487 + if (!this.worldMapManager.isLoaded()) { // L: 488 + return; // L: 489 } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 493 + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 492 } - } // L: 485 494 + } // L: 484 493 - @ObfuscatedName("am") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1829622274" + garbageValue = "-478155082" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); // L: 497 - } // L: 498 + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 496 + } // L: 497 - @ObfuscatedName("ag") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIIB)V", - garbageValue = "-22" + garbageValue = "-13" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { - byte var6 = 20; // L: 501 - int var7 = var3 / 2 + var1; // L: 502 - int var8 = var4 / 2 + var2 - 18 - var6; // L: 503 - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 504 - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 505 - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 506 - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 507 - } // L: 508 + byte var6 = 20; // L: 500 + int var7 = var3 / 2 + var1; // L: 501 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 502 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 503 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 504 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 505 + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 506 + } // L: 507 - @ObfuscatedName("ae") + @ObfuscatedName("y") @ObfuscatedSignature( descriptor = "(II)F", - garbageValue = "2058338790" + garbageValue = "1463277853" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { - if (var1 == 25) { // L: 511 + if (var1 == 25) { // L: 510 return 1.0F; - } else if (var1 == 37) { // L: 512 + } else if (var1 == 37) { // L: 511 return 1.5F; - } else if (var1 == 50) { - return 2.0F; // L: 513 - } else if (var1 == 75) { // L: 514 + } else if (var1 == 50) { // L: 512 + return 2.0F; + } else if (var1 == 75) { // L: 513 return 3.0F; } else { - return var1 == 100 ? 4.0F : 8.0F; // L: 515 516 + return var1 == 100 ? 4.0F : 8.0F; // L: 514 515 } } @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "755044862" + descriptor = "(B)I", + garbageValue = "10" ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { // L: 520 + if ((double)this.zoomTarget == 1.0D) { // L: 519 return 25; - } else if (1.5D == (double)this.zoomTarget) { // L: 521 + } else if (1.5D == (double)this.zoomTarget) { // L: 520 return 37; - } else if ((double)this.zoomTarget == 2.0D) { // L: 522 + } else if ((double)this.zoomTarget == 2.0D) { // L: 521 return 50; - } else if (3.0D == (double)this.zoomTarget) { // L: 523 + } else if ((double)this.zoomTarget == 3.0D) { // L: 522 return 75; } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 524 525 + return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 523 524 } } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "7039" + garbageValue = "7601" ) @Export("loadCache") public void loadCache() { - this.cacheLoader.load(); // L: 529 - } // L: 530 + this.cacheLoader.load(); // L: 528 + } // L: 529 - @ObfuscatedName("at") + @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1977951354" + descriptor = "(B)Z", + garbageValue = "112" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); // L: 533 + return this.cacheLoader.isLoaded(); // L: 532 } - @ObfuscatedName("ak") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(II)Lar;", - garbageValue = "24879988" + descriptor = "(II)Leq;", + garbageValue = "324822975" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); // L: 537 + Iterator var2 = this.details.values().iterator(); // L: 536 WorldMapArea var3; do { if (!var2.hasNext()) { - return null; // L: 545 + return null; // L: 544 } - var3 = (WorldMapArea)var2.next(); // L: 538 - } while(var3.getId() != var1); // L: 540 + var3 = (WorldMapArea)var2.next(); // L: 537 + } while(var3.getId() != var1); // L: 539 - return var3; // L: 541 + return var3; // L: 540 + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "21" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 548 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 551 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 552 + } + } // L: 549 553 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "585943441" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 556 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 559 + this.worldMapTargetX = -1; // L: 560 + this.worldMapTargetY = -1; // L: 561 + } + } // L: 557 562 + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "2024921554" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 565 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 568 + if (var4 != null) { // L: 569 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 570 + } + + } + } // L: 566 572 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "92" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 575 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 578 + if (var4 != null) { // L: 579 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 580 + } + + } + } // L: 576 582 + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-132740090" + ) + @Export("getDisplayX") + public int getDisplayX() { + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 585 586 588 } @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1763337265" - ) - @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 549 - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 552 - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 553 - } - } // L: 550 554 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1279892888" - ) - @Export("setWorldMapPositionTargetInstant") - public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { // L: 557 - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 560 - this.worldMapTargetX = -1; // L: 561 - this.worldMapTargetY = -1; // L: 562 - } - } // L: 558 563 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1845440607" - ) - @Export("jumpToSourceCoord") - public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 566 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 569 - if (var4 != null) { // L: 570 - this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 571 - } - - } - } // L: 567 573 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "739439346" - ) - @Export("jumpToSourceCoordInstant") - public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { // L: 576 - int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 579 - if (var4 != null) { // L: 580 - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 581 - } - - } - } // L: 577 583 - - @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1657700908" - ) - @Export("getDisplayX") - public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 586 587 589 - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-162188906" + garbageValue = "923209033" ) @Export("getDisplayY") public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 593 594 596 + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 592 593 595 } - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( - descriptor = "(I)Lhd;", - garbageValue = "39771742" + descriptor = "(I)Lhk;", + garbageValue = "-1553151088" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 600 601 603 + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 599 600 602 } - @ObfuscatedName("ah") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1570043056" + garbageValue = "-1469564176" ) @Export("getDisplayWith") public int getDisplayWith() { - return this.worldMapDisplayWidth; // L: 607 + return this.worldMapDisplayWidth; // L: 606 } - @ObfuscatedName("ap") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-2065229363" ) @Export("getDisplayHeight") public int getDisplayHeight() { - return this.worldMapDisplayHeight; // L: 611 + return this.worldMapDisplayHeight; // L: 610 } - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1795336966" + garbageValue = "-1186313481" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { - if (var1 >= 1) { // L: 615 - this.maxFlashCount = var1; // L: 616 + if (var1 >= 1) { // L: 614 + this.maxFlashCount = var1; // L: 615 } - } // L: 618 - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-62" - ) - @Export("resetMaxFlashCount") - public void resetMaxFlashCount() { - this.maxFlashCount = 3; // L: 621 - } // L: 622 + } // L: 617 @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1255497148" + ) + @Export("resetMaxFlashCount") + public void resetMaxFlashCount() { + this.maxFlashCount = 3; // L: 620 + } // L: 621 + + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "91922323" + garbageValue = "-433512779" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { // L: 625 - this.cyclesPerFlash = var1; // L: 626 + if (var1 >= 1) { // L: 624 + this.cyclesPerFlash = var1; // L: 625 } - } // L: 628 + } // L: 627 - @ObfuscatedName("ab") + @ObfuscatedName("az") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "24643102" + garbageValue = "-1067426400" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; // L: 631 - } // L: 632 + this.cyclesPerFlash = 50; // L: 630 + } // L: 631 @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1604690679" + garbageValue = "667819567" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; // L: 635 - } // L: 636 + this.perpetualFlash = var1; // L: 634 + } // L: 635 - @ObfuscatedName("ad") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-18" + descriptor = "(II)V", + garbageValue = "-773455874" ) @Export("flashElement") public void flashElement(int var1) { - this.flashingElements = new HashSet(); // L: 639 - this.flashingElements.add(var1); // L: 640 - this.flashCount = 0; // L: 641 - this.flashCycle = 0; // L: 642 - } // L: 643 + this.flashingElements = new HashSet(); // L: 638 + this.flashingElements.add(var1); // L: 639 + this.flashCount = 0; // L: 640 + this.flashCycle = 0; // L: 641 + } // L: 642 - @ObfuscatedName("af") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "176453590" + garbageValue = "1749900916" ) @Export("flashCategory") public void flashCategory(int var1) { - this.flashingElements = new HashSet(); // L: 646 - this.flashCount = 0; // L: 647 - this.flashCycle = 0; // L: 648 + this.flashingElements = new HashSet(); // L: 645 + this.flashCount = 0; // L: 646 + this.flashCycle = 0; // L: 647 - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 649 - if (InvDefinition.WorldMapElement_get(var2) != null && InvDefinition.WorldMapElement_get(var2).category == var1) { // L: 650 653 - this.flashingElements.add(InvDefinition.WorldMapElement_get(var2).objectId); // L: 654 + for (int var2 = 0; var2 < class370.WorldMapElement_count; ++var2) { // L: 648 + if (ByteArrayPool.WorldMapElement_get(var2) != null && ByteArrayPool.WorldMapElement_get(var2).category == var1) { // L: 649 652 + this.flashingElements.add(ByteArrayPool.WorldMapElement_get(var2).objectId); // L: 653 } } - } // L: 657 + } // L: 656 - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "119" + descriptor = "(I)V", + garbageValue = "1053661130" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { - this.flashingElements = null; // L: 660 - } // L: 661 + this.flashingElements = null; // L: 659 + } // L: 660 - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "651351210" + garbageValue = "1814568635" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; // L: 664 - } // L: 665 + this.elementsDisabled = !var1; // L: 663 + } // L: 664 - @ObfuscatedName("bj") + @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "-1491746515" + garbageValue = "-1973422189" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { - if (!var2) { // L: 668 - this.enabledElements.add(var1); // L: 669 + if (!var2) { // L: 667 + this.enabledElements.add(var1); // L: 668 } else { - this.enabledElements.remove(var1); // L: 672 + this.enabledElements.remove(var1); // L: 671 } - this.method6571(); // L: 674 - } // L: 675 + this.method6128(); // L: 673 + } // L: 674 - @ObfuscatedName("bn") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "375985188" + descriptor = "(IZB)V", + garbageValue = "8" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { // L: 678 - this.enabledCategories.add(var1); // L: 679 + if (!var2) { // L: 677 + this.enabledCategories.add(var1); // L: 678 } else { - this.enabledCategories.remove(var1); // L: 682 + this.enabledCategories.remove(var1); // L: 681 } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 684 - if (InvDefinition.WorldMapElement_get(var3) != null && InvDefinition.WorldMapElement_get(var3).category == var1) { // L: 685 688 - int var4 = InvDefinition.WorldMapElement_get(var3).objectId; // L: 689 - if (!var2) { // L: 690 - this.enabledElementIds.add(var4); // L: 691 + for (int var3 = 0; var3 < class370.WorldMapElement_count; ++var3) { // L: 683 + if (ByteArrayPool.WorldMapElement_get(var3) != null && ByteArrayPool.WorldMapElement_get(var3).category == var1) { // L: 684 687 + int var4 = ByteArrayPool.WorldMapElement_get(var3).objectId; // L: 688 + if (!var2) { // L: 689 + this.enabledElementIds.add(var4); // L: 690 } else { - this.enabledElementIds.remove(var4); // L: 694 + this.enabledElementIds.remove(var4); // L: 693 } } } - this.method6571(); // L: 698 - } // L: 699 + this.method6128(); // L: 697 + } // L: 698 - @ObfuscatedName("bi") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "565606727" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; // L: 702 + return !this.elementsDisabled; // L: 701 } - @ObfuscatedName("bp") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "799594991" + garbageValue = "-1222988471" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); // L: 706 + return !this.enabledElements.contains(var1); // L: 705 + } + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "15510212" + ) + @Export("isCategoryDisabled") + public boolean isCategoryDisabled(int var1) { + return !this.enabledCategories.contains(var1); // L: 709 } @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1690733813" - ) - @Export("isCategoryDisabled") - public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); // L: 710 - } - - @ObfuscatedName("bq") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "793022783" + garbageValue = "-2070055474" ) - void method6571() { - this.field4032.clear(); // L: 714 - this.field4032.addAll(this.enabledElements); // L: 715 - this.field4032.addAll(this.enabledElementIds); // L: 716 - } // L: 717 + void method6128() { + this.field4005.clear(); // L: 713 + this.field4005.addAll(this.enabledElements); // L: 714 + this.field4005.addAll(this.enabledElementIds); // L: 715 + } // L: 716 - @ObfuscatedName("bx") + @ObfuscatedName("bn") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-2078368565" + garbageValue = "551646228" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { // L: 720 - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 723 - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 724 - List var9 = this.worldMapManager.method722(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: 725 - if (!var9.isEmpty()) { // L: 726 + if (this.cacheLoader.isLoaded()) { // L: 719 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 722 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 723 + List var9 = this.worldMapManager.method2936(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 724 + if (!var9.isEmpty()) { // L: 725 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { // L: 729 - return; // L: 745 + if (!var10.hasNext()) { // L: 728 + return; // L: 744 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 730 - WorldMapElement var12 = InvDefinition.WorldMapElement_get(var11.getElement()); // L: 732 - var13 = false; // L: 733 + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 729 + WorldMapElement var12 = ByteArrayPool.WorldMapElement_get(var11.getElement()); // L: 731 + var13 = false; // L: 732 - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 734 - if (var12.menuActions[var14] != null) { // L: 735 - WorldMapManager.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 736 - var13 = true; // L: 737 + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 733 + if (var12.menuActions[var14] != null) { // L: 734 + SpriteMask.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 735 + var13 = true; // L: 736 } } - } while(!var13); // L: 740 + } while(!var13); // L: 739 } } - } // L: 721 727 741 + } // L: 720 726 740 - @ObfuscatedName("bc") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(ILhd;I)Lhd;", - garbageValue = "242977526" + descriptor = "(ILhk;B)Lhk;", + garbageValue = "-88" ) - public Coord method6643(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { // L: 748 - return null; // L: 749 - } else if (!this.worldMapManager.isLoaded()) { // L: 751 - return null; // L: 752 - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 754 - return null; // L: 755 + public Coord method6130(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 747 + return null; // L: 748 + } else if (!this.worldMapManager.isLoaded()) { // L: 750 + return null; // L: 751 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 753 + return null; // L: 754 } else { - HashMap var3 = this.worldMapManager.buildIcons(); // L: 757 - List var4 = (List)var3.get(var1); // L: 758 - if (var4 != null && !var4.isEmpty()) { // L: 759 - AbstractWorldMapIcon var5 = null; // L: 762 - int var6 = -1; // L: 763 - Iterator var7 = var4.iterator(); // L: 764 + HashMap var3 = this.worldMapManager.buildIcons(); // L: 756 + List var4 = (List)var3.get(var1); // L: 757 + if (var4 != null && !var4.isEmpty()) { // L: 758 + AbstractWorldMapIcon var5 = null; // L: 761 + int var6 = -1; // L: 762 + Iterator var7 = var4.iterator(); // L: 763 while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; // L: 779 + return var5.coord2; // L: 778 } - var8 = (AbstractWorldMapIcon)var7.next(); // L: 765 - int var9 = var8.coord2.x - var2.x; // L: 767 - int var10 = var8.coord2.y - var2.y; // L: 768 - var11 = var9 * var9 + var10 * var10; // L: 769 - if (var11 == 0) { // L: 770 - return var8.coord2; // L: 771 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 764 + int var9 = var8.coord2.x - var2.x; // L: 766 + int var10 = var8.coord2.y - var2.y; // L: 767 + var11 = var9 * var9 + var10 * var10; // L: 768 + if (var11 == 0) { // L: 769 + return var8.coord2; // L: 770 } - } while(var11 >= var6 && var5 != null); // L: 773 + } while(var11 >= var6 && var5 != null); // L: 772 - var5 = var8; // L: 774 - var6 = var11; // L: 775 + var5 = var8; // L: 773 + var6 = var11; // L: 774 } } else { - return null; // L: 760 + return null; // L: 759 } } } - @ObfuscatedName("bw") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "(IILhd;Lhd;I)V", - garbageValue = "-1238486806" + descriptor = "(IILhk;Lhk;I)V", + garbageValue = "765993102" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); // L: 783 - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 784 - var5.setArgs(new Object[]{var6}); // L: 785 - switch(var1) { // L: 786 + ScriptEvent var5 = new ScriptEvent(); // L: 782 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 783 + var5.setArgs(new Object[]{var6}); // L: 784 + switch(var1) { // L: 785 case 1008: - var5.setType(10); // L: 794 - break; // L: 795 + var5.setType(10); // L: 808 + break; case 1009: - var5.setType(11); // L: 799 - break; // L: 800 + var5.setType(11); // L: 798 + break; // L: 799 case 1010: - var5.setType(12); // L: 804 - break; // L: 805 + var5.setType(12); // L: 803 + break; // L: 804 case 1011: - var5.setType(13); // L: 789 + var5.setType(13); // L: 788 break; case 1012: - var5.setType(14); // L: 809 + var5.setType(14); // L: 793 } - PacketWriter.runScriptEvent(var5); // L: 813 - } // L: 814 + class19.runScriptEvent(var5); // L: 812 + } // L: 813 - @ObfuscatedName("bv") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "(B)Laj;", - garbageValue = "-77" + descriptor = "(I)Lfg;", + garbageValue = "1625574905" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { // L: 817 - return null; // L: 818 - } else if (!this.worldMapManager.isLoaded()) { // L: 820 - return null; // L: 821 + if (!this.cacheLoader.isLoaded()) { // L: 816 + return null; // L: 817 + } else if (!this.worldMapManager.isLoaded()) { // L: 819 + return null; // L: 820 } else { - HashMap var1 = this.worldMapManager.buildIcons(); // L: 823 - this.field4035 = new LinkedList(); // L: 824 - Iterator var2 = var1.values().iterator(); // L: 825 + HashMap var1 = this.worldMapManager.buildIcons(); // L: 822 + this.field4047 = new LinkedList(); // L: 823 + Iterator var2 = var1.values().iterator(); // L: 824 while (var2.hasNext()) { - List var3 = (List)var2.next(); // L: 826 - this.field4035.addAll(var3); // L: 828 + List var3 = (List)var2.next(); // L: 825 + this.field4047.addAll(var3); // L: 827 } - this.iconIterator = this.field4035.iterator(); // L: 831 - return this.iconNext(); // L: 832 + this.iconIterator = this.field4047.iterator(); // L: 830 + return this.iconNext(); // L: 831 } } @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "(B)Laj;", - garbageValue = "-25" + descriptor = "(B)Lfg;", + garbageValue = "23" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { // L: 836 - return null; // L: 837 + if (this.iconIterator == null) { // L: 835 + return null; // L: 836 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { // L: 839 - return null; // L: 845 + if (!this.iconIterator.hasNext()) { // L: 838 + return null; // L: 844 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 840 - } while(var1.getElement() == -1); // L: 841 + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 839 + } while(var1.getElement() == -1); // L: 840 - return var1; // L: 842 + return var1; // L: 841 } } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1611977737" + ) + @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/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 00c337f9af..f5f2d21d2b 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("ml") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("cacheName") String cacheName; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -925994251 + intValue = -19121881 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("loaded") boolean loaded; @ObfuscatedSignature( - descriptor = "(Lig;)V" + descriptor = "(Lir;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; // L: 13 @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; // L: 17 } // L: 18 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1607253331" + garbageValue = "-2104011211" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } // L: 22 25 31 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-460265936" + garbageValue = "-1494389281" ) @Export("load") int load() { if (this.percentLoaded < 33) { // L: 34 - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field323.name, this.cacheName)) { // L: 35 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field1761.name, this.cacheName)) { // L: 35 return this.percentLoaded; // L: 36 } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { // L: 40 - if (this.archive.isValidFileName(WorldMapCacheName.field324.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field324.name, this.cacheName)) { // L: 41 42 + if (this.archive.isValidFileName(WorldMapCacheName.field1763.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field1763.name, this.cacheName)) { // L: 41 42 return this.percentLoaded; // L: 43 } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { // L: 48 - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field326.name)) { // L: 49 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field1765.name)) { // L: 49 return this.percentLoaded; // L: 50 } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; // L: 55 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "868597570" + garbageValue = "1534667741" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; // L: 59 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-754192338" + garbageValue = "1994468018" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 4d721be063..09e946e790 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,4 +1,3 @@ -import java.awt.Component; import java.util.Iterator; import java.util.LinkedList; import net.runelite.mapping.Export; @@ -6,74 +5,81 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ar") +@ObfuscatedName("eq") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("dm") + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lfu;" ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("n") + @Export("scene") + static Scene scene; + @ObfuscatedName("hx") @ObfuscatedGetter( - intValue = -63029259 + intValue = 1615990339 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1514003013 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("internalName") String internalName; - @ObfuscatedName("d") + @ObfuscatedName("u") @Export("externalName") String externalName; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1891033177 + intValue = -720115575 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1386343271 + intValue = -297812541 ) @Export("zoom") int zoom; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhk;" ) @Export("origin") Coord origin; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -861412381 + intValue = 904812453 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1942318889 + intValue = 766167871 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1790073795 + intValue = 832142727 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -407810153 + intValue = -1806584787 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("isMain") boolean isMain; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("sections") LinkedList sections; @@ -89,10 +95,10 @@ public class WorldMapArea { this.isMain = false; // L: 19 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-285424184" + descriptor = "(Lnu;II)V", + garbageValue = "747590204" ) @Export("read") public void read(Buffer var1, int var2) { @@ -108,48 +114,48 @@ public class WorldMapArea { this.sections = new LinkedList(); // L: 32 for (int var4 = 0; var4 < var3; ++var4) { // L: 33 - this.sections.add(this.readWorldMapSection(var1)); // L: 34 + this.sections.add(this.readWorldMapSection(var1)); } this.setBounds(); // L: 36 - } + } // L: 37 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;I)Lab;", - garbageValue = "369407724" + descriptor = "(Lnu;I)Lfv;", + garbageValue = "715187393" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43 - WorldMapSectionType var4 = (WorldMapSectionType)InterfaceParent.findEnumerated(var3, var2); // L: 45 + int var2 = var1.readUnsignedByte(); // L: 40 + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43 + WorldMapSectionType var4 = (WorldMapSectionType)UserComparator8.findEnumerated(var3, var2); // L: 45 Object var5 = null; // L: 46 switch(var4.type) { // L: 47 case 0: - var5 = new WorldMapSection1(); // L: 58 - break; // L: 59 + var5 = new class147(); // L: 54 + break; // L: 55 case 1: - var5 = new class51(); // L: 55 - break; // L: 56 - case 2: - var5 = new WorldMapSection0(); // L: 49 + var5 = new WorldMapSection1(); // L: 49 break; + case 2: + var5 = new WorldMapSection2(); // L: 57 + break; // L: 58 case 3: - var5 = new WorldMapSection2(); // L: 52 - break; // L: 53 + var5 = new WorldMapSection0(); // L: 60 + break; default: - throw new IllegalStateException(""); // L: 61 + throw new IllegalStateException(""); // L: 52 } ((WorldMapSection)var5).read(var1); // L: 63 return (WorldMapSection)var5; // L: 64 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIII)Z", - garbageValue = "1455116535" + garbageValue = "1809400826" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -164,13 +170,13 @@ public class WorldMapArea { var5 = (WorldMapSection)var4.next(); // L: 69 } while(!var5.containsCoord(var1, var2, var3)); // L: 71 - return true; // L: 72 + return true; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-1715040975" + garbageValue = "-1003463071" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -198,10 +204,10 @@ public class WorldMapArea { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "332088974" + garbageValue = "416531869" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -209,7 +215,7 @@ public class WorldMapArea { WorldMapSection var5; do { - if (!var4.hasNext()) { + if (!var4.hasNext()) { // L: 103 return null; // L: 104 } @@ -219,10 +225,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); // L: 100 } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "1033497447" + descriptor = "(III)Lhk;", + garbageValue = "2101787802" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -230,7 +236,7 @@ public class WorldMapArea { WorldMapSection var4; do { - if (!var3.hasNext()) { // L: 115 + if (!var3.hasNext()) { return null; // L: 116 } @@ -240,10 +246,10 @@ public class WorldMapArea { return var4.coord(var1, var2); // L: 112 } - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2087726603" + garbageValue = "1832411393" ) @Export("setBounds") void setBounds() { @@ -256,164 +262,203 @@ public class WorldMapArea { } // L: 126 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "872580750" + garbageValue = "2062295342" ) @Export("getId") public int getId() { return this.id; // L: 129 } - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-7" + descriptor = "(I)Z", + garbageValue = "461643784" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; // L: 133 } - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1550692471" + garbageValue = "-1819862501" ) @Export("getInternalName") public String getInternalName() { return this.internalName; // L: 137 } - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "2036253540" + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-82" ) @Export("getExternalName") public String getExternalName() { return this.externalName; // L: 141 } - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" + descriptor = "(I)I", + garbageValue = "753799862" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; // L: 145 } - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2014656389" + garbageValue = "1445982184" ) @Export("getZoom") public int getZoom() { return this.zoom; // L: 149 } - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "128" + descriptor = "(B)I", + garbageValue = "24" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; // L: 153 } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "20" + garbageValue = "116" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; // L: 157 } - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2024807463" + garbageValue = "-2085770909" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; // L: 161 } - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1949221943" + garbageValue = "1254165829" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; // L: 165 } - @ObfuscatedName("g") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "759917118" + garbageValue = "-1410964110" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; // L: 169 } - @ObfuscatedName("u") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-13" + descriptor = "(S)I", + garbageValue = "4919" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; // L: 173 } - @ObfuscatedName("t") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-51" + garbageValue = "63" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; // L: 177 } - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lhd;", - garbageValue = "-1797620911" + descriptor = "(I)Lhk;", + garbageValue = "-714822914" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); // L: 181 } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "141354959" + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-947353982" ) - static void method489(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 - var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 - } // L: 40 + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return class21.method316(var0, 10, true); // L: 34 + } - @ObfuscatedName("jj") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1792034229" + descriptor = "(IB)[B", + garbageValue = "18" ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; // L: 10365 + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-993034647" + ) + static int method2740(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1073 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1074 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.x; // L: 1075 + return 1; // L: 1076 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1078 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.y; // L: 1079 + return 1; // L: 1080 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1082 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.width; // L: 1083 + return 1; // L: 1084 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1086 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.height; // L: 1087 + return 1; // L: 1088 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1090 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1091 + return 1; // L: 1092 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1094 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.parentId; // L: 1095 + return 1; // L: 1096 + } else { + return 2; // L: 1098 + } + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + descriptor = "(Lhu;I)Z", + garbageValue = "440915192" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 11595 } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 8e9fbdf4b9..91bd688821 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -1,3 +1,4 @@ +import java.net.URL; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -6,31 +7,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("au") +@ObfuscatedName("fr") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("nz") - @ObfuscatedSignature( - descriptor = "[Lhz;" - ) - static Widget[] field362; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("iconList") List iconList; WorldMapAreaData() { } // L: 14 - @ObfuscatedName("cn") + @ObfuscatedName("bm") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;IZI)V", - garbageValue = "1841942277" + descriptor = "(Lnu;Lnu;IZI)V", + garbageValue = "-1186228166" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -52,91 +48,137 @@ public class WorldMapAreaData extends WorldMapArea { } var6 = var2.readUnsignedShort(); // L: 30 - this.worldMapData1Set = new HashSet(var6); // L: 31 + this.worldMapData1Set = new HashSet(var6); for (int var10 = 0; var10 < var6; ++var10) { // L: 32 - WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 + WorldMapData_1 var8 = new WorldMapData_1(); try { - var8.init(var2); // L: 35 - } catch (IllegalStateException var11) { // L: 37 - continue; // L: 38 + var8.init(var2); + } catch (IllegalStateException var11) { + continue; } - this.worldMapData1Set.add(var8); // L: 40 + this.worldMapData1Set.add(var8); } - this.initIconsList(var2, var4); // L: 42 - } // L: 43 + this.initIconsList(var2, var4); + } - @ObfuscatedName("cj") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(Lkx;ZI)V", - garbageValue = "-1098628565" + descriptor = "(Lnu;ZI)V", + garbageValue = "-770265064" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { - this.iconList = new LinkedList(); // L: 46 - int var3 = var1.readUnsignedShort(); // L: 47 + this.iconList = new LinkedList(); + int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { // L: 48 - int var5 = var1.method5833(); // L: 49 - Coord var6 = new Coord(var1.readInt()); // L: 50 - boolean var7 = var1.readUnsignedByte() == 1; // L: 51 + int var5 = var1.method6597(); + Coord var6 = new Coord(var1.readInt()); + boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { // L: 52 this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 } } - } // L: 56 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Ljg;", - garbageValue = "1068014822" - ) - @Export("getObjectDefinition") - public static ObjectComposition getObjectDefinition(int var0) { - ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79 - if (var1 != null) { // L: 80 - return var1; - } else { - byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 81 - var1 = new ObjectComposition(); // L: 82 - var1.id = var0; // L: 83 - if (var2 != null) { // L: 84 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 85 - if (var1.isSolid) { // L: 86 - var1.interactType = 0; // L: 87 - var1.boolean1 = false; // L: 88 - } - - ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90 - return var1; // L: 91 - } } - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-91" - ) - public static void method782() { - if (class297.NetCache_socket != null) { // L: 102 - class297.NetCache_socket.close(); - } - - } // L: 103 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(B)V", + descriptor = "(B)Z", garbageValue = "1" ) - static final void method781() { - class300.method5473("Your ignore list is full. Max of 100 for free users, and 400 for members"); // L: 154 - } // L: 155 + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (World.World_request == null) { // L: 31 + World.World_request = class32.urlRequester.request(new URL(class244.field2909)); + } else if (World.World_request.isDone()) { // L: 33 + byte[] var0 = World.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + class9.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 = class9.World_worlds[var2] = new World(); // L: 40 + var3.id = var1.readUnsignedShort(); // L: 41 + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); + var3.activity = var1.readStringCp1252NullTerminated(); + var3.location = var1.readUnsignedByte(); // L: 45 + var3.population = var1.readShort(); // L: 46 + } + + class208.sortWorlds(class9.World_worlds, 0, class9.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + World.World_request = null; // L: 50 + return true; // L: 51 + } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + World.World_request = null; // L: 57 + } + + return false; // L: 59 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1371665339" + ) + public static void method3212() { + VarbitComposition.VarbitDefinition_cached.clear(); // L: 43 + } // L: 44 + + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "1280452567" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 11633 + short[] var2 = new short[16]; // L: 11634 + int var3 = 0; // L: 11635 + + for (int var4 = 0; var4 < UserComparator8.ItemDefinition_fileCount; ++var4) { // L: 11636 + ItemComposition var9 = class23.ItemDefinition_get(var4); // L: 11637 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11638 11639 11640 + if (var3 >= 250) { // L: 11641 + ItemLayer.foundItemIdCount = -1; // L: 11642 + class19.foundItemIds = null; // L: 11643 + return; // L: 11644 + } + + if (var3 >= var2.length) { // L: 11646 + short[] var6 = new short[var2.length * 2]; // L: 11647 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 11648 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 11649 + } + + var2[var3++] = (short)var4; // L: 11651 + } + } + + class19.foundItemIds = var2; // L: 11653 + class203.foundItemIndex = 0; // L: 11654 + ItemLayer.foundItemIdCount = var3; // L: 11655 + String[] var8 = new String[ItemLayer.foundItemIdCount]; // L: 11656 + + for (int var5 = 0; var5 < ItemLayer.foundItemIdCount; ++var5) { // L: 11657 + var8[var5] = class23.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = class19.foundItemIds; // L: 11658 + class283.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11660 + } // L: 11662 } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 0c5b4b488c..636123ed2c 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,109 +1,310 @@ +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("an") +@ObfuscatedName("fl") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lfl;" ) - public static final WorldMapCacheName field333; - @ObfuscatedName("v") + public static final WorldMapCacheName field1768; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lfl;" ) - public static final WorldMapCacheName field323; - @ObfuscatedName("d") + public static final WorldMapCacheName field1761; + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lfl;" ) - public static final WorldMapCacheName field324; - @ObfuscatedName("c") + public static final WorldMapCacheName field1763; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lfl;" ) - static final WorldMapCacheName field325; - @ObfuscatedName("y") + static final WorldMapCacheName field1764; + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lfl;" ) - public static final WorldMapCacheName field326; - @ObfuscatedName("dc") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("h") + public static final WorldMapCacheName field1765; + @ObfuscatedName("e") @Export("name") public final String name; static { - field333 = new WorldMapCacheName("details"); // L: 4 - field323 = new WorldMapCacheName("compositemap"); // L: 5 - field324 = new WorldMapCacheName("compositetexture"); // L: 6 - field325 = new WorldMapCacheName("area"); // L: 7 - field326 = new WorldMapCacheName("labels"); // L: 8 + field1768 = new WorldMapCacheName("details"); // L: 4 + field1761 = new WorldMapCacheName("compositemap"); // L: 5 + field1763 = new WorldMapCacheName("compositetexture"); // L: 6 + field1764 = new WorldMapCacheName("area"); // L: 7 + field1765 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { this.name = var1; // L: 12 } // L: 13 - @ObfuscatedName("c") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1996576804" + descriptor = "(B)Z", + garbageValue = "126" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { // L: 212 + public static boolean method3189() { + long var0 = ObjectSound.currentTimeMillis(); // L: 42 + int var2 = (int)(var0 - NetCache.field3284); // L: 43 + NetCache.field3284 = var0; // L: 44 + if (var2 > 200) { // L: 45 + var2 = 200; + } + + NetCache.NetCache_loadTime += var2; // L: 46 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 return true; - } else if (!FontName.Widget_archive.tryLoadGroup(var0)) { // L: 213 + } else if (class303.NetCache_socket == null) { // L: 48 return false; } else { - int var1 = FontName.Widget_archive.getGroupFileCount(var0); // L: 214 - if (var1 == 0) { // L: 215 - Widget.Widget_loadedInterfaces[var0] = true; // L: 216 - return true; // L: 217 - } else { - if (DefaultsGroup.Widget_interfaceComponents[var0] == null) { // L: 219 - DefaultsGroup.Widget_interfaceComponents[var0] = new Widget[var1]; - } + try { + if (NetCache.NetCache_loadTime > 30000) { // L: 50 + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 + var4 = new Buffer(4); // L: 53 + var4.writeByte(1); // L: 54 + var4.writeMedium((int)var3.key); // L: 55 + class303.NetCache_socket.write(var4.array, 0, 4); // L: 56 + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 + } - for (int var2 = 0; var2 < var1; ++var2) { // L: 220 - if (DefaultsGroup.Widget_interfaceComponents[var0][var2] == null) { // L: 221 - byte[] var3 = FontName.Widget_archive.takeFile(var0, var2); // L: 222 - if (var3 != null) { // L: 223 - DefaultsGroup.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 224 - DefaultsGroup.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 225 - if (var3[0] == -1) { // L: 226 - DefaultsGroup.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 + var4 = new Buffer(4); // L: 63 + var4.writeByte(0); // L: 64 + var4.writeMedium((int)var3.key); // L: 65 + class303.NetCache_socket.write(var4.array, 0, 4); // L: 66 + var3.removeDual(); // L: 67 + NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 + --NetCache.NetCache_pendingWritesCount; // L: 69 + ++NetCache.NetCache_pendingResponsesCount; // L: 70 + } + + for (int var15 = 0; var15 < 100; ++var15) { // L: 72 + int var16 = class303.NetCache_socket.available(); // L: 73 + if (var16 < 0) { // L: 74 + throw new IOException(); + } + + if (var16 == 0) { // L: 75 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 76 + byte var5 = 0; // L: 77 + if (class208.NetCache_currentResponse == null) { // L: 78 + var5 = 8; + } else if (NetCache.field3295 == 0) { // L: 79 + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { // L: 80 + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 + if (var6 > var16) { // L: 82 + var6 = var16; + } + + class303.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 + if (NetCache.field3287 != 0) { // L: 84 + for (var7 = 0; var7 < var6; ++var7) { // L: 85 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3287; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 + break; + } + + if (class208.NetCache_currentResponse == null) { // L: 89 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 + long var11 = (long)(var8 + (var7 << 16)); // L: 95 + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 + NetSocket.field1498 = true; // L: 97 + if (var13 == null) { // L: 98 + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 + NetSocket.field1498 = false; // L: 100 + } + + if (var13 == null) { // L: 102 + throw new IOException(); // L: 103 + } + + int var14 = var9 == 0 ? 5 : 9; // L: 105 + class208.NetCache_currentResponse = var13; // L: 106 + InterfaceParent.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class208.NetCache_currentResponse.padding); // L: 107 + InterfaceParent.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 + InterfaceParent.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 + NetCache.field3295 = 8; // L: 110 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 + } else if (NetCache.field3295 == 0) { // L: 114 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 + NetCache.field3295 = 1; // L: 116 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 + } else { + class208.NetCache_currentResponse = null; // L: 121 + } + } + } else { + var6 = InterfaceParent.NetCache_responseArchiveBuffer.array.length - class208.NetCache_currentResponse.padding; // L: 127 + var7 = 512 - NetCache.field3295; // L: 128 + if (var7 > var6 - InterfaceParent.NetCache_responseArchiveBuffer.offset) { // L: 129 + var7 = var6 - InterfaceParent.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { // L: 130 + var7 = var16; + } + + class303.NetCache_socket.read(InterfaceParent.NetCache_responseArchiveBuffer.array, InterfaceParent.NetCache_responseArchiveBuffer.offset, var7); // L: 131 + if (NetCache.field3287 != 0) { // L: 132 + for (var8 = 0; var8 < var7; ++var8) { // L: 133 + var10000 = InterfaceParent.NetCache_responseArchiveBuffer.array; + var10001 = var8 + InterfaceParent.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3287; + } + } + + var22 = InterfaceParent.NetCache_responseArchiveBuffer; // L: 135 + var22.offset += var7; + NetCache.field3295 += var7; // L: 136 + if (var6 == InterfaceParent.NetCache_responseArchiveBuffer.offset) { // L: 137 + if (16711935L == class208.NetCache_currentResponse.key) { // L: 138 + BuddyRankComparator.NetCache_reference = InterfaceParent.NetCache_responseArchiveBuffer; // L: 139 + + for (var8 = 0; var8 < 256; ++var8) { // L: 140 + Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 + if (var17 != null) { // L: 142 + BuddyRankComparator.NetCache_reference.offset = var8 * 8 + 5; // L: 143 + var10 = BuddyRankComparator.NetCache_reference.readInt(); // L: 144 + int var18 = BuddyRankComparator.NetCache_reference.readInt(); // L: 145 + var17.loadIndex(var10, var18); // L: 146 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 151 + NetCache.NetCache_crc.update(InterfaceParent.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 + var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 + if (var8 != class208.NetCache_currentResponse.crc) { // L: 154 + try { + class303.NetCache_socket.close(); // L: 156 + } catch (Exception var20) { // L: 158 + } + + ++NetCache.NetCache_crcMismatches; // L: 159 + class303.NetCache_socket = null; // L: 160 + NetCache.field3287 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 + return false; // L: 162 + } + + NetCache.NetCache_crcMismatches = 0; // L: 164 + NetCache.NetCache_ioExceptions = 0; // L: 165 + class208.NetCache_currentResponse.archive.write((int)(class208.NetCache_currentResponse.key & 65535L), InterfaceParent.NetCache_responseArchiveBuffer.array, 16711680L == (class208.NetCache_currentResponse.key & 16711680L), NetSocket.field1498); // L: 166 + } + + class208.NetCache_currentResponse.remove(); // L: 168 + if (NetSocket.field1498) { // L: 169 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 170 + } + + NetCache.field3295 = 0; // L: 171 + class208.NetCache_currentResponse = null; // L: 172 + InterfaceParent.NetCache_responseArchiveBuffer = null; // L: 173 } else { - DefaultsGroup.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 227 + if (NetCache.field3295 != 512) { // L: 175 + break; + } + + NetCache.field3295 = 0; } } } + + return true; // L: 179 + } + } catch (IOException var21) { + try { + class303.NetCache_socket.close(); // L: 183 + } catch (Exception var19) { // L: 185 } - Widget.Widget_loadedInterfaces[var0] = true; // L: 231 - return true; // L: 232 + ++NetCache.NetCache_ioExceptions; // L: 186 + class303.NetCache_socket = null; // L: 187 + return false; // L: 188 } } } - @ObfuscatedName("lk") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-11688" + descriptor = "(I)V", + garbageValue = "1888854268" ) - static void method715() { - if (Client.oculusOrbState == 1) { // L: 11624 - Client.field747 = true; // L: 11625 + static final void method3188() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { // L: 3289 + int var1 = Client.npcIndices[var0]; // L: 3290 + NPC var2 = Client.npcs[var1]; // L: 3291 + if (var2 != null) { // L: 3292 + class137.updateActorSequence(var2, var2.definition.size); // L: 3293 + } } - } // L: 11627 + } // L: 3296 + + @ObfuscatedName("kl") + @ObfuscatedSignature( + descriptor = "(IIIILoh;Lhh;S)V", + garbageValue = "4096" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) { + if (var4 != null) { // L: 11471 + int var6 = Client.camAngleY & 2047; // L: 11472 + int var7 = var3 * var3 + var2 * var2; // L: 11473 + if (var7 <= 6400) { // L: 11474 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11475 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11476 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11477 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11478 + if (var7 > 2500) { + var4.method7056(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: 11479 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11480 + } + + } + } + } // L: 11481 } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 52215ef6e3..170c5d4b52 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -1,31 +1,27 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("em") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive7") - static Archive archive7; + @ObfuscatedName("gd") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; WorldMapData_0() { } // L: 6 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "2072507243" + descriptor = "(Lnu;B)V", + garbageValue = "-40" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 9 - if (var2 != WorldMapID.field301.value) { // L: 10 + if (var2 != WorldMapID.field1741.value) { // L: 10 throw new IllegalStateException(""); // L: 11 } else { super.minPlane = var1.readUnsignedByte(); // L: 13 @@ -34,115 +30,53 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); // L: 16 super.regionX = var1.readUnsignedShort(); // L: 17 super.regionY = var1.readUnsignedShort(); // L: 18 - super.groupId = var1.method5833(); // L: 19 - super.fileId = var1.method5833(); // L: 20 + super.groupId = var1.method6597(); // L: 19 + super.fileId = var1.method6597(); // L: 20 } } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "36" + descriptor = "(Lnu;I)V", + garbageValue = "-930076916" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); // L: 24 super.floorUnderlayIds = new short[1][64][64]; // L: 25 super.floorOverlayIds = new short[super.planes][64][64]; // L: 26 - super.field193 = new byte[super.planes][64][64]; // L: 27 - super.field204 = new byte[super.planes][64][64]; // L: 28 + super.field1690 = new byte[super.planes][64][64]; // L: 27 + super.field1700 = new byte[super.planes][64][64]; // L: 28 super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29 int var2 = var1.readUnsignedByte(); // L: 30 - if (var2 != class39.field285.value) { + if (var2 != class157.field1732.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 int hashCode() { + return super.regionX | super.regionY << 8; // L: 55 } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_0)) { + if (!(var1 instanceof WorldMapData_0)) { // L: 47 return false; // L: 48 } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; - return super.regionX == var2.regionX && super.regionY == var2.regionY; + WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 + return super.regionX == var2.regionX && super.regionY == var2.regionY; // L: 51 } } - - public int hashCode() { - return super.regionX | super.regionY << 8; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-825511368" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (UserComparator9.World_request == null) { // L: 31 - UserComparator9.World_request = ScriptFrame.urlRequester.request(new URL(Projectile.field1254)); - } else if (UserComparator9.World_request.isDone()) { // L: 33 - byte[] var0 = UserComparator9.World_request.getResponse(); // L: 34 - Buffer var1 = new Buffer(var0); // L: 35 - var1.readInt(); // L: 36 - World.World_count = var1.readUnsignedShort(); // L: 37 - World.World_worlds = new World[World.World_count]; // L: 38 - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 - var3 = World.World_worlds[var2] = new World(); // L: 40 - var3.id = var1.readUnsignedShort(); // L: 41 - var3.properties = var1.readInt(); // L: 42 - var3.host = var1.readStringCp1252NullTerminated(); // L: 43 - var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 - var3.location = var1.readUnsignedByte(); // L: 45 - var3.population = var1.readShort(); // L: 46 - } - - class206.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 - UserComparator9.World_request = null; // L: 50 - return true; // L: 51 - } - } catch (Exception var4) { // L: 55 - var4.printStackTrace(); // L: 56 - UserComparator9.World_request = null; // L: 57 - } - - return false; // L: 59 - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-9455782" - ) - static int method250(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { // L: 508 - return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; // L: 509 - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "116" - ) - public static void method239() { - ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 543 - } // L: 544 } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index a1ba2fdae2..79d585390b 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -4,33 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +@ObfuscatedName("ef") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("aw") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("i") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 393401229 + intValue = 1430426623 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -444387603 + intValue = 1788634945 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("f") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2075814335 + intValue = 109249363 ) @Export("chunkX") int chunkX; - @ObfuscatedName("g") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -959045711 + intValue = 1024482067 ) @Export("chunkY") int chunkY; @@ -38,15 +35,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-1959285533" + descriptor = "(Lnu;I)V", + garbageValue = "370119865" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); // L: 14 - if (var2 != WorldMapID.field290.value) { // L: 15 + if (var2 != WorldMapID.field1744.value) { // L: 15 throw new IllegalStateException(""); // L: 16 } else { super.minPlane = var1.readUnsignedByte(); // L: 18 @@ -59,26 +56,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); // L: 25 this.chunkX = var1.readUnsignedByte(); // L: 26 this.chunkY = var1.readUnsignedByte(); // L: 27 - super.groupId = var1.method5833(); // L: 28 - super.fileId = var1.method5833(); // L: 29 + super.groupId = var1.method6597(); // L: 28 + super.fileId = var1.method6597(); // L: 29 } } // L: 30 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "36" + descriptor = "(Lnu;I)V", + garbageValue = "-930076916" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); // L: 33 super.floorUnderlayIds = new short[1][64][64]; // L: 34 super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 - super.field193 = new byte[super.planes][64][64]; // L: 36 - super.field204 = new byte[super.planes][64][64]; // L: 37 + super.field1690 = new byte[super.planes][64][64]; // L: 36 + super.field1700 = new byte[super.planes][64][64]; // L: 37 super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 int var2 = var1.readUnsignedByte(); // L: 39 - if (var2 != class39.field283.value) { // L: 40 + if (var2 != class157.field1733.value) { // L: 40 throw new IllegalStateException(""); // L: 41 } else { int var3 = var1.readUnsignedByte(); // L: 43 @@ -98,118 +95,175 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } // L: 55 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1716602813" + descriptor = "(B)I", + garbageValue = "28" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; // L: 73 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-26" + descriptor = "(I)I", + garbageValue = "-1048633905" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; // L: 77 } - @ObfuscatedName("y") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-477911557" + descriptor = "(B)I", + garbageValue = "3" ) @Export("getChunkX") int getChunkX() { return this.chunkX; // L: 81 } - @ObfuscatedName("ar") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "384332395" + descriptor = "(B)I", + garbageValue = "16" ) @Export("getChunkY") int getChunkY() { return this.chunkY; // L: 85 } + public int hashCode() { + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 + } + public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { // L: 58 return false; // L: 59 } else { WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 62 - return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 65 + return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; // L: 65 } else { return false; // L: 63 } } } - public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 - } - - @ObfuscatedName("jv") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "([Lhz;IS)V", - garbageValue = "11595" + descriptor = "(Lnu;IIIIIIB)V", + garbageValue = "117" ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10845 - Widget var3 = var0[var2]; // L: 10846 - if (var3 != null) { // L: 10847 - if (var3.type == 0) { // L: 10848 - if (var3.children != null) { // L: 10849 - runComponentCloseListeners(var3.children, var1); - } + @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: 138 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 139 - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10850 - if (var4 != null) { // L: 10851 - class228.runIntfCloseListeners(var4.group, var1); + while (true) { + var7 = var0.readUnsignedByte(); // L: 141 + if (var7 == 0) { // L: 142 + if (var1 == 0) { + Tiles.Tiles_heights[0][var2][var3] = -class148.method3015(var4 + var2 + 932731, var5 + var3 + 556238) * 8; // L: 143 + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 144 } + break; } - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { // L: 10853 - var5 = new ScriptEvent(); // L: 10854 - var5.widget = var3; // L: 10855 - var5.args = var3.onDialogAbort; // L: 10856 - PacketWriter.runScriptEvent(var5); // L: 10857 - } - - if (var1 == 1 && var3.onSubChange != null) { // L: 10859 - if (var3.childIndex >= 0) { // L: 10860 - Widget var6 = class237.getWidget(var3.id); // L: 10861 - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10862 - continue; - } + if (var7 == 1) { // L: 147 + int var8 = var0.readUnsignedByte(); // L: 148 + if (var8 == 1) { // L: 149 + var8 = 0; } - var5 = new ScriptEvent(); // L: 10866 - var5.widget = var3; // L: 10867 - var5.args = var3.onSubChange; // L: 10868 - PacketWriter.runScriptEvent(var5); // L: 10869 + if (var1 == 0) { // L: 150 + 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: 151 + } + break; + } + + if (var7 <= 49) { // L: 154 + Tiles.field1092[var1][var2][var3] = var0.readByte(); // L: 155 + Tiles.field1091[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 156 + class362.field4079[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 157 + } else if (var7 <= 81) { // L: 160 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 161 + } else { + class9.field69[var1][var2][var3] = (byte)(var7 - 81); // L: 164 + } + } + } else { + while (true) { + var7 = var0.readUnsignedByte(); // L: 169 + if (var7 == 0) { // L: 170 + break; + } + + if (var7 == 1) { // L: 171 + var0.readUnsignedByte(); // L: 172 + break; + } + + if (var7 <= 49) { // L: 175 + var0.readUnsignedByte(); } } } - } // L: 10872 + } // L: 178 - @ObfuscatedName("jr") + @ObfuscatedName("fx") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(Lcd;I)V", + garbageValue = "-716218662" ) - static final void method810(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11118 - WorldMapSectionType.clientPreferences.areaSoundEffectsVolume = var0; // L: 11119 - class23.savePreferences(); // L: 11120 - } // L: 11121 + static final void method2990(Actor var0) { + if (var0.field1268 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class225.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3461 + int var1 = var0.field1268 - var0.field1255; // L: 3462 + int var2 = Client.cycle - var0.field1255; // L: 3463 + int var3 = var0.field1258 * 64 + var0.field1240 * 128; // L: 3464 + int var4 = var0.field1258 * 64 + var0.field1253 * 128; // L: 3465 + int var5 = var0.field1258 * 64 + var0.field1252 * 128; // L: 3466 + int var6 = var0.field1258 * 64 + var0.field1239 * 128; // L: 3467 + var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1; // L: 3468 + var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; // L: 3469 + } + + var0.field1267 = 0; // L: 3471 + var0.orientation = var0.field1213; // L: 3472 + var0.rotation = var0.orientation; // L: 3473 + } // L: 3474 + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "(Lcv;ZI)V", + garbageValue = "827368922" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 11320 + int var3 = (int)var0.key; // L: 11321 + var0.remove(); // L: 11322 + if (var1) { // L: 11323 + WorldMapRegion.method2929(var2); + } + + class9.method118(var2); // L: 11324 + Widget var4 = class139.getWidget(var3); // L: 11325 + if (var4 != null) { // L: 11326 + class29.invalidateWidget(var4); + } + + AbstractWorldMapIcon.method3186(); // L: 11327 + if (Client.rootInterface != -1) { // L: 11328 + class379.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 11329 } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index f7ae2d07a8..4371ed3120 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,34 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("ej") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lly;" - ) - static IndexedSprite field237; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 948104613 - ) - static int field235; @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("Widget_modelsArchive") + public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -406250939 + intValue = 1578642713 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1381482747 + intValue = -212872709 ) @Export("decoration") final int decoration; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -102940373 + intValue = 2100927001 ) @Export("rotation") final int rotation; @@ -42,248 +38,146 @@ public class WorldMapDecoration { this.rotation = var3; // L: 11 } // L: 12 - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "792255319" + descriptor = "(Lnk;IB)Z", + garbageValue = "56" ) - @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) { - if (var6 >= var5) { - var1 = var3; // L: 70 - break; + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 368 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 369 + if (var0.readBits(1) != 0) { // L: 370 + updateExternalPlayer(var0, var1); } - label83: { - char var7 = var0.charAt(var6); // L: 42 - if (var6 == 0) { // L: 43 - if (var7 == '-') { // L: 44 - var2 = true; // L: 45 - break label83; - } - - if (var7 == '+') { // L: 48 - break label83; - } - } - - int var9; - if (var7 >= '0' && var7 <= '9') { // L: 50 - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { // L: 51 - var9 = var7 - '7'; - } else { - if (var7 < 'a' || var7 > 'z') { // L: 52 - var1 = false; // L: 54 - break; - } - - var9 = var7 - 'W'; - } - - if (var9 >= 10) { // L: 57 - var1 = false; // L: 58 - break; // L: 59 - } - - if (var2) { // L: 61 - var9 = -var9; - } - - int var8 = var9 + var4 * 10; // L: 62 - if (var4 != var8 / 10) { // L: 63 - var1 = false; // L: 64 - break; // L: 65 - } - - var4 = var8; // L: 67 - var3 = true; // L: 68 + var3 = var0.readBits(13); // L: 371 + var4 = var0.readBits(13); // L: 372 + boolean var12 = var0.readBits(1) == 1; // L: 373 + if (var12) { // L: 374 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; } - ++var6; // L: 41 + if (Client.players[var1] != null) { // L: 375 + throw new RuntimeException(); // L: 376 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 378 + var11.index = var1; // L: 379 + if (Players.field1352[var1] != null) { // L: 380 + var11.read(Players.field1352[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 381 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 382 + var7 = Players.Players_regions[var1]; // L: 383 + var8 = var7 >> 28; // L: 384 + var9 = var7 >> 14 & 255; // L: 385 + var10 = var7 & 255; // L: 386 + var11.pathTraversed[0] = Players.field1351[var1]; // L: 387 + var11.plane = (byte)var8; // L: 388 + var11.resetPath((var9 << 13) + var3 - ItemLayer.baseX, (var10 << 13) + var4 - Tile.baseY); // L: 389 + var11.field1189 = false; // L: 390 + return true; // L: 391 + } + } else if (var2 == 1) { // L: 393 + var3 = var0.readBits(2); // L: 394 + var4 = Players.Players_regions[var1]; // L: 395 + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 396 + return false; // L: 397 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 399 + var3 = var0.readBits(5); // L: 400 + var4 = var3 >> 3; // L: 401 + var5 = var3 & 7; // L: 402 + var6 = Players.Players_regions[var1]; // L: 403 + var7 = (var6 >> 28) + var4 & 3; // L: 404 + var8 = var6 >> 14 & 255; // L: 405 + var9 = var6 & 255; // L: 406 + if (var5 == 0) { // L: 407 + --var8; // L: 408 + --var9; // L: 409 + } + + if (var5 == 1) { // L: 411 + --var9; + } + + if (var5 == 2) { // L: 412 + ++var8; // L: 413 + --var9; // L: 414 + } + + if (var5 == 3) { // L: 416 + --var8; + } + + if (var5 == 4) { // L: 417 + ++var8; + } + + if (var5 == 5) { // L: 418 + --var8; // L: 419 + ++var9; // L: 420 + } + + if (var5 == 6) { // L: 422 + ++var9; + } + + if (var5 == 7) { // L: 423 + ++var8; // L: 424 + ++var9; // L: 425 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 427 + return false; // L: 428 + } else { + var3 = var0.readBits(18); // L: 430 + var4 = var3 >> 16; // L: 431 + var5 = var3 >> 8 & 255; // L: 432 + var6 = var3 & 255; // L: 433 + var7 = Players.Players_regions[var1]; // L: 434 + var8 = (var7 >> 28) + var4 & 3; // L: 435 + var9 = var5 + (var7 >> 14) & 255; // L: 436 + var10 = var7 + var6 & 255; // L: 437 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 438 + return false; // L: 439 + } } - - return var1; // L: 72 } - @ObfuscatedName("d") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "(Lkd;B)V", - garbageValue = "13" + descriptor = "(III)V", + garbageValue = "-858815063" ) - static final void method404(PacketBuffer var0) { - int var1 = 0; // L: 81 - var0.importIndex(); // L: 82 - - byte[] var10000; - int var2; - int var4; - int var5; - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 83 - var5 = Players.Players_indices[var2]; // L: 84 - if ((Players.field1275[var5] & 1) == 0) { // L: 85 - if (var1 > 0) { // L: 86 - --var1; // L: 87 - var10000 = Players.field1275; // L: 88 - var10000[var5] = (byte)(var10000[var5] | 2); + static final void method3105(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7780 + if (Client.showMouseOverText) { // L: 7781 + int var2 = Skeleton.method3433(); // L: 7782 + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7784 + var3 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7785 + var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; } else { - var4 = var0.readBits(1); // L: 91 - if (var4 == 0) { // L: 92 - var1 = class198.method3851(var0); // L: 93 - var10000 = Players.field1275; // L: 94 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - PendingSpawn.readPlayerUpdate(var0, var5); // L: 97 - } + var3 = class69.method1164(var2); // L: 7786 } + + if (Client.menuOptionsCount > 2) { // L: 7787 + var3 = var3 + DefaultsGroup.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + class368.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7788 } } - - var0.exportIndex(); // L: 100 - if (var1 != 0) { // L: 101 - throw new RuntimeException(); // L: 102 - } else { - var0.importIndex(); // L: 104 - - for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 105 - var5 = Players.Players_indices[var2]; // L: 106 - if ((Players.field1275[var5] & 1) != 0) { // L: 107 - if (var1 > 0) { // L: 108 - --var1; // L: 109 - var10000 = Players.field1275; // L: 110 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 113 - if (var4 == 0) { // L: 114 - var1 = class198.method3851(var0); // L: 115 - var10000 = Players.field1275; // L: 116 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - PendingSpawn.readPlayerUpdate(var0, var5); // L: 119 - } - } - } - } - - var0.exportIndex(); // L: 122 - if (var1 != 0) { // L: 123 - throw new RuntimeException(); // L: 124 - } else { - var0.importIndex(); // L: 126 - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 127 - var5 = Players.Players_emptyIndices[var2]; // L: 128 - if ((Players.field1275[var5] & 1) != 0) { // L: 129 - if (var1 > 0) { // L: 130 - --var1; // L: 131 - var10000 = Players.field1275; // L: 132 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 135 - if (var4 == 0) { // L: 136 - var1 = class198.method3851(var0); // L: 137 - var10000 = Players.field1275; // L: 138 - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (World.updateExternalPlayer(var0, var5)) { // L: 141 - var10000 = Players.field1275; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); // L: 144 - if (var1 != 0) { // L: 145 - throw new RuntimeException(); // L: 146 - } else { - var0.importIndex(); // L: 148 - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 149 - var5 = Players.Players_emptyIndices[var2]; // L: 150 - if ((Players.field1275[var5] & 1) == 0) { // L: 151 - if (var1 > 0) { // L: 152 - --var1; // L: 153 - var10000 = Players.field1275; // L: 154 - var10000[var5] = (byte)(var10000[var5] | 2); - } else { - var4 = var0.readBits(1); // L: 157 - if (var4 == 0) { // L: 158 - var1 = class198.method3851(var0); // L: 159 - var10000 = Players.field1275; // L: 160 - var10000[var5] = (byte)(var10000[var5] | 2); - } else if (World.updateExternalPlayer(var0, var5)) { // L: 163 - var10000 = Players.field1275; - var10000[var5] = (byte)(var10000[var5] | 2); - } - } - } - } - - var0.exportIndex(); // L: 166 - if (var1 != 0) { // L: 167 - throw new RuntimeException(); // L: 168 - } else { - Players.Players_count = 0; // L: 170 - Players.Players_emptyIdxCount = 0; // L: 171 - - for (var2 = 1; var2 < 2048; ++var2) { // L: 172 - var10000 = Players.field1275; // L: 173 - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var3 = Client.players[var2]; // L: 174 - if (var3 != null) { // L: 175 - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 176 - } - } - - } - } - } - } - } // L: 178 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1927290139" - ) - static void method406(int var0) { - Login.loginIndex = 12; // L: 1564 - Login.field1206 = var0; // L: 1565 - } // L: 1566 - - @ObfuscatedName("ka") - @ObfuscatedSignature( - descriptor = "(IIIILlm;Lht;I)V", - garbageValue = "-1757506186" - ) - @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: 11396 - if (var6 > 4225 && var6 < 90000) { // L: 11397 - int var7 = Client.camAngleY & 2047; // L: 11398 - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11399 - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11400 - int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11401 - int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11402 - double var12 = Math.atan2((double)var10, (double)var11); // L: 11403 - int var14 = var5.width / 2 - 25; // L: 11404 - int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11405 - int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11406 - byte var17 = 20; // L: 11407 - class236.redHintArrowSprite.method6393(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11408 - } else { - AbstractArchive.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11410 - } - - } // L: 11411 + } // L: 7789 } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 151b02576a..8ec0624bdb 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,137 +1,136 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hl") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2765(0, 0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2748(1, 0), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2749(2, 0), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2750(3, 0), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2760(9, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2752(4, 1), - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2768(5, 1), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2754(6, 1), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2755(7, 1), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2751(8, 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2757(12, 2), - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2767(13, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2758(14, 2), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2756(15, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2761(16, 2), - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2762(17, 2), - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2763(18, 2), @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhl;" ) - field2764(19, 2), - @ObfuscatedName("g") + field2820(0, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhl;" ) - field2769(20, 2), + field2830(1, 0), @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhl;" ) - field2766(21, 2), - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lhw;" - ) - field2747(10, 2), + field2816(2, 0), @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhl;" ) - field2753(11, 2), + field2817(3, 0), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2818(9, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2819(4, 1), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2821(5, 1), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2815(6, 1), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2829(7, 1), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2823(8, 1), + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2827(12, 2), @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lhw;" + descriptor = "Lhl;" ) - field2759(22, 3); - - @ObfuscatedName("qe") + field2825(13, 2), + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ldh;" + descriptor = "Lhl;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; + field2831(14, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2836(15, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2828(16, 2), @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2832(17, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2824(18, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2814(19, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2826(20, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2833(21, 2), + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2834(10, 2), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2835(11, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2837(22, 3); + + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -129094329 + intValue = 1464574759 ) @Export("id") public final int id; @@ -144,46 +143,51 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; // L: 34 } // L: 35 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 38 } - @ObfuscatedName("at") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "98" + descriptor = "([BB)Loh;", + garbageValue = "-38" ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); // L: 370 - int var2 = var1.readUnsignedByte(); // L: 371 - int var3 = var1.readInt(); // L: 372 - if (var3 < 0 || AbstractArchive.field3171 != 0 && var3 > AbstractArchive.field3171) { // L: 373 - throw new RuntimeException(); // L: 374 - } else if (var2 == 0) { // L: 376 - byte[] var6 = new byte[var3]; // L: 377 - var1.readBytes(var6, 0, var3); // L: 378 - return var6; // L: 379 - } else { - int var4 = var1.readInt(); // L: 382 - if (var4 >= 0 && (AbstractArchive.field3171 == 0 || var4 <= AbstractArchive.field3171)) { // L: 383 - byte[] var5 = new byte[var4]; // L: 386 - if (var2 == 1) { // L: 387 - BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 388 - } + @Export("convertJpgToSprite") + public static final SpritePixels convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; // L: 20 - return var5; // L: 389 - } else { - throw new RuntimeException(); // L: 384 - } + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[var3 * var2]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new SpritePixels(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 } + + return new SpritePixels(0, 0); // L: 32 } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "32" + ) + static void method4370() { + class0.SpriteBuffer_xOffsets = null; // L: 261 + Interpreter.SpriteBuffer_yOffsets = null; // L: 262 + class395.SpriteBuffer_spriteWidths = null; // L: 263 + class157.SpriteBuffer_spriteHeights = null; // L: 264 + Varps.SpriteBuffer_spritePalette = null; // L: 265 + class223.SpriteBuffer_pixels = null; // L: 266 + } // L: 267 } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index e4be101544..baaaf67d14 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,116 +4,104 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("jy") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("WorldMapElement_archive") - public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("v") + static AbstractArchive WorldMapElement_archive; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "[Lic;" - ) - @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -346827273 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lgf;" ) @Export("WorldMapElement_cachedSprites") - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1832807857 + intValue = 652863899 ) @Export("objectId") public final int objectId; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -928242387 + intValue = -1200781577 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -342149719 + intValue = 1475941253 ) @Export("sprite2") int sprite2; - @ObfuscatedName("e") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1722981439 + intValue = 318056933 ) - public int field3245; - @ObfuscatedName("l") + public int field3417; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1426815711 + intValue = 226936447 ) @Export("textSize") public int textSize; - @ObfuscatedName("b") - public boolean field3250; - @ObfuscatedName("a") - public boolean field3255; - @ObfuscatedName("w") + @ObfuscatedName("m") + public boolean field3411; + @ObfuscatedName("d") + public boolean field3412; + @ObfuscatedName("c") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("k") + @ObfuscatedName("j") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("i") - int[] field3258; + @ObfuscatedName("r") + int[] field3419; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 878715993 + ) + int field3416; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1352620723 + ) + int field3422; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1995930283 + ) + int field3418; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -683625561 + intValue = 2048510459 ) - int field3253; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -424376699 - ) - int field3259; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -934504639 - ) - int field3261; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -97806191 - ) - int field3262; - @ObfuscatedName("t") + int field3406; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lje;" + descriptor = "Ljd;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lie;" + descriptor = "Lkf;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("m") - int[] field3265; - @ObfuscatedName("r") - byte[] field3266; - @ObfuscatedName("o") + @ObfuscatedName("a") + int[] field3413; + @ObfuscatedName("w") + byte[] field3423; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 922243855 + intValue = -1471498251 ) @Export("category") public int category; @@ -122,340 +110,197 @@ public class WorldMapElement extends DualNode { WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } - public WorldMapElement(int var1) { + WorldMapElement(int var1) { this.sprite1 = -1; // L: 18 this.sprite2 = -1; // L: 19 this.textSize = 0; // L: 22 - this.field3250 = true; // L: 24 - this.field3255 = false; // L: 25 + this.field3411 = true; // L: 24 + this.field3412 = false; // L: 25 this.menuActions = new String[5]; // L: 26 - this.field3253 = Integer.MAX_VALUE; // L: 29 - this.field3259 = Integer.MAX_VALUE; // L: 30 - this.field3261 = Integer.MIN_VALUE; // L: 31 - this.field3262 = Integer.MIN_VALUE; // L: 32 + this.field3416 = Integer.MAX_VALUE; // L: 29 + this.field3422 = Integer.MAX_VALUE; // L: 30 + this.field3418 = Integer.MIN_VALUE; // L: 31 + this.field3406 = 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("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lkx;B)V", - garbageValue = "-21" + descriptor = "(Lnu;I)V", + garbageValue = "1455317514" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); // L: 52 - if (var2 == 0) { // L: 53 - return; // L: 56 + int var2 = var1.readUnsignedByte(); // L: 70 + if (var2 == 0) { // L: 71 + return; // L: 74 } - this.decodeNext(var1, var2); // L: 54 + this.decodeNext(var1, var2); // L: 72 } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "835039554" + descriptor = "(Lnu;II)V", + garbageValue = "-1298333373" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { // L: 59 - this.sprite1 = var1.method5833(); - } else if (var2 == 2) { // L: 60 - this.sprite2 = var1.method5833(); - } else if (var2 == 3) { // L: 61 + if (var2 == 1) { // L: 77 + this.sprite1 = var1.method6597(); + } else if (var2 == 2) { // L: 78 + this.sprite2 = var1.method6597(); + } else if (var2 == 3) { // L: 79 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { // L: 62 - this.field3245 = var1.readMedium(); - } else if (var2 == 5) { // L: 63 - var1.readMedium(); // L: 64 - } else if (var2 == 6) { // L: 66 + } else if (var2 == 4) { // L: 80 + this.field3417 = var1.readMedium(); + } else if (var2 == 5) { // L: 81 + var1.readMedium(); // L: 82 + } else if (var2 == 6) { // L: 84 this.textSize = var1.readUnsignedByte(); } else { - int var3; - if (var2 == 7) { // L: 67 - var3 = var1.readUnsignedByte(); // L: 68 - if ((var3 & 1) == 0) { // L: 69 - this.field3250 = false; + int var6; + if (var2 == 7) { // L: 85 + var6 = var1.readUnsignedByte(); // L: 86 + if ((var6 & 1) == 0) { // L: 87 + this.field3411 = false; } - if ((var3 & 2) == 2) { // L: 70 - this.field3255 = true; + if ((var6 & 2) == 2) { // L: 88 + this.field3412 = true; } - } else if (var2 == 8) { // L: 72 - var1.readUnsignedByte(); // L: 73 - } else if (var2 >= 10 && var2 <= 14) { // L: 75 + } else if (var2 == 8) { // L: 90 + var1.readUnsignedByte(); // L: 91 + } else if (var2 >= 10 && var2 <= 14) { // L: 93 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { // L: 76 - var3 = var1.readUnsignedByte(); // L: 77 - this.field3258 = new int[var3 * 2]; // L: 78 + } else if (var2 == 15) { // L: 94 + var6 = var1.readUnsignedByte(); // L: 95 + this.field3419 = new int[var6 * 2]; // L: 96 int var4; - for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 79 - this.field3258[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 97 + this.field3419[var4] = var1.readShort(); } - var1.readInt(); // L: 80 - var4 = var1.readUnsignedByte(); // L: 81 - this.field3265 = new int[var4]; // L: 82 + var1.readInt(); // L: 98 + var4 = var1.readUnsignedByte(); // L: 99 + this.field3413 = new int[var4]; // L: 100 int var5; - for (var5 = 0; var5 < this.field3265.length; ++var5) { // L: 83 - this.field3265[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3413.length; ++var5) { // L: 101 + this.field3413[var5] = var1.readInt(); } - this.field3266 = new byte[var3]; // L: 84 + this.field3423 = new byte[var6]; // L: 102 - for (var5 = 0; var5 < var3; ++var5) { // L: 85 - this.field3266[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { // L: 103 + this.field3423[var5] = var1.readByte(); } - } else if (var2 != 16) { // L: 87 - if (var2 == 17) { // L: 88 + } else if (var2 != 16) { // L: 105 + if (var2 == 17) { // L: 106 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { // L: 89 - var1.method5833(); // L: 90 - } else if (var2 == 19) { // L: 92 + } else if (var2 == 18) { // L: 107 + var1.method6597(); // L: 108 + } else if (var2 == 19) { // L: 110 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { // L: 93 - var1.readInt(); // L: 94 - } else if (var2 == 22) { // L: 96 - var1.readInt(); // L: 97 - } else if (var2 == 23) { // L: 99 - var1.readUnsignedByte(); // L: 100 - var1.readUnsignedByte(); // L: 101 - var1.readUnsignedByte(); // L: 102 - } else if (var2 == 24) { // L: 104 - var1.readShort(); // L: 105 - var1.readShort(); // L: 106 - } else if (var2 == 25) { // L: 108 - var1.method5833(); // L: 109 - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)InterfaceParent.findEnumerated(GameEngine.method1137(), var1.readUnsignedByte()); - } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)InterfaceParent.findEnumerated(class169.method3631(), var1.readUnsignedByte()); + } else if (var2 == 21) { // L: 111 + var1.readInt(); // L: 112 + } else if (var2 == 22) { // L: 114 + var1.readInt(); // L: 115 + } else if (var2 == 23) { // L: 117 + var1.readUnsignedByte(); // L: 118 + var1.readUnsignedByte(); // L: 119 + var1.readUnsignedByte(); // L: 120 + } else if (var2 == 24) { // L: 122 + var1.readShort(); // L: 123 + var1.readShort(); // L: 124 + } else if (var2 == 25) { // L: 126 + var1.method6597(); // L: 127 + } else if (var2 == 28) { // L: 129 + var1.readUnsignedByte(); // L: 130 + } else if (var2 == 29) { // L: 132 + HorizontalAlignment[] var3 = new HorizontalAlignment[]{HorizontalAlignment.field3468, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3469}; // L: 135 + this.horizontalAlignment = (HorizontalAlignment)UserComparator8.findEnumerated(var3, var1.readUnsignedByte()); // L: 137 + } else if (var2 == 30) { // L: 139 + VerticalAlignment[] var7 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3517, VerticalAlignment.field3514}; // L: 142 + this.verticalAlignment = (VerticalAlignment)UserComparator8.findEnumerated(var7, var1.readUnsignedByte()); // L: 144 } } } - } + } // L: 147 - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1040699133" + garbageValue = "-465360843" ) - public void method4576() { - if (this.field3258 != null) { - for (int var1 = 0; var1 < this.field3258.length; var1 += 2) { - if (this.field3258[var1] < this.field3253) { - this.field3253 = this.field3258[var1]; - } else if (this.field3258[var1] > this.field3261) { - this.field3261 = this.field3258[var1]; + void method4907() { + if (this.field3419 != null) { // L: 150 + for (int var1 = 0; var1 < this.field3419.length; var1 += 2) { // L: 151 + if (this.field3419[var1] < this.field3416) { // L: 152 + this.field3416 = this.field3419[var1]; + } else if (this.field3419[var1] > this.field3418) { // L: 153 + this.field3418 = this.field3419[var1]; } - if (this.field3258[var1 + 1] < this.field3259) { - this.field3259 = this.field3258[var1 + 1]; - } else if (this.field3258[var1 + 1] > this.field3262) { - this.field3262 = this.field3258[var1 + 1]; + if (this.field3419[var1 + 1] < this.field3422) { // L: 154 + this.field3422 = this.field3419[var1 + 1]; + } else if (this.field3419[var1 + 1] > this.field3406) { + this.field3406 = this.field3419[var1 + 1]; // L: 155 } } } - } + } // L: 158 - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ZI)Llm;", - garbageValue = "1411469246" + descriptor = "(ZI)Loh;", + garbageValue = "-1983401566" ) @Export("getSpriteBool") public SpritePixels getSpriteBool(boolean var1) { - int var2 = this.sprite1; - return this.getSprite(var2); // L: 136 + int var2 = this.sprite1; // L: 161 + return this.getSprite(var2); // L: 162 } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Llm;", - garbageValue = "3" + descriptor = "(II)Loh;", + garbageValue = "-73698462" ) @Export("getSprite") SpritePixels getSprite(int var1) { - if (var1 < 0) { + if (var1 < 0) { // L: 166 return null; } else { - SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); - if (var2 != null) { + SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 167 + if (var2 != null) { // L: 168 return var2; } else { - var2 = BufferedSource.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); - if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); + var2 = ModelData0.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 169 + if (var2 != null) { // L: 170 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 171 } - return var2; // L: 147 + return var2; // L: 173 } } } - @ObfuscatedName("z") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1309901264" + garbageValue = "-643985376" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; + return this.objectId; // L: 177 } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IILgz;Lfe;B)Z", - garbageValue = "75" - ) - public static final boolean method4591(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; // L: 111 - int var5 = var1; // L: 112 - byte var6 = 64; // L: 113 - byte var7 = 64; // L: 114 - int var8 = var0 - var6; // L: 115 - int var9 = var1 - var7; // L: 116 - class182.directions[var6][var7] = 99; // L: 117 - class182.distances[var6][var7] = 0; // L: 118 - byte var10 = 0; // L: 119 - int var11 = 0; // L: 120 - class182.bufferX[var10] = var0; // L: 121 - byte var10001 = var10; - int var18 = var10 + 1; - class182.bufferY[var10001] = var1; // L: 122 - int[][] var12 = var3.flags; // L: 123 - - while (var18 != var11) { // L: 124 - var4 = class182.bufferX[var11]; // L: 125 - var5 = class182.bufferY[var11]; // L: 126 - var11 = var11 + 1 & 4095; // L: 127 - int var16 = var4 - var8; // L: 128 - int var17 = var5 - var9; // L: 129 - int var13 = var4 - var3.xInset; // L: 130 - int var14 = var5 - var3.yInset; // L: 131 - if (var2.hasArrived(2, var4, var5, var3)) { // L: 132 - class182.field2118 = var4; // L: 133 - class182.field2124 = var5; // L: 134 - return true; // L: 135 - } - - int var15 = class182.distances[var16][var17] + 1; // L: 137 - if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 138 139 140 141 - class182.bufferX[var18] = var4 - 1; // L: 142 - class182.bufferY[var18] = var5; // L: 143 - var18 = var18 + 1 & 4095; // L: 144 - class182.directions[var16 - 1][var17] = 2; // L: 145 - class182.distances[var16 - 1][var17] = var15; // L: 146 - } - - if (var16 < 126 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 148 149 150 151 - class182.bufferX[var18] = var4 + 1; // L: 152 - class182.bufferY[var18] = var5; // L: 153 - var18 = var18 + 1 & 4095; // L: 154 - class182.directions[var16 + 1][var17] = 8; // L: 155 - class182.distances[var16 + 1][var17] = var15; // L: 156 - } - - if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 158 159 160 161 - class182.bufferX[var18] = var4; // L: 162 - class182.bufferY[var18] = var5 - 1; // L: 163 - var18 = var18 + 1 & 4095; // L: 164 - class182.directions[var16][var17 - 1] = 1; // L: 165 - class182.distances[var16][var17 - 1] = var15; // L: 166 - } - - if (var17 < 126 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 168 169 170 171 - class182.bufferX[var18] = var4; // L: 172 - class182.bufferY[var18] = var5 + 1; // L: 173 - var18 = var18 + 1 & 4095; // L: 174 - class182.directions[var16][var17 + 1] = 4; // L: 175 - class182.distances[var16][var17 + 1] = var15; // L: 176 - } - - if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 178 179 180 181 182 - class182.bufferX[var18] = var4 - 1; // L: 183 - class182.bufferY[var18] = var5 - 1; // L: 184 - var18 = var18 + 1 & 4095; // L: 185 - class182.directions[var16 - 1][var17 - 1] = 3; // L: 186 - class182.distances[var16 - 1][var17 - 1] = var15; // L: 187 - } - - if (var16 < 126 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 189 190 191 192 193 - class182.bufferX[var18] = var4 + 1; // L: 194 - class182.bufferY[var18] = var5 - 1; // L: 195 - var18 = var18 + 1 & 4095; // L: 196 - class182.directions[var16 + 1][var17 - 1] = 9; // L: 197 - class182.distances[var16 + 1][var17 - 1] = var15; // L: 198 - } - - if (var16 > 0 && var17 < 126 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 200 201 202 203 204 - class182.bufferX[var18] = var4 - 1; // L: 205 - class182.bufferY[var18] = var5 + 1; // L: 206 - var18 = var18 + 1 & 4095; // L: 207 - class182.directions[var16 - 1][var17 + 1] = 6; // L: 208 - class182.distances[var16 - 1][var17 + 1] = var15; // L: 209 - } - - if (var16 < 126 && var17 < 126 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 211 212 213 214 215 - class182.bufferX[var18] = var4 + 1; // L: 216 - class182.bufferY[var18] = var5 + 1; // L: 217 - var18 = var18 + 1 & 4095; // L: 218 - class182.directions[var16 + 1][var17 + 1] = 12; // L: 219 - class182.distances[var16 + 1][var17 + 1] = var15; // L: 220 - } - } - - class182.field2118 = var4; // L: 223 - class182.field2124 = var5; // L: 224 - return false; // L: 225 - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(Lbo;B)V", - garbageValue = "1" - ) - static final void method4592(PendingSpawn var0) { - long var1 = 0L; // L: 7271 - int var3 = -1; // L: 7272 - int var4 = 0; // L: 7273 - int var5 = 0; // L: 7274 - if (var0.type == 0) { // L: 7275 - var1 = MilliClock.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { // L: 7276 - var1 = MilliClock.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { // L: 7277 - var1 = MilliClock.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = MilliClock.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7278 - } - - if (0L != var1) { // L: 7279 - int var6 = MilliClock.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7280 - var3 = class25.Entity_unpackID(var1); // L: 7281 - var4 = var6 & 31; // L: 7282 - var5 = var6 >> 6 & 3; // L: 7283 - } - - var0.objectId = var3; // L: 7285 - var0.field945 = var4; // L: 7286 - var0.field944 = var5; // L: 7287 - } // L: 7288 } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 1a7cab042a..67600719ac 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -4,41 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("fp") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("rk") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -687726109 - ) - static int field380; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "[Lme;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 477038655 + intValue = 2124516847 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhk;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhk;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - descriptor = "(ILhd;Lhd;)V" + descriptor = "(ILhk;Lhk;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; // L: 11 @@ -46,47 +35,12 @@ public class WorldMapEvent { this.coord2 = var3; // L: 13 } // L: 14 - @ObfuscatedName("y") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-852874949" + descriptor = "(II)Z", + garbageValue = "1623045574" ) - public static void method851() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 117 - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 118 - } // L: 119 - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" - ) - public static void method850() { - Widget.Widget_cachedSprites.clear(); // L: 720 - Widget.Widget_cachedModels.clear(); // L: 721 - Widget.Widget_cachedFonts.clear(); // L: 722 - Widget.Widget_cachedSpriteMasks.clear(); // L: 723 - } // L: 724 - - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "-21" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { // L: 9001 - if (Client.menuOptionsCount < 500) { // L: 9002 - Client.menuActions[Client.menuOptionsCount] = var0; // L: 9003 - Client.menuTargets[Client.menuOptionsCount] = var1; // L: 9004 - Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 9005 - Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 9006 - Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 9007 - Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 9008 - Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 9009 - ++Client.menuOptionsCount; // L: 9010 - } - - } - } // L: 9012 + public static boolean method3267(int var0) { + return (var0 & 1) != 0; // L: 9 + } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index a206c9db93..fe6661dbab 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -1,196 +1,72 @@ -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("az") +@ObfuscatedName("fo") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("pv") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lkt;" + descriptor = "Lfo;" ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("n") + static final WorldMapID field1741; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Lfo;" ) - static final WorldMapID field301; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Laz;" - ) - static final WorldMapID field290; - @ObfuscatedName("w") - static int[] field292; - @ObfuscatedName("ab") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "[Llm;" - ) - @Export("worldSelectBackSprites") - static SpritePixels[] worldSelectBackSprites; - @ObfuscatedName("ca") - public static char field299; - @ObfuscatedName("d") + static final WorldMapID field1744; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -842814977 + intValue = -1654868251 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1211698009 ) @Export("value") final int value; static { - field301 = new WorldMapID(0); // L: 4 - field290 = new WorldMapID(1); // L: 5 + field1741 = new WorldMapID(0); // L: 4 + field1744 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { this.value = var1; // L: 9 } // L: 10 - @ObfuscatedName("v") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "893410164" + descriptor = "(II)I", + garbageValue = "1238552841" ) - @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 - } + static int method3116(int var0) { + return var0 * 3 + 600; // L: 1277 } - @ObfuscatedName("c") + @ObfuscatedName("hf") @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-283946785" + descriptor = "(I)V", + garbageValue = "397252901" ) - static String method645() { - return WorldMapSectionType.clientPreferences.hideUsername ? HitSplatDefinition.method4768(Login.Login_username) : Login.Login_username; // L: 202 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1525294724" - ) - @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 + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 8840 + Widget var0 = class231.getWidgetChild(class148.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8841 + if (var0 != null && var0.onTargetLeave != null) { // L: 8842 + ScriptEvent var1 = new ScriptEvent(); // L: 8843 + var1.widget = var0; // L: 8844 + var1.args = var0.onTargetLeave; // L: 8845 + class19.runScriptEvent(var1); // L: 8846 } + Client.field874 = -1; // L: 8848 + Client.isSpellSelected = false; // L: 8849 + class29.invalidateWidget(var0); // L: 8850 } - } // L: 69 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;Ljava/lang/String;S)[Llm;", - garbageValue = "26517" - ) - public static SpritePixels[] method648(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); // L: 145 - int var4 = var0.getFileId(var3, var2); // L: 146 - return WorldMapLabelSize.method268(var0, var3, var4); // L: 147 - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lbt;I)V", - garbageValue = "1647051153" - ) - static void method646(GameEngine var0) { - while (Varcs.isKeyDown()) { // L: 1453 - if (ModeWhere.field2417 == 13) { // L: 1454 - UserComparator10.method3573(); // L: 1455 - return; // L: 1456 - } - - if (ModeWhere.field2417 == 96) { // L: 1458 - if (Login.worldSelectPage > 0 && class7.worldSelectLeftSprite != null) { // L: 1459 - --Login.worldSelectPage; // L: 1460 - } - } else if (ModeWhere.field2417 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class2.worldSelectRightSprite != null) { // L: 1463 1464 - ++Login.worldSelectPage; // L: 1465 - } - } - - if (MouseHandler.MouseHandler_lastButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1469 - int var1 = Login.xPadding + 280; // L: 1470 - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1471 - class1.changeWorldSelectSorting(0, 0); // L: 1472 - return; // L: 1473 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1475 - class1.changeWorldSelectSorting(0, 1); // L: 1476 - return; // L: 1477 - } - - int var2 = Login.xPadding + 390; // L: 1479 - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1480 - class1.changeWorldSelectSorting(1, 0); // L: 1481 - return; // L: 1482 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1484 - class1.changeWorldSelectSorting(1, 1); // L: 1485 - return; // L: 1486 - } - - int var3 = Login.xPadding + 500; // L: 1488 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1489 - class1.changeWorldSelectSorting(2, 0); // L: 1490 - return; // L: 1491 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1493 - class1.changeWorldSelectSorting(2, 1); // L: 1494 - return; // L: 1495 - } - - int var4 = Login.xPadding + 610; // L: 1497 - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1498 - class1.changeWorldSelectSorting(3, 0); // L: 1499 - return; // L: 1500 - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1502 - class1.changeWorldSelectSorting(3, 1); // L: 1503 - return; // L: 1504 - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1506 - UserComparator10.method3573(); // L: 1507 - return; // L: 1508 - } - - if (Login.hoveredWorldIndex != -1) { // L: 1510 - World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 1511 - ChatChannel.changeWorld(var5); // L: 1512 - UserComparator10.method3573(); // L: 1513 - return; // L: 1514 - } - - if (Login.worldSelectPage > 0 && class7.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class7.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class25.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class25.canvasHeight / 2 + 50) { // L: 1516 - --Login.worldSelectPage; // L: 1517 - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && class2.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GrandExchangeOfferTotalQuantityComparator.canvasWidth - class2.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GrandExchangeOfferTotalQuantityComparator.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class25.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class25.canvasHeight / 2 + 50) { // L: 1519 - ++Login.worldSelectPage; // L: 1520 - } - } - - } // L: 1523 + } // L: 8851 } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index a567fbfa7c..a9623a25be 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -3,53 +3,43 @@ 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("am") +@ObfuscatedName("es") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("ae") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 309353729 + intValue = 1471201003 ) @Export("element") final int element; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lfi;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1945919631 + intValue = 1556775175 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1219873699 + intValue = 142982873 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lhd;Lhd;ILaa;)V" + descriptor = "(Lhk;Lhk;ILfi;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); // L: 14 this.element = var3; // L: 15 this.label = var4; // L: 16 - WorldMapElement var5 = InvDefinition.WorldMapElement_get(this.getElement()); // L: 17 + WorldMapElement var5 = ByteArrayPool.WorldMapElement_get(this.getElement()); // L: 17 SpritePixels var6 = var5.getSpriteBool(false); // L: 18 if (var6 != null) { // L: 19 this.subWidth = var6.subWidth; // L: 20 @@ -61,109 +51,43 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } // L: 27 - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "7" + garbageValue = "-52" ) @Export("getElement") public int getElement() { return this.element; // L: 30 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)Laa;", - garbageValue = "31041" + descriptor = "(I)Lfi;", + garbageValue = "634413820" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 34 } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-413607837" + garbageValue = "-1975622360" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 38 } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1875187157" + garbageValue = "-1420825097" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 42 } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-344987914" - ) - static int method286() { - return 12; // L: 123 - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(Lhz;II)V", - garbageValue = "18479210" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2668 == null) { // L: 937 - throw new RuntimeException(); // L: 938 - } else { - if (var0.field2660 == null) { // L: 940 - var0.field2660 = new int[var0.field2668.length]; // L: 941 - } - - var0.field2660[var1] = Integer.MAX_VALUE; // L: 943 - } - } // L: 944 - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1727285517" - ) - static int method285(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3225 - Interpreter.Interpreter_intStackSize -= 2; // L: 3226 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3227 - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3228 - if (!Client.isCameraLocked) { // L: 3229 - Client.camAngleX = var3; // L: 3230 - Client.camAngleY = var4; // L: 3231 - } - - return 1; // L: 3233 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3235 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3236 - return 1; // L: 3237 - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3239 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3240 - return 1; // L: 3241 - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3243 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3244 - if (var3 < 0) { // L: 3245 - var3 = 0; - } - - Client.camFollowHeight = var3; // L: 3246 - return 1; // L: 3247 - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3249 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3250 - return 1; // L: 3251 - } else { - return 2; // L: 3253 - } - } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 0213f2582d..77056f1524 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -4,53 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("eu") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("nt") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 92186385 - ) - static int field218; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -197408887 + intValue = 303463081 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Las;" + descriptor = "Lew;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1040980621 + intValue = -445557769 ) @Export("element") int element; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lfi;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1242494149 + intValue = -1466979619 ) @Export("subWidth") int subWidth; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1347635285 + intValue = -392436281 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lhd;Lhd;ILas;)V" + descriptor = "(Lhk;Lhk;ILew;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); // L: 17 @@ -59,972 +54,177 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); // L: 20 } // L: 21 - @ObfuscatedName("n") + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-88183345" + ) + @Export("init") + void init() { + this.element = class19.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(ByteArrayPool.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = ByteArrayPool.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; // L: 33 + this.subHeight = 0; // L: 34 + } + + } // L: 36 + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "7" + garbageValue = "-52" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 39 } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(S)Laa;", - garbageValue = "31041" + descriptor = "(I)Lfi;", + garbageValue = "634413820" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; // L: 43 } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-413607837" + garbageValue = "-1975622360" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; // L: 47 } - @ObfuscatedName("c") + @ObfuscatedName("b") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1875187157" + garbageValue = "-1420825097" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; // L: 51 } - @ObfuscatedName("a") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-551497433" + garbageValue = "637154064" ) - @Export("init") - void init() { - this.element = WorldMapAreaData.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 - this.label = this.region.createMapLabel(InvDefinition.WorldMapElement_get(this.element)); // L: 25 - WorldMapElement var1 = InvDefinition.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; - } + public static void method2699() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 150 + ++KeyHandler.KeyHandler_idleCycles; // L: 151 + KeyHandler.field264 = KeyHandler.field271; // L: 152 + KeyHandler.field263 = 0; // L: 153 + int var1; + if (KeyHandler.field259 < 0) { // L: 154 + for (var1 = 0; var1 < 112; ++var1) { // L: 155 + KeyHandler.KeyHandler_pressedKeys[var1] = false; + } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Le;", - garbageValue = "-2092634459" - ) - public static class7[] method376() { - return new class7[]{class7.field41}; // L: 12 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1961749617" - ) - public static void method377(int var0, int var1) { - VarbitComposition var2 = Tiles.method1219(var0); // L: 33 - int var3 = var2.baseVar; // L: 34 - int var4 = var2.startBit; // L: 35 - int var5 = var2.endBit; // L: 36 - int var6 = Varps.Varps_masks[var5 - var4]; // L: 37 - if (var1 < 0 || var1 > var6) { // L: 38 - var1 = 0; - } - - var6 <<= var4; // L: 39 - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 - } // L: 41 - - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "1521238081" - ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { // L: 3943 - byte var2 = 4; // L: 3944 - int var3 = var2 + 6; // L: 3945 - int var4 = var2 + 6; // L: 3946 - int var5 = Login.fontPlain12.lineWidth(var0, 250); // L: 3947 - int var6 = Login.fontPlain12.lineCount(var0, 250) * 13; // L: 3948 - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 0); // L: 3949 - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 16777215); // L: 3950 - Login.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 3951 - Projectile.method2262(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6); // L: 3952 - if (var1) { // L: 3953 - FileSystem.rasterProvider.drawFull(0, 0); // L: 3954 + KeyHandler.field259 = KeyHandler.field258; // L: 156 } else { - int var7 = var3; // L: 3957 - int var8 = var4; // L: 3958 - int var9 = var5; // L: 3959 - int var10 = var6; // L: 3960 - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 3962 - if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { // L: 3963 - Client.field827[var11] = true; - } - } - } - - } - } // L: 3967 - - @ObfuscatedName("he") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1982809553" - ) - static final void method375() { - HealthBar.method2166(false); // L: 5172 - Client.field785 = 0; // L: 5173 - boolean var0 = true; // L: 5174 - - int var1; - for (var1 = 0; var1 < class2.regionLandArchives.length; ++var1) { // L: 5175 - if (class92.regionMapArchiveIds[var1] != -1 && class2.regionLandArchives[var1] == null) { // L: 5176 5177 - class2.regionLandArchives[var1] = class8.archive5.takeFile(class92.regionMapArchiveIds[var1], 0); // L: 5178 - if (class2.regionLandArchives[var1] == null) { // L: 5179 - var0 = false; // L: 5180 - ++Client.field785; // L: 5181 - } - } - - if (MusicPatchNode2.regionLandArchiveIds[var1] != -1 && Interpreter.regionMapArchives[var1] == null) { // L: 5185 5186 - Interpreter.regionMapArchives[var1] = class8.archive5.takeFileEncrypted(MusicPatchNode2.regionLandArchiveIds[var1], 0, Bounds.xteaKeys[var1]); // L: 5187 - if (Interpreter.regionMapArchives[var1] == null) { // L: 5188 - var0 = false; // L: 5189 - ++Client.field785; // L: 5190 - } - } - } - - if (!var0) { // L: 5195 - Client.field720 = 1; // L: 5196 - } else { - Client.field718 = 0; // L: 5199 - var0 = true; // L: 5200 - - int var4; - int var9; - int var10; - int var11; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var48; - Buffer var51; - for (var1 = 0; var1 < class2.regionLandArchives.length; ++var1) { // L: 5201 - byte[] var2 = Interpreter.regionMapArchives[var1]; // L: 5202 - if (var2 != null) { // L: 5203 - var48 = (class238.regions[var1] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; // L: 5204 - var4 = (class238.regions[var1] & 255) * 64 - NetCache.baseY; // L: 5205 - if (Client.isInInstance) { // L: 5206 - var48 = 10; // L: 5207 - var4 = 10; // L: 5208 - } - - boolean var7 = true; // L: 5213 - var51 = new Buffer(var2); // L: 5214 - var9 = -1; // L: 5215 - - label1246: - while (true) { - var10 = var51.method5704(); // L: 5217 - if (var10 == 0) { // L: 5218 - var0 &= var7; // L: 5251 - break; - } - - var9 += var10; // L: 5219 - var11 = 0; // L: 5220 - boolean var12 = false; // L: 5221 - - while (true) { - while (!var12) { // L: 5223 - var13 = var51.readUShortSmart(); // L: 5229 - if (var13 == 0) { // L: 5230 - continue label1246; - } - - var11 += var13 - 1; // L: 5231 - var14 = var11 & 63; // L: 5232 - var15 = var11 >> 6 & 63; // L: 5233 - var16 = var51.readUnsignedByte() >> 2; // L: 5234 - var17 = var48 + var15; // L: 5235 - var18 = var4 + var14; // L: 5236 - if (var17 > 0 && var18 > 0 && var17 < 103 && var18 < 103) { // L: 5237 - ObjectComposition var53 = WorldMapAreaData.getObjectDefinition(var9); // L: 5238 - if (var16 != 22 || !Client.isLowDetail || var53.int1 != 0 || var53.interactType == 1 || var53.boolean2) { // L: 5239 - if (!var53.needsModelFiles()) { // L: 5240 - ++Client.field718; // L: 5241 - var7 = false; // L: 5242 - } - - var12 = true; // L: 5244 - } - } - } - - var13 = var51.readUShortSmart(); // L: 5224 - if (var13 == 0) { // L: 5225 - break; - } - - var51.readUnsignedByte(); // L: 5226 - } - } - } - } - - if (!var0) { // L: 5254 - Client.field720 = 2; // L: 5255 - } else { - if (Client.field720 != 0) { // L: 5258 - drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - UserComparator5.playPcmPlayers(); // L: 5259 - MilliClock.scene.clear(); // L: 5260 - - for (var1 = 0; var1 < 4; ++var1) { // L: 5261 - Client.collisionMaps[var1].clear(); - } - - int var44; - for (var1 = 0; var1 < 4; ++var1) { // L: 5262 - for (var44 = 0; var44 < 104; ++var44) { // L: 5263 - for (var48 = 0; var48 < 104; ++var48) { // L: 5264 - Tiles.Tiles_renderFlags[var1][var44][var48] = 0; // L: 5265 - } - } - } - - UserComparator5.playPcmPlayers(); // L: 5269 - class58.method939(); // L: 5270 - var1 = class2.regionLandArchives.length; // L: 5271 - - for (ObjectSound var54 = (ObjectSound)ObjectSound.objectSounds.last(); var54 != null; var54 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 5273 - if (var54.stream1 != null) { // L: 5274 - VarbitComposition.pcmStreamMixer.removeSubStream(var54.stream1); // L: 5275 - var54.stream1 = null; // L: 5276 - } - - if (var54.stream2 != null) { // L: 5278 - VarbitComposition.pcmStreamMixer.removeSubStream(var54.stream2); // L: 5279 - var54.stream2 = null; // L: 5280 - } - } - - ObjectSound.objectSounds.clear(); // L: 5283 - HealthBar.method2166(true); // L: 5285 - int var5; - int var19; - int var20; - int var21; - int var59; - if (!Client.isInInstance) { // L: 5286 - byte[] var45; - for (var44 = 0; var44 < var1; ++var44) { // L: 5287 - var48 = (class238.regions[var44] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; // L: 5288 - var4 = (class238.regions[var44] & 255) * 64 - NetCache.baseY; // L: 5289 - var45 = class2.regionLandArchives[var44]; // L: 5290 - if (var45 != null) { // L: 5291 - UserComparator5.playPcmPlayers(); // L: 5292 - ModelData0.method3411(var45, var48, var4, class3.field24 * 8 - 48, class39.field284 * 8 - 48, Client.collisionMaps); // L: 5293 - } - } - - for (var44 = 0; var44 < var1; ++var44) { // L: 5296 - var48 = (class238.regions[var44] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; // L: 5297 - var4 = (class238.regions[var44] & 255) * 64 - NetCache.baseY; // L: 5298 - var45 = class2.regionLandArchives[var44]; // L: 5299 - if (var45 == null && class39.field284 < 800) { // L: 5300 - UserComparator5.playPcmPlayers(); // L: 5301 - class4.method55(var48, var4, 64, 64); // L: 5302 - } - } - - HealthBar.method2166(true); // L: 5305 - - for (var44 = 0; var44 < var1; ++var44) { // L: 5306 - byte[] var3 = Interpreter.regionMapArchives[var44]; // L: 5307 - if (var3 != null) { // L: 5308 - var4 = (class238.regions[var44] >> 8) * 64 - GrandExchangeOfferNameComparator.baseX; // L: 5309 - var5 = (class238.regions[var44] & 255) * 64 - NetCache.baseY; // L: 5310 - UserComparator5.playPcmPlayers(); // L: 5311 - Scene var49 = MilliClock.scene; // L: 5312 - CollisionMap[] var50 = Client.collisionMaps; // L: 5313 - var51 = new Buffer(var3); // L: 5315 - var9 = -1; // L: 5316 - - while (true) { - var10 = var51.method5704(); // L: 5318 - if (var10 == 0) { // L: 5319 - break; - } - - var9 += var10; // L: 5320 - var11 = 0; // L: 5321 - - while (true) { - var59 = var51.readUShortSmart(); // L: 5323 - if (var59 == 0) { // L: 5324 - break; - } - - var11 += var59 - 1; // L: 5325 - var13 = var11 & 63; // L: 5326 - var14 = var11 >> 6 & 63; // L: 5327 - var15 = var11 >> 12; // L: 5328 - var16 = var51.readUnsignedByte(); // L: 5329 - var17 = var16 >> 2; // L: 5330 - var18 = var16 & 3; // L: 5331 - var19 = var4 + var14; // L: 5332 - var20 = var13 + var5; // L: 5333 - if (var19 > 0 && var20 > 0 && var19 < 103 && var20 < 103) { // L: 5334 - var21 = var15; // L: 5335 - if ((Tiles.Tiles_renderFlags[1][var19][var20] & 2) == 2) { // L: 5336 - var21 = var15 - 1; - } - - CollisionMap var52 = null; // L: 5337 - if (var21 >= 0) { // L: 5338 - var52 = var50[var21]; - } - - GameEngine.method1134(var15, var19, var20, var9, var18, var17, var49, var52); // L: 5339 - } - } - } - } - } - } - - int var6; - int var8; - int var58; - if (Client.isInInstance) { // L: 5347 - for (var44 = 0; var44 < 4; ++var44) { // L: 5348 - UserComparator5.playPcmPlayers(); // L: 5349 - - for (var48 = 0; var48 < 13; ++var48) { // L: 5350 - for (var4 = 0; var4 < 13; ++var4) { // L: 5351 - boolean var57 = false; // L: 5352 - var6 = Client.instanceChunkTemplates[var44][var48][var4]; // L: 5353 - if (var6 != -1) { // L: 5354 - var58 = var6 >> 24 & 3; // L: 5355 - var8 = var6 >> 1 & 3; // L: 5356 - var9 = var6 >> 14 & 1023; // L: 5357 - var10 = var6 >> 3 & 2047; // L: 5358 - var11 = (var9 / 8 << 8) + var10 / 8; // L: 5359 - - for (var59 = 0; var59 < class238.regions.length; ++var59) { // L: 5360 - if (class238.regions[var59] == var11 && class2.regionLandArchives[var59] != null) { // L: 5361 - WorldMapManager.method749(class2.regionLandArchives[var59], var44, var48 * 8, var4 * 8, var58, (var9 & 7) * 8, (var10 & 7) * 8, var8, Client.collisionMaps); // L: 5362 - var57 = true; // L: 5363 - break; - } - } - } - - if (!var57) { // L: 5368 - var58 = var44; // L: 5369 - var8 = var48 * 8; // L: 5370 - var9 = var4 * 8; // L: 5371 - - for (var10 = 0; var10 < 8; ++var10) { // L: 5373 - for (var11 = 0; var11 < 8; ++var11) { // L: 5374 - Tiles.Tiles_heights[var58][var10 + var8][var11 + var9] = 0; - } - } - - if (var8 > 0) { // L: 5376 - for (var10 = 1; var10 < 8; ++var10) { // L: 5377 - Tiles.Tiles_heights[var58][var8][var10 + var9] = Tiles.Tiles_heights[var58][var8 - 1][var10 + var9]; - } - } - - if (var9 > 0) { // L: 5379 - for (var10 = 1; var10 < 8; ++var10) { // L: 5380 - Tiles.Tiles_heights[var58][var10 + var8][var9] = Tiles.Tiles_heights[var58][var10 + var8][var9 - 1]; - } - } - - if (var8 > 0 && Tiles.Tiles_heights[var58][var8 - 1][var9] != 0) { // L: 5382 - Tiles.Tiles_heights[var58][var8][var9] = Tiles.Tiles_heights[var58][var8 - 1][var9]; - } else if (var9 > 0 && Tiles.Tiles_heights[var58][var8][var9 - 1] != 0) { // L: 5383 - Tiles.Tiles_heights[var58][var8][var9] = Tiles.Tiles_heights[var58][var8][var9 - 1]; - } else if (var8 > 0 && var9 > 0 && Tiles.Tiles_heights[var58][var8 - 1][var9 - 1] != 0) { // L: 5384 - Tiles.Tiles_heights[var58][var8][var9] = Tiles.Tiles_heights[var58][var8 - 1][var9 - 1]; - } - } - } - } - } - - for (var44 = 0; var44 < 13; ++var44) { // L: 5390 - for (var48 = 0; var48 < 13; ++var48) { // L: 5391 - var4 = Client.instanceChunkTemplates[0][var44][var48]; // L: 5392 - if (var4 == -1) { // L: 5393 - class4.method55(var44 * 8, var48 * 8, 8, 8); // L: 5394 - } - } - } - - HealthBar.method2166(true); // L: 5398 - - for (var44 = 0; var44 < 4; ++var44) { // L: 5399 - UserComparator5.playPcmPlayers(); // L: 5400 - - for (var48 = 0; var48 < 13; ++var48) { // L: 5401 - for (var4 = 0; var4 < 13; ++var4) { // L: 5402 - var5 = Client.instanceChunkTemplates[var44][var48][var4]; // L: 5403 - if (var5 != -1) { // L: 5404 - var6 = var5 >> 24 & 3; // L: 5405 - var58 = var5 >> 1 & 3; // L: 5406 - var8 = var5 >> 14 & 1023; // L: 5407 - var9 = var5 >> 3 & 2047; // L: 5408 - var10 = (var8 / 8 << 8) + var9 / 8; // L: 5409 - - for (var11 = 0; var11 < class238.regions.length; ++var11) { // L: 5410 - if (class238.regions[var11] == var10 && Interpreter.regionMapArchives[var11] != null) { // L: 5411 - WorldMapSection0.method310(Interpreter.regionMapArchives[var11], var44, var48 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var58, MilliClock.scene, Client.collisionMaps); // L: 5412 - break; // L: 5413 - } - } - } - } - } - } - } - - HealthBar.method2166(true); // L: 5421 - UserComparator5.playPcmPlayers(); // L: 5422 - Scene var55 = MilliClock.scene; // L: 5423 - CollisionMap[] var56 = Client.collisionMaps; // L: 5424 - - for (var4 = 0; var4 < 4; ++var4) { // L: 5426 - for (var5 = 0; var5 < 104; ++var5) { // L: 5427 - for (var6 = 0; var6 < 104; ++var6) { // L: 5428 - if ((Tiles.Tiles_renderFlags[var4][var5][var6] & 1) == 1) { // L: 5429 - var58 = var4; // L: 5430 - if ((Tiles.Tiles_renderFlags[1][var5][var6] & 2) == 2) { // L: 5431 - var58 = var4 - 1; - } - - if (var58 >= 0) { // L: 5432 - var56[var58].setBlockedByFloor(var5, var6); - } - } - } - } - } - - Tiles.field518 += (int)(Math.random() * 5.0D) - 2; // L: 5437 - if (Tiles.field518 < -8) { // L: 5438 - Tiles.field518 = -8; - } - - if (Tiles.field518 > 8) { // L: 5439 - Tiles.field518 = 8; - } - - Tiles.field528 += (int)(Math.random() * 5.0D) - 2; // L: 5440 - if (Tiles.field528 < -16) { // L: 5441 - Tiles.field528 = -16; - } - - if (Tiles.field528 > 16) { // L: 5442 - Tiles.field528 = 16; - } - - int[] var10000; - for (var4 = 0; var4 < 4; ++var4) { // L: 5443 - byte[][] var63 = TaskHandler.field2045[var4]; // L: 5444 - var11 = (int)Math.sqrt(5100.0D); // L: 5450 - var59 = var11 * 768 >> 8; // L: 5451 - - int var22; - for (var13 = 1; var13 < 103; ++var13) { // L: 5452 - for (var14 = 1; var14 < 103; ++var14) { // L: 5453 - var15 = Tiles.Tiles_heights[var4][var14 + 1][var13] - Tiles.Tiles_heights[var4][var14 - 1][var13]; // L: 5454 - var16 = Tiles.Tiles_heights[var4][var14][var13 + 1] - Tiles.Tiles_heights[var4][var14][var13 - 1]; // L: 5455 - var17 = (int)Math.sqrt((double)(var16 * var16 + var15 * var15 + 65536)); // L: 5456 - var18 = (var15 << 8) / var17; // L: 5457 - var19 = 65536 / var17; // L: 5458 - var20 = (var16 << 8) / var17; // L: 5459 - var21 = (var18 * -50 + var20 * -50 + var19 * -10) / var59 + 96; // L: 5460 - var22 = (var63[var14 - 1][var13] >> 2) + (var63[var14][var13 - 1] >> 2) + (var63[var14 + 1][var13] >> 3) + (var63[var14][var13 + 1] >> 3) + (var63[var14][var13] >> 1); // L: 5461 - WorldMapSprite.field257[var14][var13] = var21 - var22; // L: 5462 - } - } - - for (var13 = 0; var13 < 104; ++var13) { // L: 5465 - GrandExchangeOfferAgeComparator.Tiles_hue[var13] = 0; // L: 5466 - Tiles.Tiles_saturation[var13] = 0; // L: 5467 - WorldMapLabel.Tiles_lightness[var13] = 0; // L: 5468 - TaskHandler.Tiles_hueMultiplier[var13] = 0; // L: 5469 - WorldMapID.field292[var13] = 0; // L: 5470 - } - - for (var13 = -5; var13 < 109; ++var13) { // L: 5472 - for (var14 = 0; var14 < 104; ++var14) { // L: 5473 - var15 = var13 + 5; // L: 5474 - int var10002; - if (var15 >= 0 && var15 < 104) { // L: 5475 - var16 = Tiles.field517[var4][var15][var14] & 255; // L: 5476 - if (var16 > 0) { // L: 5477 - FloorUnderlayDefinition var46 = class51.method876(var16 - 1); // L: 5478 - var10000 = GrandExchangeOfferAgeComparator.Tiles_hue; // L: 5479 - var10000[var14] += var46.hue; - var10000 = Tiles.Tiles_saturation; // L: 5480 - var10000[var14] += var46.saturation; - var10000 = WorldMapLabel.Tiles_lightness; // L: 5481 - var10000[var14] += var46.lightness; - var10000 = TaskHandler.Tiles_hueMultiplier; // L: 5482 - var10000[var14] += var46.hueMultiplier; - var10002 = WorldMapID.field292[var14]++; // L: 5483 - } - } - - var16 = var13 - 5; // L: 5486 - if (var16 >= 0 && var16 < 104) { // L: 5487 - var17 = Tiles.field517[var4][var16][var14] & 255; // L: 5488 - if (var17 > 0) { // L: 5489 - FloorUnderlayDefinition var47 = class51.method876(var17 - 1); // L: 5490 - var10000 = GrandExchangeOfferAgeComparator.Tiles_hue; // L: 5491 - var10000[var14] -= var47.hue; - var10000 = Tiles.Tiles_saturation; // L: 5492 - var10000[var14] -= var47.saturation; - var10000 = WorldMapLabel.Tiles_lightness; // L: 5493 - var10000[var14] -= var47.lightness; - var10000 = TaskHandler.Tiles_hueMultiplier; // L: 5494 - var10000[var14] -= var47.hueMultiplier; - var10002 = WorldMapID.field292[var14]--; // L: 5495 - } - } - } - - if (var13 >= 1 && var13 < 103) { // L: 5499 - var14 = 0; // L: 5500 - var15 = 0; // L: 5501 - var16 = 0; // L: 5502 - var17 = 0; // L: 5503 - var18 = 0; // L: 5504 - - for (var19 = -5; var19 < 109; ++var19) { // L: 5505 - var20 = var19 + 5; // L: 5506 - if (var20 >= 0 && var20 < 104) { // L: 5507 - var14 += GrandExchangeOfferAgeComparator.Tiles_hue[var20]; // L: 5508 - var15 += Tiles.Tiles_saturation[var20]; // L: 5509 - var16 += WorldMapLabel.Tiles_lightness[var20]; // L: 5510 - var17 += TaskHandler.Tiles_hueMultiplier[var20]; // L: 5511 - var18 += WorldMapID.field292[var20]; // L: 5512 - } - - var21 = var19 - 5; // L: 5514 - if (var21 >= 0 && var21 < 104) { // L: 5515 - var14 -= GrandExchangeOfferAgeComparator.Tiles_hue[var21]; // L: 5516 - var15 -= Tiles.Tiles_saturation[var21]; // L: 5517 - var16 -= WorldMapLabel.Tiles_lightness[var21]; // L: 5518 - var17 -= TaskHandler.Tiles_hueMultiplier[var21]; // L: 5519 - var18 -= WorldMapID.field292[var21]; // L: 5520 - } - - if (var19 >= 1 && var19 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var13][var19] & 2) != 0 || (Tiles.Tiles_renderFlags[var4][var13][var19] & 16) == 0)) { // L: 5522 5523 5524 5525 - if (var4 < Tiles.Tiles_minPlane) { // L: 5528 - Tiles.Tiles_minPlane = var4; - } - - var22 = Tiles.field517[var4][var13][var19] & 255; // L: 5529 - int var23 = class200.field2399[var4][var13][var19] & 255; // L: 5530 - if (var22 > 0 || var23 > 0) { // L: 5531 - int var24 = Tiles.Tiles_heights[var4][var13][var19]; // L: 5532 - int var25 = Tiles.Tiles_heights[var4][var13 + 1][var19]; // L: 5533 - int var26 = Tiles.Tiles_heights[var4][var13 + 1][var19 + 1]; // L: 5534 - int var27 = Tiles.Tiles_heights[var4][var13][var19 + 1]; // L: 5535 - int var28 = WorldMapSprite.field257[var13][var19]; // L: 5536 - int var29 = WorldMapSprite.field257[var13 + 1][var19]; // L: 5537 - int var30 = WorldMapSprite.field257[var13 + 1][var19 + 1]; // L: 5538 - int var31 = WorldMapSprite.field257[var13][var19 + 1]; // L: 5539 - int var32 = -1; // L: 5540 - int var33 = -1; // L: 5541 - int var34; - int var35; - if (var22 > 0) { // L: 5542 - var34 = var14 * 256 / var17; // L: 5543 - var35 = var15 / var18; // L: 5544 - int var36 = var16 / var18; // L: 5545 - var32 = Interpreter.hslToRgb(var34, var35, var36); // L: 5546 - var34 = var34 + Tiles.field518 & 255; // L: 5547 - var36 += Tiles.field528; // L: 5548 - if (var36 < 0) { // L: 5549 - var36 = 0; - } else if (var36 > 255) { // L: 5550 - var36 = 255; - } - - var33 = Interpreter.hslToRgb(var34, var35, var36); // L: 5551 - } - - if (var4 > 0) { // L: 5553 - boolean var61 = true; // L: 5554 - if (var22 == 0 && Tiles.field530[var4][var13][var19] != 0) { // L: 5555 - var61 = false; - } - - if (var23 > 0 && !WallDecoration.method3449(var23 - 1).hideUnderlay) { // L: 5556 - var61 = false; - } - - if (var61 && var24 == var25 && var24 == var26 && var27 == var24) { // L: 5557 5558 - var10000 = class2.field12[var4][var13]; - var10000[var19] |= 2340; - } - } - - var34 = 0; // L: 5561 - if (var33 != -1) { // L: 5562 - var34 = Rasterizer3D.Rasterizer3D_colorPalette[GameObject.method3451(var33, 96)]; - } - - if (var23 == 0) { // L: 5563 - var55.addTile(var4, var13, var19, 0, 0, -1, var24, var25, var26, var27, GameObject.method3451(var32, var28), GameObject.method3451(var32, var29), GameObject.method3451(var32, var30), GameObject.method3451(var32, var31), 0, 0, 0, 0, var34, 0); // L: 5564 - } else { - var35 = Tiles.field530[var4][var13][var19] + 1; // L: 5567 - byte var62 = class1.field1[var4][var13][var19]; // L: 5568 - FloorOverlayDefinition var37 = WallDecoration.method3449(var23 - 1); // L: 5569 - int var38 = var37.texture; // L: 5570 - int var39; - int var40; - int var41; - int var42; - if (var38 >= 0) { // L: 5573 - var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var38); // L: 5574 - var39 = -1; // L: 5575 - } else if (var37.primaryRgb == 16711935) { // L: 5578 - var39 = -2; // L: 5579 - var38 = -1; // L: 5580 - var40 = -2; // L: 5581 - } else { - var39 = Interpreter.hslToRgb(var37.hue, var37.saturation, var37.lightness); // L: 5584 - var41 = var37.hue + Tiles.field518 & 255; // L: 5585 - var42 = var37.lightness + Tiles.field528; // L: 5586 - if (var42 < 0) { // L: 5587 - var42 = 0; - } else if (var42 > 255) { // L: 5588 - var42 = 255; - } - - var40 = Interpreter.hslToRgb(var41, var37.saturation, var42); // L: 5589 - } - - var41 = 0; // L: 5592 - if (var40 != -2) { // L: 5593 - var41 = Rasterizer3D.Rasterizer3D_colorPalette[SecureRandomCallable.method1226(var40, 96)]; - } - - if (var37.secondaryRgb != -1) { // L: 5594 - var42 = var37.secondaryHue + Tiles.field518 & 255; // L: 5595 - int var43 = var37.secondaryLightness + Tiles.field528; // L: 5596 - if (var43 < 0) { // L: 5597 - var43 = 0; - } else if (var43 > 255) { // L: 5598 - var43 = 255; - } - - var40 = Interpreter.hslToRgb(var42, var37.secondarySaturation, var43); // L: 5599 - var41 = Rasterizer3D.Rasterizer3D_colorPalette[SecureRandomCallable.method1226(var40, 96)]; // L: 5600 - } - - var55.addTile(var4, var13, var19, var35, var62, var38, var24, var25, var26, var27, GameObject.method3451(var32, var28), GameObject.method3451(var32, var29), GameObject.method3451(var32, var30), GameObject.method3451(var32, var31), SecureRandomCallable.method1226(var39, var28), SecureRandomCallable.method1226(var39, var29), SecureRandomCallable.method1226(var39, var30), SecureRandomCallable.method1226(var39, var31), var34, var41); // L: 5602 - } - } - } - } - } - } - - for (var13 = 1; var13 < 103; ++var13) { // L: 5609 - for (var14 = 1; var14 < 103; ++var14) { // L: 5610 - var55.setTileMinPlane(var4, var14, var13, WorldMapData_0.method250(var4, var14, var13)); // L: 5611 - } - } - - Tiles.field517[var4] = null; // L: 5614 - class200.field2399[var4] = null; // L: 5615 - Tiles.field530[var4] = null; // L: 5616 - class1.field1[var4] = null; // L: 5617 - TaskHandler.field2045[var4] = null; // L: 5618 - } - - var55.method3263(-50, -10, -50); // L: 5620 - - for (var4 = 0; var4 < 104; ++var4) { // L: 5621 - for (var5 = 0; var5 < 104; ++var5) { // L: 5622 - if ((Tiles.Tiles_renderFlags[1][var4][var5] & 2) == 2) { // L: 5623 - var55.setLinkBelow(var4, var5); - } - } - } - - var4 = 1; // L: 5626 - var5 = 2; // L: 5627 - var6 = 4; // L: 5628 - - for (var58 = 0; var58 < 4; ++var58) { // L: 5629 - if (var58 > 0) { // L: 5630 - var4 <<= 3; // L: 5631 - var5 <<= 3; // L: 5632 - var6 <<= 3; // L: 5633 - } - - for (var8 = 0; var8 <= var58; ++var8) { // L: 5635 - for (var9 = 0; var9 <= 104; ++var9) { // L: 5636 - for (var10 = 0; var10 <= 104; ++var10) { // L: 5637 - short var60; - if ((class2.field12[var8][var10][var9] & var4) != 0) { // L: 5638 - var11 = var9; // L: 5639 - var59 = var9; // L: 5640 - var13 = var8; // L: 5641 - - for (var14 = var8; var11 > 0 && (class2.field12[var8][var10][var11 - 1] & var4) != 0; --var11) { // L: 5642 5643 - } - - while (var59 < 104 && (class2.field12[var8][var10][var59 + 1] & var4) != 0) { // L: 5644 - ++var59; - } - - label812: - while (var13 > 0) { // L: 5645 - for (var15 = var11; var15 <= var59; ++var15) { // L: 5646 - if ((class2.field12[var13 - 1][var10][var15] & var4) == 0) { - break label812; - } - } - - --var13; // L: 5647 - } - - label801: - while (var14 < var58) { // L: 5649 - for (var15 = var11; var15 <= var59; ++var15) { // L: 5650 - if ((class2.field12[var14 + 1][var10][var15] & var4) == 0) { - break label801; - } - } - - ++var14; // L: 5651 - } - - var15 = (var14 + 1 - var13) * (var59 - var11 + 1); // L: 5653 - if (var15 >= 8) { // L: 5654 - var60 = 240; // L: 5655 - var17 = Tiles.Tiles_heights[var14][var10][var11] - var60; // L: 5656 - var18 = Tiles.Tiles_heights[var13][var10][var11]; // L: 5657 - Scene.Scene_addOccluder(var58, 1, var10 * 128, var10 * 128, var11 * 128, var59 * 128 + 128, var17, var18); // L: 5658 - - for (var19 = var13; var19 <= var14; ++var19) { // L: 5659 - for (var20 = var11; var20 <= var59; ++var20) { // L: 5660 - var10000 = class2.field12[var19][var10]; - var10000[var20] &= ~var4; - } - } - } - } - - if ((class2.field12[var8][var10][var9] & var5) != 0) { // L: 5664 - var11 = var10; // L: 5665 - var59 = var10; // L: 5666 - var13 = var8; // L: 5667 - - for (var14 = var8; var11 > 0 && (class2.field12[var8][var11 - 1][var9] & var5) != 0; --var11) { // L: 5668 5669 - } - - while (var59 < 104 && (class2.field12[var8][var59 + 1][var9] & var5) != 0) { // L: 5670 - ++var59; - } - - label865: - while (var13 > 0) { // L: 5671 - for (var15 = var11; var15 <= var59; ++var15) { // L: 5672 - if ((class2.field12[var13 - 1][var15][var9] & var5) == 0) { - break label865; - } - } - - --var13; // L: 5673 - } - - label854: - while (var14 < var58) { // L: 5675 - for (var15 = var11; var15 <= var59; ++var15) { // L: 5676 - if ((class2.field12[var14 + 1][var15][var9] & var5) == 0) { - break label854; - } - } - - ++var14; // L: 5677 - } - - var15 = (var59 - var11 + 1) * (var14 + 1 - var13); // L: 5679 - if (var15 >= 8) { // L: 5680 - var60 = 240; // L: 5681 - var17 = Tiles.Tiles_heights[var14][var11][var9] - var60; // L: 5682 - var18 = Tiles.Tiles_heights[var13][var11][var9]; // L: 5683 - Scene.Scene_addOccluder(var58, 2, var11 * 128, var59 * 128 + 128, var9 * 128, var9 * 128, var17, var18); // L: 5684 - - for (var19 = var13; var19 <= var14; ++var19) { // L: 5685 - for (var20 = var11; var20 <= var59; ++var20) { // L: 5686 - var10000 = class2.field12[var19][var20]; - var10000[var9] &= ~var5; - } - } - } - } - - if ((class2.field12[var8][var10][var9] & var6) != 0) { // L: 5690 - var11 = var10; // L: 5691 - var59 = var10; // L: 5692 - var13 = var9; // L: 5693 - - for (var14 = var9; var13 > 0 && (class2.field12[var8][var10][var13 - 1] & var6) != 0; --var13) { // L: 5694 5695 - } - - while (var14 < 104 && (class2.field12[var8][var10][var14 + 1] & var6) != 0) { // L: 5696 - ++var14; - } - - label918: - while (var11 > 0) { // L: 5697 - for (var15 = var13; var15 <= var14; ++var15) { // L: 5698 - if ((class2.field12[var8][var11 - 1][var15] & var6) == 0) { - break label918; - } - } - - --var11; // L: 5699 - } - - label907: - while (var59 < 104) { // L: 5701 - for (var15 = var13; var15 <= var14; ++var15) { // L: 5702 - if ((class2.field12[var8][var59 + 1][var15] & var6) == 0) { - break label907; - } - } - - ++var59; // L: 5703 - } - - if ((var14 - var13 + 1) * (var59 - var11 + 1) >= 4) { // L: 5705 - var15 = Tiles.Tiles_heights[var8][var11][var13]; // L: 5706 - Scene.Scene_addOccluder(var58, 4, var11 * 128, var59 * 128 + 128, var13 * 128, var14 * 128 + 128, var15, var15); // L: 5707 - - for (var16 = var11; var16 <= var59; ++var16) { // L: 5708 - for (var17 = var13; var17 <= var14; ++var17) { // L: 5709 - var10000 = class2.field12[var8][var16]; - var10000[var17] &= ~var6; - } - } - } - } - } - } - } - } - - HealthBar.method2166(true); // L: 5718 - var4 = Tiles.Tiles_minPlane; // L: 5719 - if (var4 > class90.Client_plane) { // L: 5720 - var4 = class90.Client_plane; - } - - if (var4 < class90.Client_plane - 1) { // L: 5721 - var4 = class90.Client_plane - 1; - } - - if (Client.isLowDetail) { // L: 5722 - MilliClock.scene.init(Tiles.Tiles_minPlane); - } else { - MilliClock.scene.init(0); // L: 5723 - } - - for (var5 = 0; var5 < 104; ++var5) { // L: 5724 - for (var6 = 0; var6 < 104; ++var6) { // L: 5725 - HitSplatDefinition.updateItemPile(var5, var6); // L: 5726 - } - } - - UserComparator5.playPcmPlayers(); // L: 5729 - - for (PendingSpawn var64 = (PendingSpawn)Client.pendingSpawns.last(); var64 != null; var64 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5731 5732 5738 - if (var64.hitpoints == -1) { // L: 5733 - var64.delay = 0; // L: 5734 - WorldMapElement.method4592(var64); // L: 5735 + while (KeyHandler.field259 != KeyHandler.field258) { // L: 159 + var1 = KeyHandler.field257[KeyHandler.field258]; // L: 160 + KeyHandler.field258 = KeyHandler.field258 + 1 & 127; // L: 161 + if (var1 < 0) { // L: 162 + KeyHandler.KeyHandler_pressedKeys[~var1] = false; } else { - var64.remove(); // L: 5737 - } - } - - ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5741 - PacketBufferNode var65; - if (class1.client.hasFrame()) { // L: 5742 - var65 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); // L: 5744 - var65.packetBuffer.writeInt(1057001181); // L: 5745 - Client.packetWriter.addNode(var65); // L: 5746 - } - - if (!Client.isInInstance) { // L: 5748 - var5 = (class3.field24 - 6) / 8; // L: 5749 - var6 = (class3.field24 + 6) / 8; // L: 5750 - var58 = (class39.field284 - 6) / 8; // L: 5751 - var8 = (class39.field284 + 6) / 8; // L: 5752 - - for (var9 = var5 - 1; var9 <= var6 + 1; ++var9) { // L: 5753 - for (var10 = var58 - 1; var10 <= var8 + 1; ++var10) { // L: 5754 - if (var9 < var5 || var9 > var6 || var10 < var58 || var10 > var8) { // L: 5755 - class8.archive5.loadRegionFromName("m" + var9 + "_" + var10); // L: 5756 - class8.archive5.loadRegionFromName("l" + var9 + "_" + var10); // L: 5757 - } + if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field263 < KeyHandler.field262.length - 1) { // L: 164 + KeyHandler.field262[++KeyHandler.field263 - 1] = var1; // L: 165 } + + KeyHandler.KeyHandler_pressedKeys[var1] = true; // L: 167 } } + } - ItemContainer.updateGameState(30); // L: 5761 - UserComparator5.playPcmPlayers(); // L: 5762 - class23.method232(); // L: 5763 - var65 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); // L: 5764 - Client.packetWriter.addNode(var65); // L: 5765 - WorldMapSprite.clock.mark(); // L: 5767 + if (KeyHandler.field263 > 0) { // L: 171 + KeyHandler.KeyHandler_idleCycles = 0; + } - for (var6 = 0; var6 < 32; ++var6) { // L: 5768 - GameEngine.graphicsTickTimes[var6] = 0L; + KeyHandler.field271 = KeyHandler.field265; // L: 172 + } + } // L: 174 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "([BB)Lcc;", + garbageValue = "40" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 76 + Buffer var2 = new Buffer(var0); // L: 77 + var2.offset = var2.array.length - 2; // L: 78 + int var3 = var2.readUnsignedShort(); // L: 79 + int var4 = var2.array.length - 2 - var3 - 12; // L: 80 + var2.offset = var4; // L: 81 + int var5 = var2.readInt(); // L: 82 + var1.localIntCount = var2.readUnsignedShort(); // L: 83 + var1.localStringCount = var2.readUnsignedShort(); // L: 84 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 85 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 86 + int var6 = var2.readUnsignedByte(); // L: 87 + int var7; + int var8; + if (var6 > 0) { // L: 88 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 89 + + for (var7 = 0; var7 < var6; ++var7) { // L: 90 + var8 = var2.readUnsignedShort(); // L: 91 + int var9; + int var11; + if (var8 > 0) { // L: 93 + var11 = var8 - 1; // L: 97 + var11 |= var11 >>> 1; // L: 98 + var11 |= var11 >>> 2; // L: 99 + var11 |= var11 >>> 4; // L: 100 + var11 |= var11 >>> 8; // L: 101 + var11 |= var11 >>> 16; // L: 102 + int var10 = var11 + 1; // L: 103 + var9 = var10; // L: 105 + } else { + var9 = 1; // L: 107 } - for (var6 = 0; var6 < 32; ++var6) { // L: 5769 - GameEngine.clientTickTimes[var6] = 0L; - } + IterableNodeHashTable var13 = new IterableNodeHashTable(var9); // L: 108 + var1.switches[var7] = var13; // L: 109 - VertexNormal.gameCyclesToDo = 0; // L: 5770 + while (var8-- > 0) { // L: 110 + var11 = var2.readInt(); // L: 111 + int var12 = var2.readInt(); // L: 112 + var13.put(new IntegerNode(var12), (long)var11); // L: 113 + } } } - } // L: 5197 5256 5772 + + var2.offset = 0; // L: 117 + var1.field1058 = var2.readStringCp1252NullTerminatedOrNull(); // L: 118 + var1.opcodes = new int[var5]; // L: 119 + var1.intOperands = new int[var5]; // L: 120 + var1.stringOperands = new String[var5]; // L: 121 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 122 123 128 + var8 = var2.readUnsignedShort(); // L: 124 + if (var8 == 3) { // L: 125 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { + var1.intOperands[var7] = var2.readInt(); // L: 126 + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 127 + } + } + + return var1; // L: 130 + } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index c6ad5807d7..0f5598f8c8 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -4,36 +4,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("fi") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("b") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("text") String text; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1144128527 + intValue = -586926431 ) @Export("width") int width; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -467317487 + intValue = 1846653715 ) @Export("height") int height; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Ley;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILay;)V" + descriptor = "(Ljava/lang/String;IILey;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; // L: 10 @@ -41,201 +38,4 @@ public class WorldMapLabel { this.height = var3; // L: 12 this.size = var4; // L: 13 } // L: 14 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-293834504" - ) - @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("h") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - static void method499() { - if (Login.clearLoginScreen) { // L: 215 - GrandExchangeOfferNameComparator.titleboxSprite = null; // L: 216 - InterfaceParent.titlebuttonSprite = null; // L: 217 - Login.runesSprite = null; // L: 218 - Login.leftTitleSprite = null; // L: 219 - Login.rightTitleSprite = null; // L: 220 - Login.logoSprite = null; // L: 221 - Login.title_muteSprite = null; // L: 222 - class69.options_buttons_0Sprite = null; // L: 223 - Login.options_buttons_2Sprite = null; // L: 224 - WorldMapID.worldSelectBackSprites = null; // L: 225 - WorldMapManager.worldSelectFlagSprites = null; // L: 226 - DevicePcmPlayerProvider.worldSelectArrows = null; // L: 227 - Occluder.worldSelectStars = null; // L: 228 - World.field1039 = null; // L: 229 - class9.loginScreenRunesAnimation.method1926(); // L: 230 - class206.musicPlayerStatus = 1; // L: 232 - class206.musicTrackArchive = null; // L: 233 - class206.musicTrackGroupId = -1; // L: 234 - SoundSystem.musicTrackFileId = -1; // L: 235 - DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 236 - class206.musicTrackBoolean = false; // L: 237 - class7.pcmSampleLength = 2; // L: 238 - Actor.method1867(true); // L: 240 - Login.clearLoginScreen = false; // L: 241 - } - } // L: 242 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2132008086" - ) - static void method501(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 - if (var1 != null) { - var1.remove(); // L: 74 - } - } // L: 73 75 - - @ObfuscatedName("fk") - @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "25470" - ) - static final void method502() { - for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { // L: 3296 - int var10002 = Client.queuedSoundEffectDelays[var0]--; // L: 3297 - if (Client.queuedSoundEffectDelays[var0] >= -10) { // L: 3298 - SoundEffect var1 = Client.soundEffects[var0]; // L: 3310 - if (var1 == null) { // L: 3311 - Object var10000 = null; // L: 3312 - var1 = SoundEffect.readSoundEffect(WorldMapCacheName.archive4, Client.soundEffectIds[var0], 0); - if (var1 == null) { // L: 3313 - continue; - } - - int[] var12 = Client.queuedSoundEffectDelays; // L: 3314 - var12[var0] += var1.calculateDelay(); - Client.soundEffects[var0] = var1; // L: 3315 - } - - if (Client.queuedSoundEffectDelays[var0] < 0) { // L: 3321 - int var2; - if (Client.soundLocations[var0] != 0) { // L: 3323 - int var3 = (Client.soundLocations[var0] & 255) * 128; // L: 3324 - int var4 = Client.soundLocations[var0] >> 16 & 255; // L: 3325 - int var5 = var4 * 128 + 64 - UserComparator9.localPlayer.x; // L: 3326 - if (var5 < 0) { // L: 3327 - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; // L: 3328 - int var7 = var6 * 128 + 64 - UserComparator9.localPlayer.y; // L: 3329 - if (var7 < 0) { // L: 3330 - var7 = -var7; - } - - int var8 = var5 + var7 - 128; // L: 3331 - if (var8 > var3) { // L: 3332 - Client.queuedSoundEffectDelays[var0] = -100; // L: 3333 - continue; // L: 3334 - } - - if (var8 < 0) { // L: 3336 - var8 = 0; - } - - var2 = (var3 - var8) * WorldMapSectionType.clientPreferences.areaSoundEffectsVolume / var3; // L: 3337 - } else { - var2 = WorldMapSectionType.clientPreferences.soundEffectsVolume; // L: 3339 - } - - if (var2 > 0) { // L: 3340 - RawSound var9 = var1.toRawSound().resample(World.decimator); // L: 3341 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var2); // L: 3342 - var10.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); // L: 3343 - VarbitComposition.pcmStreamMixer.addSubStream(var10); // L: 3344 - } - - Client.queuedSoundEffectDelays[var0] = -100; // L: 3346 - } - } else { - --Client.soundEffectCount; // L: 3299 - - for (int var11 = var0; var11 < Client.soundEffectCount; ++var11) { // L: 3300 - Client.soundEffectIds[var11] = Client.soundEffectIds[var11 + 1]; // L: 3301 - Client.soundEffects[var11] = Client.soundEffects[var11 + 1]; // L: 3302 - Client.queuedSoundEffectLoops[var11] = Client.queuedSoundEffectLoops[var11 + 1]; // L: 3303 - Client.queuedSoundEffectDelays[var11] = Client.queuedSoundEffectDelays[var11 + 1]; // L: 3304 - Client.soundLocations[var11] = Client.soundLocations[var11 + 1]; // L: 3305 - } - - --var0; // L: 3307 - } - } - - if (Client.field899 && !class4.method56()) { // L: 3349 - if (WorldMapSectionType.clientPreferences.musicVolume != 0 && Client.currentTrackGroupId != -1) { // L: 3350 - ReflectionCheck.method2450(UrlRequester.archive6, Client.currentTrackGroupId, 0, WorldMapSectionType.clientPreferences.musicVolume, false); - } - - Client.field899 = false; // L: 3351 - } - - } // L: 3353 - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "42" - ) - static String method504(int var0) { - if (var0 < 0) { // L: 9040 - return ""; - } else { - return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9041 9042 - } - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1224588099" - ) - static boolean method503(int var0) { - for (int var1 = 0; var1 < Client.field885; ++var1) { // L: 10833 - if (Client.field738[var1] == var0) { // L: 10834 - return true; - } - } - - return false; // L: 10836 - } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 4722dce034..62a957191f 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -1,226 +1,156 @@ +import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("ey") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("sx") + @ObfuscatedName("rz") @ObfuscatedGetter( - intValue = 339414095 + intValue = -1981266759 ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("n") + static int field1569; + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Ley;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Ley;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lay;" + descriptor = "Ley;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2074270997 + intValue = -2016472085 ) - final int field149; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 603088885 - ) - final int field153; + static int field1568; @ObfuscatedName("h") + static int[][] field1570; + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = 518486027 + intValue = 464910607 ) - final int field154; + static int field1572; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -27286113 + ) + final int field1564; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 580411911 + ) + final int field1567; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1572047245 + ) + final int field1571; static { - WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 + WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); // L: 7 WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); // L: 8 - WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); // L: 9 + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); // L: 9 } WorldMapLabelSize(int var1, int var2, int var3) { - this.field149 = var1; // L: 19 - this.field153 = var2; // L: 20 - this.field154 = var3; // L: 21 - } // L: 22 + this.field1564 = var1; // L: 15 + this.field1567 = var2; // L: 16 + this.field1571 = var3; // L: 17 + } // L: 18 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(FB)Z", - garbageValue = "-67" + descriptor = "(FI)Z", + garbageValue = "-1990451087" ) - boolean method255(float var1) { - return var1 >= (float)this.field154; // L: 25 + boolean method2671(float var1) { + return var1 >= (float)this.field1571; // L: 21 } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Lay;", - garbageValue = "-2106429153" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-523449441" ) - static WorldMapLabelSize[] method269() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; // L: 15 - } + static void method2677(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43 + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44 + var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46 + } // L: 47 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lig;III)[Llm;", - garbageValue = "-173751595" + descriptor = "(II)Ley;", + garbageValue = "796333939" ) - public static SpritePixels[] method268(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); // L: 64 - boolean var3; - if (var4 == null) { // L: 65 - var3 = false; // L: 66 - } else { - GrandExchangeOfferNameComparator.SpriteBuffer_decode(var4); // L: 69 - var3 = true; // L: 70 - } + static WorldMapLabelSize method2670(int var0) { + WorldMapLabelSize[] var1 = new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 28 + WorldMapLabelSize[] var2 = var1; // L: 30 - return !var3 ? null : BufferedSource.method6103(); // L: 72 73 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IB)Lay;", - garbageValue = "31" - ) - static WorldMapLabelSize method266(int var0) { - WorldMapLabelSize[] var1 = method269(); // L: 30 - - for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 - WorldMapLabelSize var3 = var1[var2]; // L: 32 - if (var0 == var3.field153) { // L: 34 - return var3; // L: 35 + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + WorldMapLabelSize var4 = var2[var3]; // L: 32 + if (var0 == var4.field1567) { // L: 34 + return var4; // L: 35 } } return null; // L: 40 } - @ObfuscatedName("y") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "-1679154092" + descriptor = "(B)V", + garbageValue = "-7" ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { // L: 177 - int var6 = (var0 + var1) / 2; // L: 178 - int var7 = var0; // L: 179 - World var8 = World.World_worlds[var6]; // L: 180 - World.World_worlds[var6] = World.World_worlds[var1]; // L: 181 - World.World_worlds[var1] = var8; // L: 182 + public static void method2676() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 82 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 83 + } // L: 84 - for (int var9 = var0; var9 < var1; ++var9) { // L: 183 - if (class22.method226(World.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 - World var10 = World.World_worlds[var9]; // L: 185 - World.World_worlds[var9] = World.World_worlds[var7]; // L: 186 - World.World_worlds[var7++] = var10; // L: 187 - } - } + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-888739808" + ) + public static void method2678() { + ItemComposition.ItemDefinition_cached.clear(); // L: 572 + ItemComposition.ItemDefinition_cachedModels.clear(); // L: 573 + ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 574 + } // L: 575 - World.World_worlds[var1] = World.World_worlds[var7]; // L: 191 - World.World_worlds[var7] = var8; // L: 192 - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(Lnu;IB)V", + garbageValue = "-107" + ) + static void method2679(Buffer var0, int var1) { + byte[] var2 = var0.array; // L: 11665 + if (Client.randomDatData == null) { // L: 11667 + Client.randomDatData = new byte[24]; } - } // L: 196 - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1534549931" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; // L: 119 - } - - @ObfuscatedName("in") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "1283328511" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - ObjectSound.scrollBarSprites[0].drawAt(var0, var1); // L: 10038 - ObjectSound.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10039 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field727); // L: 10040 - int var5 = var3 * (var3 - 32) / var4; // L: 10041 - if (var5 < 8) { // L: 10042 - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10043 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field777); // L: 10044 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field730); // L: 10045 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field730); // L: 10046 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field730); // L: 10047 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field730); // L: 10048 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field729); // L: 10049 - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field729); // L: 10050 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field729); // L: 10051 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field729); // L: 10052 - } // L: 10053 - - @ObfuscatedName("ke") - @ObfuscatedSignature( - descriptor = "(Lhz;I)Z", - garbageValue = "-490308531" - ) - static final boolean method254(Widget var0) { - int var1 = var0.contentType; // L: 11275 - if (var1 == 205) { // L: 11276 - Client.logoutTimer = 250; // L: 11277 - return true; // L: 11278 - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { // L: 11280 - var2 = (var1 - 300) / 2; // L: 11281 - var3 = var1 & 1; // L: 11282 - Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11283 - } - - if (var1 >= 314 && var1 <= 323) { // L: 11285 - var2 = (var1 - 314) / 2; // L: 11286 - var3 = var1 & 1; // L: 11287 - Client.playerAppearance.method4206(var2, var3 == 1); // L: 11288 - } - - if (var1 == 324) { // L: 11290 - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { // L: 11291 - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { // L: 11292 - PacketBufferNode var4 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); // L: 11294 - Client.playerAppearance.write(var4.packetBuffer); // L: 11295 - Client.packetWriter.addNode(var4); // L: 11296 - return true; // L: 11297 - } else { - return false; // L: 11299 + class305.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 11668 + if (JagexCache.JagexCache_randomDat != null) { // L: 11671 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 11673 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11674 + } catch (Exception var4) { // L: 11676 } } - } + + } // L: 11679 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index f124184e1a..c5a7069977 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -1,144 +1,117 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.security.SecureRandom; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ai") +@ObfuscatedName("ez") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("qw") - @ObfuscatedGetter( - intValue = -1947633143 - ) - static int field345; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "[Lly;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("ei") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("loaded") boolean loaded; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lau;" + descriptor = "Lfr;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Loh;" ) @Export("compositeTextureSprite") SpritePixels compositeTextureSprite; - @ObfuscatedName("y") + @ObfuscatedName("b") @Export("icons") HashMap icons; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[[Las;" + descriptor = "[[Lew;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("z") + @ObfuscatedName("k") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lly;" + descriptor = "[Low;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lir;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("s") + @ObfuscatedName("l") @Export("fonts") final HashMap fonts; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 749583707 + intValue = -257256943 ) @Export("tileX") int tileX; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 461859631 + intValue = 954345203 ) @Export("tileY") int tileY; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -571129221 + intValue = 72714041 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -437301779 + intValue = -20947567 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1259035297 + intValue = 1844238059 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Lly;Ljava/util/HashMap;Lig;Lig;)V" + descriptor = "([Low;Ljava/util/HashMap;Lir;Lir;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; // L: 16 this.loadStarted = false; // L: 17 this.scaleHandlers = new HashMap(); // L: 22 - this.pixelsPerTile = 0; + 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("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;ZI)V", - garbageValue = "1075163259" + descriptor = "(Lir;Ljava/lang/String;ZI)V", + garbageValue = "183372596" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -146,10 +119,10 @@ public final class WorldMapManager { this.loaded = false; // L: 44 this.loadStarted = true; // L: 45 System.nanoTime(); // L: 46 - int var4 = var1.getGroupId(WorldMapCacheName.field333.name); // L: 47 + int var4 = var1.getGroupId(WorldMapCacheName.field1768.name); // L: 47 int var5 = var1.getFileId(var4, var2); // L: 48 - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field333.name, var2)); // L: 49 - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field323.name, var2)); // L: 50 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field1768.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field1761.name, var2)); // L: 50 System.nanoTime(); // L: 51 System.nanoTime(); // L: 52 this.mapAreaData = new WorldMapAreaData(); // L: 53 @@ -171,693 +144,452 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 System.nanoTime(); // L: 69 System.nanoTime(); // L: 70 - Messages.method2372(); // L: 71 - this.regions = new WorldMapRegion[var16][var9]; // L: 72 - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 72 + this.regions = new WorldMapRegion[var16][var9]; // L: 74 + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 75 while (var10.hasNext()) { - WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 - int var12 = var11.regionX; // L: 76 - int var13 = var11.regionY; // L: 77 - int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78 - int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79 - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 80 - this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 81 + WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 76 + int var12 = var11.regionX; // L: 78 + int var13 = var11.regionY; // L: 79 + int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 80 + int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 81 + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 82 + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 83 } - for (int var17 = 0; var17 < var16; ++var17) { // L: 84 - for (int var18 = 0; var18 < var9; ++var18) { // L: 85 - if (this.regions[var17][var18] == null) { // L: 86 - this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87 - this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88 + for (int var17 = 0; var17 < var16; ++var17) { // L: 86 + for (int var18 = 0; var18 < var9; ++var18) { // L: 87 + if (this.regions[var17][var18] == null) { // L: 88 + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 89 + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 90 } } } - System.nanoTime(); // L: 92 - System.nanoTime(); // L: 93 - if (var1.isValidFileName(WorldMapCacheName.field324.name, var2)) { // L: 94 - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field324.name, var2); // L: 95 - this.compositeTextureSprite = WorldMapRectangle.convertJpgToSprite(var20); // L: 96 + System.nanoTime(); // L: 94 + System.nanoTime(); // L: 95 + if (var1.isValidFileName(WorldMapCacheName.field1763.name, var2)) { // L: 96 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field1763.name, var2); // L: 97 + this.compositeTextureSprite = WorldMapDecorationType.convertJpgToSprite(var20); // L: 98 } - System.nanoTime(); // L: 98 - var1.clearGroups(); // L: 99 - var1.clearFiles(); // L: 100 - this.loaded = true; // L: 101 + System.nanoTime(); // L: 100 + var1.clearGroups(); // L: 101 + var1.clearFiles(); // L: 102 + this.loaded = true; // L: 103 } - } // L: 42 102 + } // L: 42 104 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-192155866" + descriptor = "(B)V", + garbageValue = "12" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; // L: 105 - } // L: 106 + this.icons = null; // L: 107 + } // L: 108 - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "-1854160239" + garbageValue = "-285491744" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109 - int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110 - int var11 = Rasterizer2D.Rasterizer2D_height; - int[] var12 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var12); - WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114 - float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 115 - int var15 = (int)Math.ceil((double)var14); - 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: 111 + int var10 = Rasterizer2D.Rasterizer2D_width; // L: 112 + int var11 = Rasterizer2D.Rasterizer2D_height; // L: 113 + int[] var12 = new int[4]; // L: 114 + Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 115 + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 116 + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 117 + int var15 = (int)Math.ceil((double)var14); // L: 118 + this.pixelsPerTile = var15; // L: 119 + if (!this.scaleHandlers.containsKey(var15)) { // L: 120 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 121 + var16.init(); // L: 122 + this.scaleHandlers.put(var15, var16); // L: 123 } - int var23 = var13.x + var13.width - 1; - int var17 = var13.y + var13.height - 1; // L: 124 + int var23 = var13.x + var13.width - 1; // L: 125 + int var17 = var13.y + var13.height - 1; // L: 126 int var18; int var19; - for (var18 = var13.x; var18 <= var23; ++var18) { // L: 125 - for (var19 = var13.y; var19 <= var17; ++var19) { // L: 126 - this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + for (var18 = var13.x; var18 <= var23; ++var18) { // L: 127 + for (var19 = var13.y; var19 <= var17; ++var19) { // L: 128 + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 129 } } - Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130 - Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131 - var18 = (int)(var14 * 64.0F); // L: 132 - var19 = this.tileX + var1; // L: 133 - int var20 = var2 + this.tileY; // L: 134 + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 132 + Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 133 + var18 = (int)(var14 * 64.0F); // L: 134 + var19 = this.tileX + var1; // L: 135 + int var20 = var2 + this.tileY; // L: 136 - for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 135 - for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 136 - this.regions[var21][var22].method506(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137 + for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 137 + for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 138 + this.regions[var21][var22].method2805(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139 } } - } // L: 140 + } // L: 142 - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "-2105446269" + garbageValue = "35487180" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { - WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143 - float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144 - int var16 = (int)(var15 * 64.0F); // L: 145 - int var17 = this.tileX + var1; // L: 146 - int var18 = var2 + this.tileY; // L: 147 + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 145 + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146 + int var16 = (int)(var15 * 64.0F); // L: 147 + int var17 = this.tileX + var1; // L: 148 + int var18 = var2 + this.tileY; // L: 149 int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 148 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 149 - if (var13) { // L: 150 - this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 150 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151 + if (var13) { // L: 152 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 153 } - this.regions[var19][var20].method516(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153 + this.regions[var19][var20].method2815(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155 } } - if (var10 != null && var11 > 0) { // L: 156 - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 157 - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 158 - this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 + if (var10 != null && var11 > 0) { // L: 158 + for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 159 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160 + this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161 } } } - } // L: 163 + } // L: 165 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;III)V", - garbageValue = "1410026121" + descriptor = "(IIIILjava/util/HashSet;IIB)V", + garbageValue = "1" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { - if (this.compositeTextureSprite != null) { // L: 166 - this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169 - if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170 - if (this.icons == null) { // L: 173 - this.buildIcons0(); // L: 174 + if (this.compositeTextureSprite != null) { // L: 168 + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 171 + if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 172 + if (this.icons == null) { // L: 175 + this.buildIcons0(); // L: 176 } - Iterator var8 = var5.iterator(); // L: 176 + Iterator var8 = var5.iterator(); // L: 178 while (true) { List var10; do { if (!var8.hasNext()) { - return; // L: 193 + return; // L: 195 } - int var9 = (Integer)var8.next(); // L: 177 - var10 = (List)this.icons.get(var9); // L: 179 - } while(var10 == null); // L: 180 + int var9 = (Integer)var8.next(); // L: 179 + var10 = (List)this.icons.get(var9); // L: 181 + } while(var10 == null); // L: 182 - Iterator var11 = var10.iterator(); // L: 183 + Iterator var11 = var10.iterator(); // L: 185 while (var11.hasNext()) { - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 184 - int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 186 - int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 187 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 188 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186 + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188 + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 190 } } } } - } // L: 167 171 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "-1800022691" - ) - public List method722(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - LinkedList var11 = new LinkedList(); // L: 196 - if (!this.loaded) { // L: 197 - return var11; // L: 198 - } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200 - float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201 - int var14 = (int)(64.0F * var13); // L: 202 - int var15 = this.tileX + var1; // L: 203 - int var16 = var2 + this.tileY; // L: 204 - - for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 205 - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 206 - List var19 = this.regions[var17][var18].method537(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207 - if (!var19.isEmpty()) { // L: 208 - var11.addAll(var19); // L: 209 - } - } - } - - return var11; // L: 213 - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(IIIII)Laq;", - garbageValue = "-2121459740" - ) - @Export("createWorldMapRectangle") - WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { - WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217 - int var6 = this.tileX + var1; // L: 218 - int var7 = var2 + this.tileY; // L: 219 - int var8 = var3 + this.tileX; // L: 220 - int var9 = var4 + this.tileY; // L: 221 - int var10 = var6 / 64; // L: 222 - int var11 = var7 / 64; // L: 223 - int var12 = var8 / 64; // L: 224 - int var13 = var9 / 64; // L: 225 - var5.width = var12 - var10 + 1; // L: 226 - var5.height = var13 - var11 + 1; // L: 227 - var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 228 - var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 229 - if (var5.x < 0) { // L: 230 - var5.width += var5.x; // L: 231 - var5.x = 0; // L: 232 - } - - if (var5.x > this.regions.length - var5.width) { // L: 234 - var5.width = this.regions.length - var5.x; // L: 235 - } - - if (var5.y < 0) { // L: 237 - var5.height += var5.y; // L: 238 - var5.y = 0; // L: 239 - } - - if (var5.y > this.regions[0].length - var5.height) { // L: 241 - var5.height = this.regions[0].length - var5.y; // L: 242 - } - - var5.width = Math.min(var5.width, this.regions.length); // L: 244 - var5.height = Math.min(var5.height, this.regions[0].length); // L: 245 - return var5; // L: 246 - } + } // L: 169 173 @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "14" + descriptor = "(IIIIIIIIIII)Ljava/util/List;", + garbageValue = "-1584242772" ) - @Export("isLoaded") - public boolean isLoaded() { - return this.loaded; // L: 250 - } + public List method2936(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + LinkedList var11 = new LinkedList(); // L: 198 + if (!this.loaded) { // L: 199 + return var11; // L: 200 + } else { + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202 + float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203 + int var14 = (int)(64.0F * var13); // L: 204 + int var15 = this.tileX + var1; // L: 205 + int var16 = var2 + this.tileY; // L: 206 - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(B)Ljava/util/HashMap;", - garbageValue = "108" - ) - @Export("buildIcons") - public HashMap buildIcons() { - this.buildIcons0(); // L: 254 - return this.icons; // L: 255 - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "118" - ) - @Export("buildIcons0") - void buildIcons0() { - if (this.icons == null) { // L: 259 - this.icons = new HashMap(); // L: 260 - } - - this.icons.clear(); // L: 262 - - for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263 - for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264 - List var3 = this.regions[var1][var2].icons(); // L: 265 - Iterator var4 = var3.iterator(); // L: 266 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267 - if (var5.hasValidElement()) { // L: 269 - int var6 = var5.getElement(); // L: 270 - if (!this.icons.containsKey(var6)) { // L: 271 - LinkedList var7 = new LinkedList(); // L: 272 - var7.add(var5); // L: 273 - this.icons.put(var6, var7); // L: 274 - } else { - List var8 = (List)this.icons.get(var6); // L: 277 - var8.add(var5); // L: 278 - } + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 207 + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 208 + List var19 = this.regions[var17][var18].method2895(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 209 + if (!var19.isEmpty()) { // L: 210 + var11.addAll(var19); // L: 211 } } } + + return var11; // L: 215 } + } - } // L: 284 - - @ObfuscatedName("s") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)F", - garbageValue = "11" + descriptor = "(IIIIB)Leo;", + garbageValue = "-103" ) - @Export("getPixelsPerTile") - float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; // L: 287 - if (var3 > 8.0F) { // L: 288 - return 8.0F; - } else if (var3 < 1.0F) { // L: 289 - return 1.0F; - } else { - int var4 = Math.round(var3); // L: 290 - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292 + @Export("createWorldMapRectangle") + WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { + WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 219 + int var6 = this.tileX + var1; // L: 220 + int var7 = var2 + this.tileY; // L: 221 + int var8 = var3 + this.tileX; // L: 222 + int var9 = var4 + this.tileY; // L: 223 + int var10 = var6 / 64; // L: 224 + int var11 = var7 / 64; // L: 225 + int var12 = var8 / 64; // L: 226 + int var13 = var9 / 64; // L: 227 + var5.width = var12 - var10 + 1; // L: 228 + var5.height = var13 - var11 + 1; // L: 229 + var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 230 + var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 231 + if (var5.x < 0) { // L: 232 + var5.width += var5.x; // L: 233 + var5.x = 0; // L: 234 } + + if (var5.x > this.regions.length - var5.width) { // L: 236 + var5.width = this.regions.length - var5.x; // L: 237 + } + + if (var5.y < 0) { // L: 239 + var5.height += var5.y; // L: 240 + var5.y = 0; // L: 241 + } + + if (var5.y > this.regions[0].length - var5.height) { // L: 243 + var5.height = this.regions[0].length - var5.y; // L: 244 + } + + var5.width = Math.min(var5.width, this.regions.length); // L: 246 + var5.height = Math.min(var5.height, this.regions[0].length); // L: 247 + return var5; // L: 248 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "931546619" + ) + @Export("isLoaded") + public boolean isLoaded() { + return this.loaded; // L: 252 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)Ljava/util/HashMap;", + garbageValue = "19" + ) + @Export("buildIcons") + public HashMap buildIcons() { + this.buildIcons0(); // L: 256 + return this.icons; // L: 257 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Ljx;", - garbageValue = "-2146982596" + descriptor = "(I)V", + garbageValue = "-52208126" ) - @Export("getEnum") - public static EnumComposition getEnum(int var0) { - EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 - if (var1 != null) { // L: 26 - return var1; - } else { - byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 - var1 = new EnumComposition(); // L: 28 - if (var2 != null) { // L: 29 - var1.decode(new Buffer(var2)); - } - - EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 - return var1; // L: 31 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lfe;B)V", - garbageValue = "0" - ) - static final void method749(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for (int var9 = 0; var9 < 8; ++var9) { // L: 111 - for (var10 = 0; var10 < 8; ++var10) { // L: 112 - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { - int[] var10000 = var8[var1].flags[var9 + var2]; // L: 113 - var10000[var10 + var3] &= -16777217; - } - } + @Export("buildIcons0") + void buildIcons0() { + if (this.icons == null) { // L: 261 + this.icons = new HashMap(); // L: 262 } - Buffer var13 = new Buffer(var0); // L: 116 + this.icons.clear(); // L: 264 - for (var10 = 0; var10 < 4; ++var10) { // L: 117 - for (int var11 = 0; var11 < 64; ++var11) { // L: 118 - for (int var12 = 0; var12 < 64; ++var12) { // L: 119 - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 120 - KeyHandler.loadTerrain(var13, var1, var2 + class236.method4332(var11 & 7, var12 & 7, var7), var3 + TextureProvider.method2914(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 121 - } else { - KeyHandler.loadTerrain(var13, 0, -1, -1, 0, 0, 0); // L: 123 - } - } - } - } + for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 265 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 266 + List var3 = this.regions[var1][var2].icons(); // L: 267 + Iterator var4 = var3.iterator(); // L: 268 - } // L: 127 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-74" - ) - static void method738() { - Login.Login_username = Login.Login_username.trim(); // L: 794 - if (Login.Login_username.length() == 0) { // L: 795 - InvDefinition.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 796 - } else { - long var1; - try { - URL var3 = new URL(GrandExchangeOfferNameComparator.method209("services", false) + "m=accountappeal/login.ws"); // L: 803 - URLConnection var4 = var3.openConnection(); // L: 804 - var4.setRequestProperty("connection", "close"); // L: 805 - var4.setDoInput(true); // L: 806 - var4.setDoOutput(true); // L: 807 - var4.setConnectTimeout(5000); // L: 808 - OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 809 - var5.write("data1=req"); // L: 810 - var5.flush(); // L: 811 - InputStream var6 = var4.getInputStream(); // L: 812 - Buffer var7 = new Buffer(new byte[1000]); // L: 813 - - while (true) { - int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 815 - if (var8 == -1) { // L: 816 - var7.offset = 0; // L: 823 - long var20 = var7.readLong(); // L: 824 - var1 = var20; // L: 825 - break; - } - - var7.offset += var8; // L: 817 - if (var7.offset >= 1000) { // L: 818 - var1 = 0L; // L: 819 - break; - } - } - } catch (Exception var28) { // L: 827 - var1 = 0L; // L: 828 - } - - byte var0; - if (0L == var1) { // L: 832 - var0 = 5; - } else { - String var29 = Login.Login_username; // L: 835 - Random var30 = new Random(); // L: 837 - Buffer var24 = new Buffer(128); // L: 838 - Buffer var9 = new Buffer(128); // L: 839 - int[] var10 = new int[]{var30.nextInt(), var30.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 840 841 842 843 844 - var24.writeByte(10); // L: 845 - - int var11; - for (var11 = 0; var11 < 4; ++var11) { // L: 846 - var24.writeInt(var30.nextInt()); // L: 847 - } - - var24.writeInt(var10[0]); // L: 849 - var24.writeInt(var10[1]); // L: 850 - var24.writeLong(var1); // L: 851 - var24.writeLong(0L); // L: 852 - - for (var11 = 0; var11 < 4; ++var11) { // L: 853 - var24.writeInt(var30.nextInt()); // L: 854 - } - - var24.encryptRsa(class89.field1155, class89.field1154); // L: 856 - var9.writeByte(10); // L: 857 - - for (var11 = 0; var11 < 3; ++var11) { // L: 858 - var9.writeInt(var30.nextInt()); // L: 859 - } - - var9.writeLong(var30.nextLong()); // L: 861 - var9.writeLongMedium(var30.nextLong()); // L: 862 - GrandExchangeOfferOwnWorldComparator.method1378(var9); // L: 863 - var9.writeLong(var30.nextLong()); // L: 864 - var9.encryptRsa(class89.field1155, class89.field1154); // L: 865 - var11 = WorldMapLabelSize.stringCp1252NullTerminatedByteSize(var29); // L: 866 - if (var11 % 8 != 0) { // L: 867 - var11 += 8 - var11 % 8; - } - - Buffer var12 = new Buffer(var11); // L: 868 - var12.writeStringCp1252NullTerminated(var29); // L: 869 - var12.offset = var11; // L: 870 - var12.xteaEncryptAll(var10); // L: 871 - Buffer var13 = new Buffer(var12.offset + var9.offset + var24.offset + 5); // L: 872 - var13.writeByte(2); // L: 873 - var13.writeByte(var24.offset); // L: 874 - var13.writeBytes(var24.array, 0, var24.offset); // L: 875 - var13.writeByte(var9.offset); // L: 876 - var13.writeBytes(var9.array, 0, var9.offset); // L: 877 - var13.writeShort(var12.offset); // L: 878 - var13.writeBytes(var12.array, 0, var12.offset); // L: 879 - String var14 = VertexNormal.method3163(var13.array); // L: 880 - - byte var25; - try { - URL var15 = new URL(GrandExchangeOfferNameComparator.method209("services", false) + "m=accountappeal/login.ws"); // L: 882 - URLConnection var16 = var15.openConnection(); // L: 883 - var16.setDoInput(true); // L: 884 - var16.setDoOutput(true); // L: 885 - var16.setConnectTimeout(5000); // L: 886 - OutputStreamWriter var17 = new OutputStreamWriter(var16.getOutputStream()); // L: 887 - var17.write("data2=" + WallDecoration.method3450(var14) + "&dest=" + WallDecoration.method3450("passwordchoice.ws")); // L: 888 - var17.flush(); // L: 889 - InputStream var18 = var16.getInputStream(); // L: 890 - var13 = new Buffer(new byte[1000]); // L: 891 - - while (true) { - int var19 = var18.read(var13.array, var13.offset, 1000 - var13.offset); // L: 893 - if (var19 == -1) { // L: 894 - var17.close(); // L: 901 - var18.close(); // L: 902 - String var26 = new String(var13.array); // L: 903 - if (var26.startsWith("OFFLINE")) { // L: 904 - var25 = 4; // L: 905 - } else if (var26.startsWith("WRONG")) { // L: 908 - var25 = 7; // L: 909 - } else if (var26.startsWith("RELOAD")) { // L: 912 - var25 = 3; // L: 913 - } else if (var26.startsWith("Not permitted for social network accounts.")) { // L: 916 - var25 = 6; // L: 917 - } else { - var13.xteaDecryptAll(var10); // L: 920 - - while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { // L: 921 - --var13.offset; // L: 922 - } - - var26 = new String(var13.array, 0, var13.offset); // L: 924 - if (ReflectionCheck.method2452(var26)) { // L: 925 - WorldMapRectangle.openURL(var26, true, false); // L: 926 - var25 = 2; // L: 927 - } else { - var25 = 5; // L: 929 - } - } - break; - } - - var13.offset += var19; // L: 895 - if (var13.offset >= 1000) { // L: 896 - var25 = 5; // L: 897 - break; - } - } - } catch (Throwable var27) { // L: 931 - var27.printStackTrace(); // L: 932 - var25 = 5; // L: 933 - } - - var0 = var25; // L: 936 - } - - switch(var0) { // L: 938 - case 2: - InvDefinition.setLoginResponseString(Strings.field3056, Strings.field3057, Strings.field3058); // L: 949 - Login.loginIndex = 6; // L: 950 - break; // L: 951 - case 3: - InvDefinition.setLoginResponseString("", "Error connecting to server.", ""); // L: 956 - break; - case 4: - InvDefinition.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 943 - break; // L: 944 - case 5: - InvDefinition.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 940 - break; // L: 941 - case 6: - InvDefinition.setLoginResponseString("", "Error connecting to server.", ""); // L: 953 - break; // L: 954 - case 7: - InvDefinition.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: 946 - } - - } - } // L: 797 959 - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILcl;ZB)I", - garbageValue = "1" - ) - static int method746(int var0, Script var1, boolean var2) { - int var3; - int var6; - int var9; - if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 1920 - Interpreter.Interpreter_intStackSize -= 2; // L: 1921 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1922 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1923 - EnumComposition var10 = getEnum(var3); // L: 1924 - if (var10.outputType != 's') { // L: 1925 - } - - for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 1926 - if (var9 == var10.keys[var6]) { // L: 1927 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 1928 - var10 = null; // L: 1929 - break; - } - } - - if (var10 != null) { // L: 1933 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr; - } - - return 1; // L: 1934 - } else if (var0 != ScriptOpcodes.ENUM) { // L: 1936 - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 1962 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1963 - EnumComposition var4 = getEnum(var3); // L: 1964 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); // L: 1965 - return 1; // L: 1966 - } else { - return 2; // L: 1968 - } - } else { - Interpreter.Interpreter_intStackSize -= 4; // L: 1937 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1938 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1939 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1940 - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 1941 - EnumComposition var7 = getEnum(var5); // L: 1942 - if (var3 == var7.inputType && var9 == var7.outputType) { // L: 1943 - for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 1948 - if (var6 == var7.keys[var8]) { // L: 1949 - if (var9 == 115) { // L: 1950 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 269 + if (var5.hasValidElement()) { // L: 271 + int var6 = var5.getElement(); // L: 272 + if (!this.icons.containsKey(var6)) { // L: 273 + LinkedList var7 = new LinkedList(); // L: 274 + var7.add(var5); // L: 275 + this.icons.put(var6, var7); // L: 276 } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 1951 + List var8 = (List)this.icons.get(var6); // L: 279 + var8.add(var5); // L: 280 } - - var7 = null; // L: 1952 - break; } } - - if (var7 != null) { // L: 1956 - if (var9 == 115) { // L: 1957 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 1958 - } - } - - return 1; // L: 1960 - } else { - if (var9 == 115) { // L: 1944 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1945 - } - - return 1; // L: 1946 } } + + } // L: 286 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)F", + garbageValue = "-295962035" + ) + @Export("getPixelsPerTile") + float getPixelsPerTile(int var1, int var2) { + float var3 = (float)var1 / (float)var2; // L: 289 + if (var3 > 8.0F) { // L: 290 + return 8.0F; + } else if (var3 < 1.0F) { // L: 291 + return 1.0F; + } else { + int var4 = Math.round(var3); // L: 292 + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 293 294 + } } - @ObfuscatedName("ib") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "4" + descriptor = "(IIIIIZI)Loh;", + garbageValue = "931546619" ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - WorldMapEvent.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8997 - } // L: 8998 - - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(Lhz;IIZB)V", - garbageValue = "1" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; // L: 9971 - int var5 = var0.height; // L: 9972 - if (var0.widthAlignment == 0) { // L: 9973 - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { // L: 9974 - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { // L: 9975 - var0.width = var0.rawWidth * var1 >> 14; + @Export("getItemSprite") + public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 353 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 354 + var4 = 1; } - if (var0.heightAlignment == 0) { // L: 9976 - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { // L: 9977 - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; // L: 9978 + long var6 = (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); // L: 355 + SpritePixels var8; + if (!var5) { // L: 357 + var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 358 + if (var8 != null) { // L: 359 + return var8; + } } - if (var0.widthAlignment == 4) { // L: 9979 - var0.width = var0.field2610 * var0.height / var0.field2611; + ItemComposition var9 = class23.ItemDefinition_get(var0); // L: 361 + if (var1 > 1 && var9.countobj != null) { // L: 362 + int var10 = -1; // L: 363 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 364 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 365 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 367 + var9 = class23.ItemDefinition_get(var10); + } } - if (var0.heightAlignment == 4) { // L: 9980 - var0.height = var0.field2611 * var0.width / var0.field2610; - } + Model var21 = var9.getModel(1); // L: 369 + if (var21 == null) { // L: 370 + return null; + } else { + SpritePixels var22 = null; // L: 371 + if (var9.noteTemplate != -1) { // L: 372 + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373 + if (var22 == null) { // L: 374 + return null; + } + } else if (var9.notedId != -1) { // L: 376 + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 377 + if (var22 == null) { // L: 378 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 380 + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 381 + if (var22 == null) { // L: 382 + return null; + } + } - if (var0.contentType == 1337) { // L: 9981 - Client.viewportWidget = var0; - } + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 384 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 385 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386 + int[] var15 = new int[4]; // L: 387 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388 + var8 = new SpritePixels(36, 32); // L: 389 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390 + Rasterizer2D.Rasterizer2D_clear(); // L: 391 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392 + Rasterizer3D.method3411(16, 16); // L: 393 + Rasterizer3D.field1903 = false; // L: 394 + if (var9.placeholderTemplate != -1) { // L: 395 + var22.drawTransBgAt(0, 0); + } - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9982 - ScriptEvent var6 = new ScriptEvent(); // L: 9983 - var6.widget = var0; // L: 9984 - var6.args = var0.onResize; // L: 9985 - Client.scriptEvents.addFirst(var6); // L: 9986 - } + int var16 = var9.zoom2d; // L: 396 + if (var5) { // L: 397 + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { // L: 398 + var16 = (int)(1.04D * (double)var16); + } - } // L: 9988 + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 399 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 400 + var21.calculateBoundsCylinder(); // L: 401 + var21.method3692(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 402 + if (var9.notedId != -1) { // L: 403 + var22.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 404 + var8.outline(1); + } + + if (var2 >= 2) { // L: 405 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 406 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 407 + if (var9.noteTemplate != -1) { // L: 408 + var22.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409 + Font var19 = DevicePcmPlayerProvider.ItemDefinition_fontPlain11; // L: 410 + String var20; + if (var1 < 100000) { // L: 413 + var20 = "" + var1 + ""; // L: 414 + } else if (var1 < 10000000) { // L: 417 + var20 = "" + var1 / 1000 + "K" + ""; // L: 418 + } else { + var20 = "" + var1 / 1000000 + "M" + ""; // L: 421 + } + + var19.draw(var20, 0, 9, 16776960, 1); // L: 423 + } + + if (!var5) { // L: 425 + ItemComposition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 426 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 427 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 428 + Rasterizer3D.field1903 = true; // L: 429 + return var8; // L: 430 + } + } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 791b1b8cda..05df9b4fb7 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -1,187 +1,111 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.net.URI; -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("aq") +@ObfuscatedName("eo") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("n") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = -1552197653 + intValue = -1244610627 + ) + @Export("cameraY") + static int cameraY; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -446549331 ) @Export("width") int width; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 522429537 + intValue = 338448321 ) @Export("height") int height; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1426976537 + intValue = -2098562397 ) @Export("x") int x; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1260779731 + intValue = 385069369 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lai;" + descriptor = "Lez;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Lai;)V" + descriptor = "(Lez;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; // L: 303 + this.this$0 = var1; // L: 305 } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "([BI)Llm;", - garbageValue = "-1825283733" + descriptor = "(ILir;Ljava/lang/String;Ljava/lang/String;IZB)V", + garbageValue = "4" ) - @Export("convertJpgToSprite") - public static final SpritePixels convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; // L: 20 + public static void method3103(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); // L: 42 + int var7 = var1.getFileId(var6, var3); // L: 43 + WorldMapSection0.method3059(var0, var1, var6, var7, var4, var5); // L: 44 + } // L: 45 - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 - int var2 = var1.getWidth(); // L: 23 - int var3 = var1.getHeight(); // L: 24 - int[] var4 = new int[var3 * var2]; // L: 25 - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 - var5.grabPixels(); // L: 27 - return new SpritePixels(var4, var2, var3); - } catch (IOException var7) { // L: 30 - } catch (InterruptedException var8) { - } - - return new SpritePixels(0, 0); // L: 32 - } - - @ObfuscatedName("v") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "1269350728" + descriptor = "(Lbu;Lbu;IZI)I", + garbageValue = "-1944173517" ) - @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 + @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; } } - if (class60.field454.startsWith("win")) { // L: 36 - ClientPreferences.method1972(var0, 0); // L: 38 - } else if (class60.field454.startsWith("mac")) { // L: 42 - class204.method3888(var0, 1, "openjs"); // L: 43 + 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 { - ClientPreferences.method1972(var0, 2); // L: 46 + return var0.activity.compareTo(var1.activity); // L: 237 } + } else if (var2 == 4) { // L: 239 + return var0.method1695() ? (var1.method1695() ? 0 : 1) : (var1.method1695() ? -1 : 0); + } else if (var2 == 5) { // L: 240 + return var0.method1672() ? (var1.method1672() ? 0 : 1) : (var1.method1672() ? -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 { - ClientPreferences.method1972(var0, 3); // L: 49 - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmc;", - garbageValue = "59696754" - ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 221 - if (var3.exists()) { // L: 222 - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 224 - return var10; // L: 225 - } catch (IOException var9) { // L: 227 - } - } - - String var4 = ""; // L: 229 - if (JagexCache.cacheGamebuild == 33) { // L: 230 - var4 = "_rc"; - } else if (JagexCache.cacheGamebuild == 34) { // L: 231 - var4 = "_wip"; - } - - File var5 = new File(JagexCache.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 232 - AccessFile var6; - if (!var2 && var5.exists()) { // L: 233 - try { - var6 = new AccessFile(var5, "rw", 10000L); // L: 235 - return var6; // L: 236 - } catch (IOException var8) { // L: 238 - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); // L: 241 - return var6; // L: 242 - } catch (IOException var7) { // L: 244 - throw new RuntimeException(); // L: 245 - } - } - - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1194982929" - ) - static final void method354() { - int var0 = Players.Players_count; // L: 3493 - int[] var1 = Players.Players_indices; // L: 3494 - - for (int var2 = 0; var2 < var0; ++var2) { // L: 3495 - Player var3 = Client.players[var1[var2]]; // L: 3496 - if (var3 != null) { // L: 3497 - class171.updateActorSequence(var3, 1); // L: 3498 - } - } - - } // L: 3501 - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1726408780" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); // L: 9904 - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9905 - var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9906 - } - - if (var1.length() > 9) { // L: 9908 - return " " + FileSystem.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + FileSystem.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + FileSystem.colorStartTag(16776960) + var1 + ""; // L: 9909 9910 + return var0.id - var1.id; // L: 243 } } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index f5d07148ce..999f3c5b27 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,55 +10,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ew") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lfh;" + descriptor = "Lgo;" ) @Export("WorldMapRegion_cachedSprites") - static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("h") + public static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1299522103 + intValue = -945646571 ) @Export("regionX") int regionX; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 861898053 + intValue = 557518487 ) @Export("regionY") int regionY; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lo;" + descriptor = "Lem;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("q") + @ObfuscatedName("h") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -360836645 + intValue = -1255950001 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1984621095 + intValue = -465902583 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("b") + @ObfuscatedName("m") @Export("icon0List") List icon0List; - @ObfuscatedName("a") + @ObfuscatedName("d") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("w") + @ObfuscatedName("c") @Export("fonts") final HashMap fonts; @@ -67,85 +67,112 @@ public class WorldMapRegion { } WorldMapRegion(int var1, int var2, int var3, HashMap 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 + this.regionX = var1; // L: 38 + this.regionY = var2; // L: 39 + this.worldMapData1List = new LinkedList(); // L: 40 + this.icon0List = new LinkedList(); // L: 41 + this.iconMap = new HashMap(); // L: 42 + this.backgroundColor = var3 | -16777216; // L: 43 + this.fonts = var4; // L: 44 + } // L: 45 - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "46" + descriptor = "(IIII)V", + garbageValue = "-1387360033" ) - void method506(int var1, int var2, int var3) { - SpritePixels var4 = LoginPacket.method3816(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 + void method2805(int var1, int var2, int var3) { + int var5 = this.regionX; // L: 49 + int var6 = this.regionY; // L: 50 + int var7 = this.pixelsPerTile; // L: 51 + DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 53 + long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 56 + SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 58 + if (var4 != null) { + if (var3 == this.pixelsPerTile * 64) { // L: 62 + var4.drawAt(var1, var2); // L: 63 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 74 + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 66 } } - } // L: 76 + } // L: 61 68 - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lo;Ljava/util/List;I)V", - garbageValue = "1448874199" + descriptor = "(Lem;Ljava/util/List;I)V", + garbageValue = "180621664" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); // L: 79 - this.worldMapData_0 = var1; // L: 80 - this.addAllToIconList(var2); // L: 81 - } // L: 82 + this.iconMap.clear(); // L: 71 + this.worldMapData_0 = var1; // L: 72 + this.addAllToIconList(var2); // L: 73 + } // L: 74 - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-905581142" + garbageValue = "1703141389" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); // L: 85 - Iterator var3 = var1.iterator(); // L: 86 + this.iconMap.clear(); // L: 77 + Iterator var3 = var1.iterator(); // L: 78 while (var3.hasNext()) { - 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 + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 79 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 81 + this.worldMapData1List.add(var4); // L: 82 } } - this.addAllToIconList(var2); // L: 94 - } + this.addAllToIconList(var2); // L: 86 + } // L: 87 - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIILac;I)V", - garbageValue = "-747714746" + descriptor = "(IIIILee;I)V", + garbageValue = "2023835510" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 98 - label50: - 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 var6 = var1; var6 < var3 + var1; ++var6) { // L: 90 + label76: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 91 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 92 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 93 + if (var9 != null && var9.length != 0) { // L: 94 + WorldMapDecoration[] var10 = var9; // L: 98 - for (int var11 = 0; var11 < var10.length; ++var11) { // L: 107 - WorldMapDecoration var12 = var10[var11]; // L: 108 - ObjectComposition var13 = WorldMapAreaData.getObjectDefinition(var12.objectDefinitionId); // L: 110 - if (MidiPcmStream.method4031(var13)) { // L: 111 - this.getIcon(var13, var8, var6, var7, var5); // L: 114 - continue label50; // L: 115 + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 99 + ObjectComposition var13; + boolean var14; + label67: { + WorldMapDecoration var12 = var10[var11]; // L: 100 + var13 = class19.getObjectDefinition(var12.objectDefinitionId); // L: 102 + if (var13.transforms != null) { // L: 105 + int[] var15 = var13.transforms; // L: 107 + + for (int var16 = 0; var16 < var15.length; ++var16) { // L: 108 + int var17 = var15[var16]; // L: 109 + ObjectComposition var18 = class19.getObjectDefinition(var17); // L: 111 + if (var18.mapIconId != -1) { // L: 112 + var14 = true; // L: 113 + break label67; + } + } + } else if (var13.mapIconId != -1) { // L: 120 + var14 = true; // L: 121 + break label67; // L: 122 + } + + var14 = false; // L: 124 + } + + if (var14) { // L: 126 + this.getIcon(var13, var8, var6, var7, var5); // L: 129 + continue label76; // L: 130 } } } @@ -153,982 +180,766 @@ public class WorldMapRegion { } } - } // L: 122 + } // L: 137 - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljg;IIILac;S)V", - garbageValue = "-25437" + descriptor = "(Lkj;IIILee;I)V", + garbageValue = "1552882899" ) @Export("getIcon") void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 125 - Coord var7 = null; // L: 126 - if (this.worldMapData_0 != null) { // L: 127 - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 128 + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 140 + Coord var7 = null; // L: 141 + if (this.worldMapData_0 != null) { // L: 142 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 143 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 131 - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 132 + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 146 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 147 } WorldMapElement var9; Object var10; - if (var1.transforms != null) { // L: 135 - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 136 + if (var1.transforms != null) { // L: 150 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 151 } else { - var9 = InvDefinition.WorldMapElement_get(var1.mapIconId); // L: 139 - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 140 + var9 = ByteArrayPool.WorldMapElement_get(var1.mapIconId); // L: 154 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 155 } - var9 = InvDefinition.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 142 - if (var9.field3250) { // L: 143 - this.iconMap.put(new Coord(0, var3, var4), var10); // L: 144 + var9 = ByteArrayPool.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 157 + if (var9.field3411) { // L: 158 + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 159 } - } // L: 146 + } // L: 161 - @ObfuscatedName("s") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1523999708" + garbageValue = "-559628958" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); // L: 149 + Iterator var1 = this.iconMap.values().iterator(); // L: 164 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 150 - if (var2 instanceof WorldMapIcon_1) { // L: 152 - ((WorldMapIcon_1)var2).init(); // L: 153 - } - } - - } // L: 157 - - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "(Ljava/util/List;I)V", - garbageValue = "614836611" - ) - @Export("addAllToIconList") - void addAllToIconList(List var1) { - Iterator var2 = var1.iterator(); // L: 160 - - while (var2.hasNext()) { - WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 161 - if (InvDefinition.WorldMapElement_get(var3.element).field3250 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 163 166 - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method535(var3.element)); // L: 167 - this.icon0List.add(var4); // L: 168 + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 165 + if (var2 instanceof WorldMapIcon_1) { // L: 167 + ((WorldMapIcon_1)var2).init(); // L: 168 } } } // L: 172 - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1548540670" - ) - void method513() { - if (this.worldMapData_0 != null) { // L: 175 - this.worldMapData_0.reset(); // L: 176 - } else { - Iterator var1 = this.worldMapData1List.iterator(); // L: 179 - - while (var1.hasNext()) { - WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 180 - var2.reset(); // L: 182 - } - } - - } // L: 186 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lig;I)Z", - garbageValue = "130952485" - ) - @Export("loadGeography") - boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); // L: 189 - if (this.worldMapData_0 != null) { // L: 190 - this.worldMapData_0.loadGeography(var1); // L: 191 - if (this.worldMapData_0.isFullyLoaded()) { // L: 192 - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 193 - return true; // L: 194 - } else { - return false; // L: 196 - } - } else { - boolean var2 = true; // L: 199 - - Iterator var3; - WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 200 204 - var4 = (WorldMapData_1)var3.next(); // L: 201 - var4.loadGeography(var1); // L: 203 - } - - if (var2) { // L: 207 - var3 = this.worldMapData1List.iterator(); // L: 208 - - while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); // L: 209 - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 211 - } - } - - return var2; // L: 215 - } - } - @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILaf;[Lly;Lig;Lig;I)V", - garbageValue = "-1610882473" + descriptor = "(Ljava/util/List;B)V", + garbageValue = "89" ) - @Export("drawTile") - void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; // L: 220 - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 221 - if (LoginPacket.method3816(this.regionX, this.regionY, var1) == null) { // L: 224 - boolean var6 = true; // L: 227 - var6 &= this.loadGeography(var4); // L: 228 - int var8; - if (this.worldMapData_0 != null) { // L: 231 - var8 = this.worldMapData_0.groupId; // L: 232 - } else { - var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 235 - } + @Export("addAllToIconList") + void addAllToIconList(List var1) { + Iterator var2 = var1.iterator(); // L: 175 - var6 &= var5.tryLoadGroup(var8); // L: 237 - if (var6) { // L: 238 - byte[] var7 = var5.takeFileFlat(var8); // L: 239 - WorldMapSprite var9; - if (var7 == null) { // L: 242 - var9 = new WorldMapSprite(); // L: 243 - } else { - var9 = new WorldMapSprite(WorldMapRectangle.convertJpgToSprite(var7).pixels); // L: 246 - } - - SpritePixels var11 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 249 - var11.setRaster(); // L: 250 - if (this.worldMapData_0 != null) { // L: 251 - this.method617(var2, var3, var9); // L: 252 - } else { - this.method519(var2, var3, var9); // L: 255 - } - - GrandExchangeOfferNameComparator.method211(var11, this.regionX, this.regionY, this.pixelsPerTile); // L: 257 - this.method513(); // L: 258 - } - } - } - } // L: 222 225 259 - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;B)V", - garbageValue = "-78" - ) - void method516(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { // L: 262 - var4 = new HashSet(); // L: 263 - } - - this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 265 - this.drawMapLinks(var1, var2, var4, var3); // L: 266 - } // L: 267 - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "14" - ) - @Export("flashElements") - void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); // L: 270 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 271 - if (var5.hasValidElement()) { // L: 273 - int var6 = var5.getElement(); // L: 274 - if (var1.contains(var6)) { // L: 275 - WorldMapElement var7 = InvDefinition.WorldMapElement_get(var6); // L: 276 - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 277 - } + while (var2.hasNext()) { + WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 176 + if (ByteArrayPool.WorldMapElement_get(var3.element).field3411 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 178 181 + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method2834(var3.element)); // L: 182 + this.icon0List.add(var4); // L: 183 } } - this.method527(var1, var2, var3); // L: 281 - } // L: 282 + } // L: 187 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Laf;[Lly;Lal;B)V", - garbageValue = "-124" + descriptor = "(I)V", + garbageValue = "-896441711" ) - void method617(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method2812() { + if (this.worldMapData_0 != null) { // L: 190 + this.worldMapData_0.reset(); // L: 191 + } else { + Iterator var1 = this.worldMapData1List.iterator(); // L: 194 + + while (var1.hasNext()) { // L: 199 + WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 195 + var2.reset(); // L: 197 + } + } + + } // L: 201 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lir;B)Z", + garbageValue = "0" + ) + @Export("loadGeography") + boolean loadGeography(AbstractArchive var1) { + this.iconMap.clear(); // L: 204 + if (this.worldMapData_0 != null) { // L: 205 + this.worldMapData_0.loadGeography(var1); // L: 206 + if (this.worldMapData_0.isFullyLoaded()) { // L: 207 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 208 + return true; // L: 209 + } else { + return false; // L: 211 + } + } else { + boolean var2 = true; // L: 214 + + Iterator var3; + WorldMapData_1 var4; + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 215 219 + var4 = (WorldMapData_1)var3.next(); // L: 216 + var4.loadGeography(var1); // L: 218 + } + + if (var2) { // L: 222 + var3 = this.worldMapData1List.iterator(); // L: 223 + + while (var3.hasNext()) { + var4 = (WorldMapData_1)var3.next(); // L: 224 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 226 + } + } + + return var2; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(ILfw;[Low;Lir;Lir;I)V", + garbageValue = "-1670034680" + ) + @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; + DemotingHashTable var9 = WorldMapRegion_cachedSprites; // L: 243 + long var10 = (long)(var1 << 16 | var7 << 8 | var8); // L: 246 + SpritePixels var6 = (SpritePixels)var9.get(var10); // L: 248 + if (var6 == null) { // L: 250 + boolean var22 = true; // L: 253 + var22 &= this.loadGeography(var4); // L: 254 + int var11; + if (this.worldMapData_0 != null) { // L: 257 + var11 = this.worldMapData_0.groupId; // L: 258 + } else { + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 261 + } + + var22 &= var5.tryLoadGroup(var11); // L: 263 + if (var22) { // L: 264 + byte[] var23 = var5.takeFileFlat(var11); // L: 265 + WorldMapSprite var12; + if (var23 == null) { // L: 268 + var12 = new WorldMapSprite(); // L: 269 + } else { + var12 = new WorldMapSprite(WorldMapDecorationType.convertJpgToSprite(var23).pixels); // L: 272 + } + + SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 275 + var14.setRaster(); // L: 276 + if (this.worldMapData_0 != null) { // L: 277 + this.method2817(var2, var3, var12); // L: 278 + } else { + this.method2858(var2, var3, var12); // L: 281 + } + + int var15 = this.regionX; // L: 283 + int var16 = this.regionY; // L: 284 + int var17 = this.pixelsPerTile; // L: 285 + DemotingHashTable var18 = WorldMapRegion_cachedSprites; // L: 287 + long var20 = (long)(var17 << 16 | var15 << 8 | var16); // L: 291 + var18.put(var14, var20, var14.pixels.length * 4); // L: 293 + this.method2812(); // L: 295 + } + } + } + } // L: 251 296 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "-2125781425" + ) + void method2815(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 299 + var4 = new HashSet(); // L: 300 + } + + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 302 + this.drawMapLinks(var1, var2, var4, var3); // L: 303 + } // L: 304 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;IIB)V", + garbageValue = "-114" + ) + @Export("flashElements") + void flashElements(HashSet var1, int var2, int var3) { + Iterator var4 = this.iconMap.values().iterator(); // L: 307 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 308 + if (var5.hasValidElement()) { // L: 310 + int var6 = var5.getElement(); // L: 311 + if (var1.contains(var6)) { // L: 312 + WorldMapElement var7 = ByteArrayPool.WorldMapElement_get(var6); // L: 313 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 314 + } + } + } + + this.method2855(var1, var2, var3); // L: 318 + } // L: 319 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lfw;[Low;Lea;B)V", + garbageValue = "-4" + ) + void method2817(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { // L: 285 - for (var5 = 0; var5 < 64; ++var5) { // L: 286 - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 287 - this.method611(var4, var5, this.worldMapData_0, var1); // L: 288 + for (var4 = 0; var4 < 64; ++var4) { // L: 322 + for (var5 = 0; var5 < 64; ++var5) { // L: 323 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 324 + this.method2827(var4, var5, this.worldMapData_0, var1); // L: 325 } } - for (var4 = 0; var4 < 64; ++var4) { // L: 291 - for (var5 = 0; var5 < 64; ++var5) { // L: 292 - this.method590(var4, var5, this.worldMapData_0, var1, var2); // L: 293 + for (var4 = 0; var4 < 64; ++var4) { // L: 328 + for (var5 = 0; var5 < 64; ++var5) { // L: 329 + this.method2819(var4, var5, this.worldMapData_0, var1, var2); // L: 330 } } - } // L: 296 + } // L: 333 - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Laf;[Lly;Lal;I)V", - garbageValue = "-1042910211" + descriptor = "(Lfw;[Low;Lea;I)V", + garbageValue = "1276390377" ) - void method519(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); // L: 299 + void method2858(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + Iterator var4 = this.worldMapData1List.iterator(); // L: 336 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 300 + var5 = (WorldMapData_1)var4.next(); // L: 337 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 302 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 303 - this.drawTileGround(var6, var7, var5, var1, var3); // L: 304 - this.method611(var6, var7, var5, var1); // L: 305 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 339 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 340 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 341 + this.method2827(var6, var7, var5, var1); // L: 342 } } } - var4 = this.worldMapData1List.iterator(); // L: 310 + var4 = this.worldMapData1List.iterator(); // L: 347 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); // L: 311 + var5 = (WorldMapData_1)var4.next(); // L: 348 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 313 - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 314 - this.method590(var6, var7, var5, var1, var2); // L: 315 + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 350 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 351 + this.method2819(var6, var7, var5, var1, var2); // L: 352 } } } - } // L: 320 + } // L: 357 - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(IILac;Laf;[Lly;I)V", - garbageValue = "-1638899903" + descriptor = "(IILee;Lfw;[Low;B)V", + garbageValue = "0" ) - void method590(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method631(var1, var2, var3); // L: 323 - this.method555(var1, var2, var3, var5); // L: 324 - } // L: 325 + void method2819(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method2824(var1, var2, var3); // L: 360 + this.method2823(var1, var2, var3, var5); // L: 361 + } // L: 362 - @ObfuscatedName("p") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IILac;Laf;Lal;I)V", - garbageValue = "-2002564713" + descriptor = "(IILee;Lfw;Lea;B)V", + garbageValue = "0" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 328 - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 329 - if (var6 == -1 && var7 == -1) { // L: 330 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 331 + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 365 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 366 + if (var6 == -1 && var7 == -1) { // L: 367 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 368 } - int var8 = 16711935; // L: 333 - int var9; - if (var7 != -1) { // L: 334 - int var10 = this.backgroundColor; // L: 336 - FloorOverlayDefinition var11 = WallDecoration.method3449(var7); // L: 338 - if (var11 == null) { // L: 339 - var9 = var10; // L: 340 - } else if (var11.secondaryRgb >= 0) { // L: 343 - var9 = var11.secondaryRgb | -16777216; // L: 344 - } else { - int var13; - int var20; - if (var11.texture >= 0) { // L: 346 - var13 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture); // L: 348 - byte var14 = 96; // L: 349 - int var12; - if (var13 == -2) { // L: 351 - var12 = 12345678; // L: 352 - } else if (var13 == -1) { // L: 355 - if (var14 < 0) { // L: 356 - var14 = 0; // L: 357 - } else if (var14 > 127) { // L: 359 - var14 = 127; // L: 360 - } - - var20 = 127 - var14; // L: 362 - var12 = var20; // L: 363 - } else { - var20 = var14 * (var13 & 127) / 128; // L: 366 - if (var20 < 2) { // L: 367 - var20 = 2; - } else if (var20 > 126) { // L: 368 - var20 = 126; - } - - var12 = var20 + (var13 & 65408); // L: 369 - } - - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 372 - } else if (var11.primaryRgb == 16711935) { // L: 374 - var9 = var10; // L: 375 - } else { - var13 = var11.hue; // L: 379 - var20 = var11.saturation; // L: 380 - int var15 = var11.lightness; // L: 381 - if (var15 > 179) { // L: 383 - var20 /= 2; - } - - if (var15 > 192) { // L: 384 - var20 /= 2; - } - - if (var15 > 217) { // L: 385 - var20 /= 2; - } - - if (var15 > 243) { // L: 386 - var20 /= 2; - } - - int var16 = (var20 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 387 - byte var18 = 96; // L: 392 - int var17; - if (var16 == -2) { // L: 394 - var17 = 12345678; // L: 395 - } else { - int var21; - if (var16 == -1) { // L: 398 - if (var18 < 0) { // L: 399 - var18 = 0; // L: 400 - } else if (var18 > 127) { // L: 402 - var18 = 127; // L: 403 - } - - var21 = 127 - var18; // L: 405 - var17 = var21; // L: 406 - } else { - var21 = var18 * (var16 & 127) / 128; // L: 409 - if (var21 < 2) { // L: 410 - var21 = 2; - } else if (var21 > 126) { // L: 411 - var21 = 126; - } - - var17 = var21 + (var16 & 65408); // L: 412 - } - } - - var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 415 - } - } - - var8 = var9; // L: 418 + int var8 = 16711935; // L: 370 + if (var7 != -1) { // L: 371 + var8 = class10.method136(var7, this.backgroundColor); // L: 372 } - if (var7 > -1 && var3.field193[0][var1][var2] == 0) { // L: 420 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 421 + if (var7 > -1 && var3.field1690[0][var1][var2] == 0) { // L: 374 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 375 } else { - var9 = this.method525(var1, var2, var3, var5); // L: 424 - if (var7 == -1) { // L: 425 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 426 + int var9 = this.method2822(var1, var2, var3, var5); // L: 378 + if (var7 == -1) { // L: 379 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 380 } else { - var4.method813(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field193[0][var1][var2], var3.field204[0][var1][var2]); // L: 429 + var4.method3223(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field1690[0][var1][var2], var3.field1700[0][var1][var2]); // L: 383 } } - } // L: 422 427 430 + } // L: 376 381 384 - @ObfuscatedName("o") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(IILac;Laf;I)V", - garbageValue = "-1963666509" + descriptor = "(IILee;Lfw;I)V", + garbageValue = "-1595724187" ) - void method611(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 433 - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 434 - if (var6 > -1) { // L: 435 - int var8 = this.backgroundColor; // L: 437 - FloorOverlayDefinition var9 = WallDecoration.method3449(var6); // L: 439 - int var7; - if (var9 == null) { // L: 440 - var7 = var8; // L: 441 - } else if (var9.secondaryRgb >= 0) { // L: 444 - var7 = var9.secondaryRgb | -16777216; // L: 445 + void method2827(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 387 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 388 + if (var6 > -1) { // L: 389 + int var7 = class10.method136(var6, this.backgroundColor); // L: 390 + if (var3.field1690[var5][var1][var2] == 0) { // L: 391 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 392 } else { - int var11; - int var19; - if (var9.texture >= 0) { // L: 447 - var11 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture); // L: 449 - byte var12 = 96; // L: 450 - int var10; - if (var11 == -2) { // L: 452 - var10 = 12345678; // L: 453 - } else if (var11 == -1) { // L: 456 - if (var12 < 0) { // L: 457 - var12 = 0; // L: 458 - } else if (var12 > 127) { // L: 460 - var12 = 127; // L: 461 - } + var4.method3223(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field1690[var5][var1][var2], var3.field1700[var5][var1][var2]); // L: 395 + } + } + } - var19 = 127 - var12; // L: 463 - var10 = var19; // L: 464 - } else { - var19 = var12 * (var11 & 127) / 128; // L: 467 - if (var19 < 2) { // L: 468 - var19 = 2; - } else if (var19 > 126) { // L: 469 - var19 = 126; - } + } // L: 399 - var10 = var19 + (var11 & 65408); // L: 470 - } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IILee;Lea;I)I", + garbageValue = "-1683449387" + ) + int method2822(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 402 403 405 + } - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 473 - } else if (var9.primaryRgb == 16711935) { // L: 475 - var7 = var8; // L: 476 - } else { - var11 = var9.hue; // L: 480 - var19 = var9.saturation; // L: 481 - int var13 = var9.lightness; // L: 482 - if (var13 > 179) { // L: 484 - var19 /= 2; - } + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(IILee;[Low;I)V", + garbageValue = "164067153" + ) + void method2823(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 409 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 410 + if (var6 != null && var6.length != 0) { // L: 411 + WorldMapDecoration[] var7 = var6; // L: 415 - if (var13 > 192) { // L: 485 - var19 /= 2; - } - - if (var13 > 217) { // L: 486 - var19 /= 2; - } - - if (var13 > 243) { // L: 487 - var19 /= 2; - } - - int var14 = (var19 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 488 - byte var16 = 96; // L: 493 - int var15; - if (var14 == -2) { // L: 495 - var15 = 12345678; // L: 496 - } else { - int var20; - if (var14 == -1) { // L: 499 - if (var16 < 0) { // L: 500 - var16 = 0; // L: 501 - } else if (var16 > 127) { // L: 503 - var16 = 127; // L: 504 - } - - var20 = 127 - var16; // L: 506 - var15 = var20; // L: 507 + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 416 + WorldMapDecoration var9 = var7[var8]; // L: 417 + if (WorldMapSectionType.method3066(var9.decoration) || class244.method4402(var9.decoration)) { // L: 419 + ObjectComposition var10 = class19.getObjectDefinition(var9.objectDefinitionId); // L: 420 + if (var10.mapSceneId != -1) { // L: 421 + if (var10.mapSceneId != 46 && var10.mapSceneId != 52) { // L: 422 + var4[var10.mapSceneId].method6951(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 426 } else { - var20 = var16 * (var14 & 127) / 128; // L: 510 - if (var20 < 2) { // L: 511 - var20 = 2; - } else if (var20 > 126) { // L: 512 - var20 = 126; - } - - var15 = var20 + (var14 & 65408); // L: 513 + var4[var10.mapSceneId].method6951(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 423 } } - - var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 516 } } + } + } - if (var3.field193[var5][var1][var2] == 0) { // L: 520 - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 521 - } else { - var4.method813(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field193[var5][var1][var2], var3.field204[var5][var1][var2]); // L: 524 + } // L: 434 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IILee;I)V", + garbageValue = "-1141468534" + ) + void method2824(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 437 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 438 + if (var5 != null && var5.length != 0) { // L: 439 + WorldMapDecoration[] var6 = var5; // L: 443 + + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 444 + WorldMapDecoration var8 = var6[var7]; // L: 445 + int var10 = var8.decoration; // L: 448 + boolean var9 = var10 >= WorldMapDecorationType.field2820.id && var10 <= WorldMapDecorationType.field2817.id || var10 == WorldMapDecorationType.field2818.id; // L: 450 + if (var9) { // L: 452 + ObjectComposition var11 = class19.getObjectDefinition(var8.objectDefinitionId); // L: 453 + int var12 = var11.int1 != 0 ? -3407872 : -3355444; // L: 454 + if (var8.decoration == WorldMapDecorationType.field2820.id) { // L: 455 + this.method2838(var1, var2, var8.rotation, var12); // L: 456 + } + + if (var8.decoration == WorldMapDecorationType.field2816.id) { // L: 458 + this.method2838(var1, var2, var8.rotation, -3355444); // L: 459 + this.method2838(var1, var2, var8.rotation + 1, var12); // L: 460 + } + + if (var8.decoration == WorldMapDecorationType.field2817.id) { // L: 462 + if (var8.rotation == 0) { // L: 463 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); + } + + if (var8.rotation == 1) { // L: 464 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); + } + + if (var8.rotation == 2) { // L: 465 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + } + + if (var8.rotation == 3) { // L: 466 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + } + } + + if (var8.decoration == WorldMapDecorationType.field2818.id) { // L: 468 + int var13 = var8.rotation % 2; // L: 469 + int var14; + if (var13 == 0) { // L: 470 + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 471 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); // L: 472 + } + } else { + for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { // L: 476 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); // L: 477 + } + } + } + } } } } - } // L: 528 + } // L: 486 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;IB)V", + garbageValue = "25" + ) + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 489 + float var6 = var5 / 2.0F; // L: 490 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 491 + + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 492 + Coord var9 = (Coord)var8.getKey(); // L: 494 + int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 495 + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 496 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 497 + if (var12 != null && var12.hasValidElement()) { // L: 498 + var12.screenX = var10; // L: 499 + var12.screenY = var11; // L: 500 + WorldMapElement var13 = ByteArrayPool.WorldMapElement_get(var12.getElement()); // L: 501 + if (!var3.contains(var13.getObjectId())) { // L: 502 + this.method2828(var12, var10, var11, var5); // L: 503 + } + } + } + + } // L: 508 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "1107537620" + ) + void method2855(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 511 + + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 512 + if (var5.hasValidElement()) { // L: 514 + WorldMapElement var6 = ByteArrayPool.WorldMapElement_get(var5.getElement()); // L: 515 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 516 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 517 + } + } + } + + } // L: 521 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljy;IIIII)V", + garbageValue = "-2097553050" + ) + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + SpritePixels var6 = var1.getSpriteBool(false); // L: 524 + if (var6 != null) { // L: 525 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 528 + if (var4 % var5 < var5 / 2) { // L: 529 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 530 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 531 + } + + } + } // L: 526 533 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Lfg;IIFI)V", + garbageValue = "1220317543" + ) + void method2828(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = ByteArrayPool.WorldMapElement_get(var1.getElement()); // L: 536 + this.method2887(var5, var2, var3); // L: 537 + this.method2830(var1, var5, var2, var3, var4); // L: 538 + } // L: 539 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljy;III)V", + garbageValue = "2016144673" + ) + void method2887(WorldMapElement var1, int var2, int var3) { + SpritePixels var4 = var1.getSpriteBool(false); // L: 542 + if (var4 != null) { // L: 543 + int var5 = this.method2832(var4, var1.horizontalAlignment); // L: 544 + int var6 = this.method2833(var4, var1.verticalAlignment); // L: 545 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 546 + } + + } // L: 548 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(Lfg;Ljy;IIFI)V", + garbageValue = "-1614908131" + ) + void method2830(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 551 + if (var6 != null) { // L: 552 + if (var6.size.method2671(var5)) { // L: 555 + Font var7 = (Font)this.fonts.get(var6.size); // L: 558 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3417, 0, 1, 0, var7.ascent / 2); // L: 559 + } + } + } // L: 553 556 560 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "-1979423677" + ) + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 563 + Iterator var6 = this.icon0List.iterator(); // L: 564 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 565 + if (var7.hasValidElement()) { // L: 567 + int var8 = var7.coord2.x % 64; // L: 568 + int var9 = var7.coord2.y % 64; // L: 569 + var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 570 + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 571 + if (!var3.contains(var7.getElement())) { // L: 572 + this.method2828(var7, var7.screenX, var7.screenY, var5); // L: 575 + } + } + } + + } // L: 578 @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(IILac;Lal;I)I", - garbageValue = "-306988149" + descriptor = "(Loh;Ljd;I)I", + garbageValue = "-2143469237" ) - int method525(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 531 532 534 + int method2832(SpritePixels var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 581 + case 0: + return 0; // L: 588 + case 1: + return -var1.subWidth / 2; // L: 592 + default: + return -var1.subWidth; // L: 584 + } } @ObfuscatedName("am") @ObfuscatedSignature( - descriptor = "(IILac;[Lly;B)V", - garbageValue = "54" + descriptor = "(Loh;Lkf;B)I", + garbageValue = "-70" ) - void method555(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 538 - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 539 - if (var6 != null && var6.length != 0) { // L: 540 - WorldMapDecoration[] var7 = var6; // L: 544 - - for (int var8 = 0; var8 < var7.length; ++var8) { // L: 545 - WorldMapDecoration var9 = var7[var8]; // L: 546 - int var11 = var9.decoration; // L: 549 - boolean var10 = var11 >= WorldMapDecorationType.field2747.id && var11 <= WorldMapDecorationType.field2753.id; // L: 551 - if (!var10) { // L: 554 - int var13 = var9.decoration; // L: 556 - boolean var12 = var13 == WorldMapDecorationType.field2759.id; // L: 558 - if (!var12) { // L: 560 - continue; - } - } - - ObjectComposition var14 = WorldMapAreaData.getObjectDefinition(var9.objectDefinitionId); // L: 562 - if (var14.mapSceneId != -1) { // L: 563 - if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 564 - var4[var14.mapSceneId].method6302(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 568 - } else { - var4[var14.mapSceneId].method6302(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 565 - } - } - } - } + int method2833(SpritePixels var1, VerticalAlignment var2) { + switch(var2.value) { // L: 598 + case 0: + return -var1.subHeight / 2; // L: 601 + case 1: + return 0; // L: 605 + default: + return -var1.subHeight; // L: 609 } - - } // L: 576 + } @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(IILac;B)V", - garbageValue = "-12" - ) - void method631(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 579 - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 580 - if (var5 != null && var5.length != 0) { // L: 581 - WorldMapDecoration[] var6 = var5; // L: 585 - - for (int var7 = 0; var7 < var6.length; ++var7) { // L: 586 - WorldMapDecoration var8 = var6[var7]; // L: 587 - if (GraphicsObject.method2153(var8.decoration)) { // L: 589 - ObjectComposition var9 = WorldMapAreaData.getObjectDefinition(var8.objectDefinitionId); // L: 590 - int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 591 - if (var8.decoration == WorldMapDecorationType.field2765.id) { // L: 592 - this.method539(var1, var2, var8.rotation, var10); // L: 593 - } - - if (var8.decoration == WorldMapDecorationType.field2749.id) { // L: 595 - this.method539(var1, var2, var8.rotation, -3355444); // L: 596 - this.method539(var1, var2, var8.rotation + 1, var10); // L: 597 - } - - if (var8.decoration == WorldMapDecorationType.field2750.id) { // L: 599 - if (var8.rotation == 0) { // L: 600 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); - } - - if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 601 - } - - if (var8.rotation == 2) { // L: 602 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); - } - - if (var8.rotation == 3) { // L: 603 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); - } - } - - if (var8.decoration == WorldMapDecorationType.field2760.id) { // L: 605 - int var11 = var8.rotation % 2; // L: 606 - int var12; - if (var11 == 0) { // L: 607 - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 608 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 609 - } - } else { - for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 613 - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 614 - } - } - } - } - } - } - } - - } // L: 623 - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;IB)V", + descriptor = "(IB)Lfi;", garbageValue = "1" ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 626 - float var6 = var5 / 2.0F; // L: 627 - Iterator var7 = this.iconMap.entrySet().iterator(); // L: 628 - - while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); // L: 629 - Coord var9 = (Coord)var8.getKey(); // L: 631 - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); // L: 632 - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 633 - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 634 - if (var12 != null && var12.hasValidElement()) { // L: 635 - var12.screenX = var10; // L: 636 - var12.screenY = var11; // L: 637 - WorldMapElement var13 = InvDefinition.WorldMapElement_get(var12.getElement()); // L: 638 - if (!var3.contains(var13.getObjectId())) { // L: 639 - this.method520(var12, var10, var11, var5); // L: 640 - } - } - } - - } // L: 645 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;IIB)V", - garbageValue = "31" - ) - void method527(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); // L: 648 - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 649 - if (var5.hasValidElement()) { // L: 651 - WorldMapElement var6 = InvDefinition.WorldMapElement_get(var5.getElement()); // L: 652 - if (var6 != null && var1.contains(var6.getObjectId())) { // L: 653 - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 654 - } - } - } - - } // L: 658 + WorldMapLabel method2834(int var1) { + WorldMapElement var2 = ByteArrayPool.WorldMapElement_get(var1); // L: 615 + return this.createMapLabel(var2); // L: 616 + } @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lic;IIIII)V", - garbageValue = "-515640206" - ) - @Export("drawBackgroundCircle") - void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - SpritePixels var6 = var1.getSpriteBool(false); // L: 661 - if (var6 != null) { // L: 662 - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 665 - if (var4 % var5 < var5 / 2) { // L: 666 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 667 - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 668 - } - - } - } // L: 663 670 - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(Laj;IIFI)V", - garbageValue = "1091480533" - ) - void method520(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = InvDefinition.WorldMapElement_get(var1.getElement()); // L: 673 - this.method530(var5, var2, var3); // L: 674 - this.method601(var1, var5, var2, var3, var4); // L: 675 - } // L: 676 - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(Lic;IIS)V", - garbageValue = "-21879" - ) - void method530(WorldMapElement var1, int var2, int var3) { - SpritePixels var4 = var1.getSpriteBool(false); // L: 679 - if (var4 != null) { // L: 680 - int var5 = this.method577(var4, var1.horizontalAlignment); // L: 681 - int var6 = this.method534(var4, var1.verticalAlignment); // L: 682 - var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 683 - } - - } // L: 685 - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Laj;Lic;IIFI)V", - garbageValue = "-1852361850" - ) - void method601(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); // L: 688 - if (var6 != null) { // L: 689 - if (var6.size.method255(var5)) { // L: 692 - Font var7 = (Font)this.fonts.get(var6.size); // L: 695 - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3245, 0, 1, 0, var7.ascent / 2); // L: 696 - } - } - } // L: 690 693 697 - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "281744270" - ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; // L: 700 - Iterator var6 = this.icon0List.iterator(); // L: 701 - - while (var6.hasNext()) { // L: 714 - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 702 - if (var7.hasValidElement()) { // L: 704 - int var8 = var7.coord2.x % 64; // L: 705 - int var9 = var7.coord2.y % 64; // L: 706 - var7.screenX = (int)((float)var1 + (float)var8 * var5); // L: 707 - var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); // L: 708 - if (!var3.contains(var7.getElement())) { // L: 709 - this.method520(var7, var7.screenX, var7.screenY, var5); // L: 712 - } - } - } - - } // L: 715 - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(Llm;Lje;I)I", - garbageValue = "1212230502" - ) - int method577(SpritePixels var1, HorizontalAlignment var2) { - switch(var2.value) { // L: 718 - case 0: - return 0; // L: 729 - case 2: - return -var1.subWidth / 2; // L: 721 - default: - return -var1.subWidth; // L: 725 - } - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(Llm;Lie;I)I", - garbageValue = "1365602769" - ) - int method534(SpritePixels var1, VerticalAlignment var2) { - switch(var2.value) { // L: 735 - case 0: - return 0; // L: 742 - case 2: - return -var1.subHeight / 2; // L: 746 - default: - return -var1.subHeight; // L: 738 - } - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(II)Laa;", - garbageValue = "-1773755795" - ) - WorldMapLabel method535(int var1) { - WorldMapElement var2 = InvDefinition.WorldMapElement_get(var1); // L: 773 - return this.createMapLabel(var2); // L: 774 - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "(Lic;B)Laa;", - garbageValue = "-89" + descriptor = "(Ljy;B)Lfi;", + garbageValue = "2" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 778 - WorldMapLabelSize var2 = WorldMapLabelSize.method266(var1.textSize); // L: 781 - if (var2 == null) { // L: 782 - return null; // L: 783 + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 620 + WorldMapLabelSize var2 = WorldMapLabelSize.method2670(var1.textSize); // L: 623 + if (var2 == null) { // L: 624 + return null; // L: 625 } else { - Font var3 = (Font)this.fonts.get(var2); // L: 785 - if (var3 == null) { // L: 786 - return null; // L: 787 + Font var3 = (Font)this.fonts.get(var2); // L: 627 + if (var3 == null) { // L: 628 + return null; // L: 629 } else { - int var4 = var3.lineCount(var1.name, 1000000); // L: 789 - String[] var5 = new String[var4]; // L: 790 - var3.breakLines(var1.name, (int[])null, var5); // L: 791 - int var6 = var5.length * var3.ascent / 2; // L: 792 - int var7 = 0; // L: 793 - String[] var8 = var5; // L: 795 + int var4 = var3.lineCount(var1.name, 1000000); // L: 631 + String[] var5 = new String[var4]; // L: 632 + var3.breakLines(var1.name, (int[])null, var5); // L: 633 + int var6 = var5.length * var3.ascent / 2; // L: 634 + int var7 = 0; // L: 635 + String[] var8 = var5; // L: 637 - for (int var9 = 0; var9 < var8.length; ++var9) { // L: 796 - String var10 = var8[var9]; // L: 797 - int var11 = var3.stringWidth(var10); // L: 799 - if (var11 > var7) { // L: 800 - var7 = var11; // L: 801 + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 638 + String var10 = var8[var9]; // L: 639 + int var11 = var3.stringWidth(var10); // L: 641 + if (var11 > var7) { // L: 642 + var7 = var11; // L: 643 } } - return new WorldMapLabel(var1.name, var7, var6, var2); // L: 806 + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 648 } } } else { - return null; // L: 779 + return null; // L: 621 } } - @ObfuscatedName("ah") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(IIIIIB)Ljava/util/List;", - garbageValue = "123" + garbageValue = "-84" ) - List method537(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); // L: 810 - if (var4 >= var1 && var5 >= var2) { // L: 811 - if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 812 - Iterator var7 = this.iconMap.values().iterator(); + List method2895(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 652 + if (var4 >= var1 && var5 >= var2) { // L: 653 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 654 + Iterator var7 = this.iconMap.values().iterator(); // L: 655 AbstractWorldMapIcon var8; - while (var7.hasNext()) { // L: 813 - var8 = (AbstractWorldMapIcon)var7.next(); // L: 814 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 816 - var6.add(var8); // L: 817 + while (var7.hasNext()) { + var8 = (AbstractWorldMapIcon)var7.next(); // L: 656 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 658 + var6.add(var8); // L: 659 } } - var7 = this.icon0List.iterator(); // L: 821 + var7 = this.icon0List.iterator(); // L: 663 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); // L: 822 - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 824 - var6.add(var8); // L: 825 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 664 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 666 + var6.add(var8); // L: 667 } } - return var6; // L: 829 + return var6; // L: 671 } else { - return var6; // L: 820 + return var6; // L: 662 } } else { return var6; } } - @ObfuscatedName("ap") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "-1276264710" + garbageValue = "-221640680" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); // L: 833 - var1.addAll(this.icon0List); // L: 834 - var1.addAll(this.iconMap.values()); // L: 835 - return var1; // L: 836 + LinkedList var1 = new LinkedList(); // L: 675 + var1.addAll(this.icon0List); // L: 676 + var1.addAll(this.iconMap.values()); // L: 677 + return var1; // L: 678 } - @ObfuscatedName("aj") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "1" + descriptor = "(IIIII)V", + garbageValue = "-2020684426" ) - void method539(int var1, int var2, int var3, int var4) { - var3 %= 4; // L: 840 - if (var3 == 0) { // L: 841 + void method2838(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 682 + if (var3 == 0) { // L: 683 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { // L: 842 + if (var3 == 1) { // L: 684 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { // L: 843 + if (var3 == 2) { // L: 685 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 844 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 686 } - } // L: 845 + } // L: 687 - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(S)[Lgb;", - garbageValue = "16256" + descriptor = "(II)V", + garbageValue = "-1279999644" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2172, ServerPacket.field2205, ServerPacket.field2143, ServerPacket.field2144, ServerPacket.field2153, ServerPacket.field2146, ServerPacket.field2147, ServerPacket.field2210, ServerPacket.field2149, ServerPacket.field2195, ServerPacket.field2151, ServerPacket.field2141, ServerPacket.field2198, ServerPacket.field2154, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2157, ServerPacket.field2158, ServerPacket.field2159, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2207, ServerPacket.field2163, ServerPacket.field2152, ServerPacket.field2165, ServerPacket.field2166, ServerPacket.field2145, ServerPacket.field2184, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2188, ServerPacket.field2164, ServerPacket.field2173, ServerPacket.field2174, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2178, ServerPacket.field2168, ServerPacket.field2171, ServerPacket.field2181, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2203, ServerPacket.field2185, ServerPacket.field2150, ServerPacket.field2224, ServerPacket.field2221, ServerPacket.field2189, ServerPacket.field2190, ServerPacket.field2216, ServerPacket.field2186, ServerPacket.field2193, ServerPacket.field2194, ServerPacket.field2202, ServerPacket.field2196, ServerPacket.field2197, ServerPacket.field2191, ServerPacket.field2199, ServerPacket.field2200, ServerPacket.field2206, ServerPacket.field2192, ServerPacket.field2220, ServerPacket.field2204, ServerPacket.field2226, ServerPacket.field2167, ServerPacket.field2215, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2179, ServerPacket.field2211, ServerPacket.field2212, ServerPacket.field2213, ServerPacket.field2214, ServerPacket.field2142, ServerPacket.field2148, ServerPacket.field2217, ServerPacket.field2218, ServerPacket.field2219, ServerPacket.field2187, ServerPacket.field2201, ServerPacket.field2180, ServerPacket.field2223, ServerPacket.field2162, ServerPacket.field2225, ServerPacket.field2222}; // L: 95 - } + public static void method2929(int var0) { + if (var0 != -1) { // L: 229 + if (class69.Widget_loadedInterfaces[var0]) { // L: 230 + FloorDecoration.Widget_archive.clearFilesGroup(var0); // L: 231 + if (Widget.Widget_interfaceComponents[var0] != null) { // L: 232 + boolean var1 = true; // L: 233 - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lkx;II)Ljava/lang/String;", - garbageValue = "216758500" - ) - static String method642(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); // L: 27 - if (var2 > var1) { // L: 28 - var2 = var1; + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 234 + if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 235 + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 236 + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; // L: 237 + } + } + } + + if (var1) { + Widget.Widget_interfaceComponents[var0] = null; // L: 240 + } + + class69.Widget_loadedInterfaces[var0] = false; // L: 241 + } } - - byte[] var3 = new byte[var2]; // L: 29 - var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 30 - String var4 = VertexNormal.decodeStringCp1252(var3, 0, var2); // L: 31 - return var4; // L: 32 - } catch (Exception var6) { // L: 34 - return "Cabbage"; // L: 35 } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Lhz;IIII)V", - garbageValue = "-1454373131" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2686 == null) { // L: 929 - throw new RuntimeException(); // L: 930 - } else { - var0.field2686[var1] = var2; // L: 932 - var0.field2599[var1] = var3; // L: 933 - } - } // L: 934 - - @ObfuscatedName("gy") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "556014304" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; // L: 4913 - int var4 = var1 >> 7; // L: 4914 - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 4915 - int var5 = var2; // L: 4916 - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 4917 - var5 = var2 + 1; - } - - int var6 = var0 & 127; // L: 4918 - int var7 = var1 & 127; // L: 4919 - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 4920 - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 4921 - return var7 * var9 + var8 * (128 - var7) >> 7; // L: 4922 - } else { - return 0; - } - } + } // L: 242 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index aa4293ba25..c4982aa717 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,22 +4,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("fw") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("sf") - @ObfuscatedSignature( - descriptor = "Llu;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1871677981 + intValue = -44870609 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("tileTemplates") byte[][][] tileTemplates; @@ -27,25 +21,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; // L: 10 } // L: 11 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "-313253056" + garbageValue = "-2104011211" ) - void method813(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method3223(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.method826(var8, var7); // L: 15 - var7 = this.method815(var7); // L: 16 + var8 = this.method3224(var8, var7); // L: 15 + var7 = this.method3225(var7); // L: 16 Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } // L: 18 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "655322250" + garbageValue = "464947264" ) - int method826(int var1, int var2) { + int method3224(int var1, int var2) { if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } @@ -54,19 +48,19 @@ public class WorldMapScaleHandler { var1 = var1 + 3 & 3; } - if (var2 == 11) { // L: 23 - var1 = var1 + 3 & 3; + if (var2 == 11) { + var1 = var1 + 3 & 3; // L: 23 } return var1; // L: 24 } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "244529953" + garbageValue = "-10927742" ) - int method815(int var1) { + int method3225(int var1) { if (var1 != 9 && var1 != 10) { // L: 28 return var1 == 11 ? 8 : var1; // L: 29 } else { @@ -74,10 +68,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2066624516" + garbageValue = "-346921749" ) @Export("init") void init() { @@ -94,10 +88,10 @@ public class WorldMapScaleHandler { } } // L: 35 46 - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-134858358" + descriptor = "(B)V", + garbageValue = "-15" ) @Export("init0") void init0() { @@ -122,8 +116,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 - if (var4 <= var3) { // L: 62 - var1[var2] = -1; + if (var4 <= var3) { + var1[var2] = -1; // L: 62 } ++var2; // L: 63 @@ -161,10 +155,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; // L: 84 } // L: 85 - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2097945159" + descriptor = "(B)V", + garbageValue = "1" ) @Export("init1") void init1() { @@ -232,10 +226,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; // L: 127 } // L: 128 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "123" + descriptor = "(I)V", + garbageValue = "-2142515609" ) @Export("init2") void init2() { @@ -299,10 +293,10 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; // L: 166 } // L: 167 - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "60" + garbageValue = "5" ) @Export("init3") void init3() { @@ -366,10 +360,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; // L: 205 } // L: 206 - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1887345157" + garbageValue = "-805674580" ) @Export("init4") void init4() { @@ -433,10 +427,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; // L: 244 } // L: 245 - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1859326664" + garbageValue = "-1414926565" ) @Export("init5") void init5() { @@ -502,10 +496,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; // L: 285 } // L: 286 - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "99" + garbageValue = "5" ) @Export("init6") void init6() { @@ -571,10 +565,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; // L: 326 } // L: 327 - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1454081837" + descriptor = "(B)V", + garbageValue = "-2" ) @Export("init7") void init7() { @@ -615,8 +609,8 @@ public class WorldMapScaleHandler { for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 352 for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 353 - if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 - var1[var5] = -1; + if (var4 >= var3 - this.pixelsPerTile / 2) { + var1[var5] = -1; // L: 354 } ++var5; // L: 355 @@ -640,43 +634,138 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; // L: 367 } // L: 368 - @ObfuscatedName("gv") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "(Lbk;ZI)V", - garbageValue = "458493805" + descriptor = "(I)I", + garbageValue = "-711765153" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4264 - var0.isUnanimated = false; // L: 4265 - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4266 4267 - var0.isUnanimated = true; - } + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 3595 + } - int var2 = var0.x >> 7; // L: 4269 - int var3 = var0.y >> 7; // L: 4270 - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4271 - long var4 = TextureProvider.calculateTag(0, 0, 0, false, var0.index); // L: 4272 - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4273 - var0.isUnanimated = false; // L: 4274 - var0.tileHeight = WorldMapRegion.getTileHeight(var0.x, var0.y, class90.Client_plane); // L: 4275 - var0.playerCycle = Client.cycle; // L: 4276 - MilliClock.scene.addNullableObject(class90.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4277 - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4280 - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4281 - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4282 + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(ZLnk;ZI)V", + garbageValue = "-1439207685" + ) + static final void method3246(boolean var0, PacketBuffer var1, boolean var2) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7338 + int var3 = var1.readBits(15); // L: 7339 + if (var3 != 32767) { // L: 7340 + boolean var4 = false; // L: 7341 + if (Client.npcs[var3] == null) { // L: 7342 + Client.npcs[var3] = new NPC(); // L: 7343 + var4 = true; // L: 7344 } - var0.tileHeight = WorldMapRegion.getTileHeight(var0.x, var0.y, class90.Client_plane); // L: 4284 - var0.playerCycle = Client.cycle; // L: 4285 - MilliClock.scene.drawEntity(class90.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4286 + NPC var5 = Client.npcs[var3]; // L: 7346 + Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7347 + var5.npcCycle = Client.cycle; // L: 7348 + int var6; + int var7; + int var8; + int var9; + if (!var2) { // L: 7352 + if (var0) { // L: 7353 + var8 = var1.readBits(8); // L: 7354 + if (var8 > 127) { // L: 7355 + var8 -= 256; + } + } else { + var8 = var1.readBits(5); // L: 7358 + if (var8 > 15) { // L: 7359 + var8 -= 32; + } + } + + var9 = var1.readBits(1); // L: 7361 + if (var9 == 1) { // L: 7362 + Client.field646[++Client.field645 - 1] = var3; + } + + var5.definition = GraphicsObject.getNpcDefinition(var1.readBits(14)); // L: 7363 + var6 = var1.readBits(1); // L: 7364 + if (var0) { // L: 7365 + var7 = var1.readBits(8); // L: 7366 + if (var7 > 127) { // L: 7367 + var7 -= 256; + } + } else { + var7 = var1.readBits(5); // L: 7370 + if (var7 > 15) { // L: 7371 + var7 -= 32; + } + } + + int var10 = Client.defaultRotations[var1.readBits(3)]; // L: 7373 + if (var4) { + var5.orientation = var5.rotation = var10; // L: 7374 + } + } else { + var9 = var1.readBits(1); // L: 7377 + if (var9 == 1) { // L: 7378 + Client.field646[++Client.field645 - 1] = var3; + } + + var5.definition = GraphicsObject.getNpcDefinition(var1.readBits(14)); // L: 7379 + var6 = var1.readBits(1); // L: 7380 + if (var0) { // L: 7381 + var8 = var1.readBits(8); // L: 7382 + if (var8 > 127) { // L: 7383 + var8 -= 256; + } + } else { + var8 = var1.readBits(5); // L: 7386 + if (var8 > 15) { // L: 7387 + var8 -= 32; + } + } + + if (var0) { // L: 7389 + var7 = var1.readBits(8); // L: 7390 + if (var7 > 127) { + var7 -= 256; // L: 7391 + } + } else { + var7 = var1.readBits(5); // L: 7394 + if (var7 > 15) { // L: 7395 + var7 -= 32; + } + } + + boolean var12 = var1.readBits(1) == 1; // L: 7397 + if (var12) { // L: 7398 + var1.readBits(32); // L: 7399 + } + + int var11 = Client.defaultRotations[var1.readBits(3)]; // L: 7401 + if (var4) { // L: 7402 + var5.orientation = var5.rotation = var11; + } + } + + var5.field1258 = var5.definition.size; // L: 7404 + var5.field1262 = var5.definition.rotation; // L: 7405 + if (var5.field1262 == 0) { // L: 7406 + var5.rotation = 0; + } + + var5.walkSequence = var5.definition.walkSequence; // L: 7407 + var5.walkBackSequence = var5.definition.walkBackSequence; // L: 7408 + var5.walkLeftSequence = var5.definition.walkLeftSequence; // L: 7409 + var5.walkRightSequence = var5.definition.walkRightSequence; // L: 7410 + var5.idleSequence = var5.definition.idleSequence; // L: 7411 + var5.turnLeftSequence = var5.definition.turnLeftSequence; // L: 7412 + var5.turnRightSequence = var5.definition.turnRightSequence; // L: 7413 + var5.method2236(Varcs.localPlayer.pathX[0] + var7, Varcs.localPlayer.pathY[0] + var8, var6 == 1); // L: 7414 + continue; // L: 7415 } } - } - } // L: 4290 + var1.exportIndex(); // L: 7416 + return; // L: 7417 + } + } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index c035ae0495..6f3a56e98e 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("ab") +@ObfuscatedName("fv") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "112" + descriptor = "(Leq;I)V", + garbageValue = "-609192354" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-90" + descriptor = "(IIII)Z", + garbageValue = "-2146205978" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-5" + descriptor = "(III)Z", + garbageValue = "-916390789" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-76" + descriptor = "(IIII)[I", + garbageValue = "1101045563" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "-1841969392" + descriptor = "(III)Lhk;", + garbageValue = "1643926479" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-489268143" + descriptor = "(Lnu;I)V", + garbageValue = "-576756767" ) @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 e0329b6f88..ed48ac120b 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,477 +4,418 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") +@ObfuscatedName("ex") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("da") + @ObfuscatedName("ec") @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Lig;" ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("n") + @Export("archive14") + static Archive archive14; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 132603253 + intValue = 1768091049 ) @Export("oldZ") int oldZ; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1994150525 + intValue = 988628889 ) @Export("newZ") int newZ; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1137484745 + intValue = -1156132855 ) @Export("oldX") int oldX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1490566699 + intValue = 1708018095 ) @Export("oldY") int oldY; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 2105987209 + intValue = -432173517 ) @Export("newX") int newX; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 999326875 + intValue = -2114581385 ) @Export("newY") int newY; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 769253589 + intValue = 130464103 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("e") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 805585157 + intValue = -2110641739 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("q") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 180055579 + intValue = -1280805387 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("l") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -106119971 + intValue = -1407216149 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("s") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1816013269 + intValue = 1337745057 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("b") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2075610043 + intValue = 1810470631 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 754853053 + intValue = 215661089 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("w") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1118736637 + intValue = -1604965757 ) @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { - } + } // L: 22 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "112" + descriptor = "(Leq;I)V", + garbageValue = "-609192354" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { + if (var1.regionLowX > this.newX) { // L: 25 var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; + var1.regionHighX = this.newX; // L: 26 } - if (var1.regionLowY > this.newY) { + if (var1.regionLowY > this.newY) { // L: 27 var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { + if (var1.regionHighY < this.newY) { // L: 28 var1.regionHighY = this.newY; } } // L: 29 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-90" + descriptor = "(IIII)Z", + garbageValue = "-2146205978" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 32 + 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; // L: 33 } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-5" + descriptor = "(III)Z", + garbageValue = "-916390789" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-76" + descriptor = "(IIII)[I", + garbageValue = "1101045563" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 43 return null; // L: 44 } else { - int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 - return var4; // L: 49 + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; + return var4; } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "-1841969392" + descriptor = "(III)Lhk;", + garbageValue = "1643926479" ) @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("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-489268143" + descriptor = "(Lnu;I)V", + garbageValue = "-576756767" ) @Export("read") public void read(Buffer var1) { - this.oldZ = var1.readUnsignedByte(); - this.newZ = var1.readUnsignedByte(); + this.oldZ = var1.readUnsignedByte(); // L: 62 + this.newZ = var1.readUnsignedByte(); // L: 63 this.oldX = var1.readUnsignedShort(); // L: 64 - this.oldChunkXLow = var1.readUnsignedByte(); - this.oldChunkXHigh = var1.readUnsignedByte(); - this.oldY = var1.readUnsignedShort(); + 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(); - this.newChunkXHigh = var1.readUnsignedByte(); - this.newY = var1.readUnsignedShort(); - this.newChunkYLow = var1.readUnsignedByte(); - this.newChunkYHigh = var1.readUnsignedByte(); - this.postRead(); - } + 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("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1652627756" + descriptor = "(B)V", + garbageValue = "61" ) @Export("postRead") void postRead() { + } // L: 79 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;Lir;Lir;I)V", + garbageValue = "1056313138" + ) + public static void method3034(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46 + HitSplatDefinition.field3562 = var1; // L: 47 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "705199058" + descriptor = "(IIII)I", + garbageValue = "80303015" ) - public static String method311(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 + public static int method3058(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var1; + } else if (var2 == 1) { // L: 11 + return 7 - var0; } else { - 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 + return var2 == 2 ? 7 - var1 : var0; // L: 12 } } - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIIS)V", - garbageValue = "16686" + descriptor = "(ILir;IIIZI)V", + garbageValue = "2053595468" ) - static void method308(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 53 - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 54 - int var5 = 0; // L: 55 - if (var1 > var4.field1090) { // L: 56 - var5 += var1 - var4.field1090; - } else if (var1 < var4.x) { // L: 57 - var5 += var4.x - var1; - } + public static void method3059(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class210.musicPlayerStatus = 1; // L: 48 + class210.musicTrackArchive = var1; // L: 49 + FaceNormal.musicTrackGroupId = var2; // L: 50 + WorldMapID.musicTrackFileId = var3; // L: 51 + class375.musicTrackVolume = var4; // L: 52 + class210.musicTrackBoolean = var5; // L: 53 + class1.pcmSampleLength = var0; // L: 54 + } // L: 55 - if (var2 > var4.field1094) { // L: 58 - var5 += var2 - var4.field1094; - } else if (var2 < var4.y) { // L: 59 - var5 += var4.y - var2; - } + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(Lhu;II)I", + garbageValue = "-1824113560" + ) + static final int method3036(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10105 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 10107 + int var3 = 0; // L: 10108 + int var4 = 0; // L: 10109 + byte var5 = 0; // L: 10110 - if (var5 - 64 <= var4.field1092 && WorldMapSectionType.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 60 - var5 -= 64; // L: 71 - if (var5 < 0) { // L: 72 - var5 = 0; + while (true) { + int var6 = var2[var4++]; // L: 10112 + int var7 = 0; // L: 10113 + byte var8 = 0; // L: 10114 + if (var6 == 0) { // L: 10115 + return var3; } - int var6 = (var4.field1092 - var5) * WorldMapSectionType.clientPreferences.areaSoundEffectsVolume / var4.field1092; // L: 73 - if (var4.stream1 == null) { // L: 74 - if (var4.soundEffectId >= 0) { // L: 75 - SoundEffect var7 = SoundEffect.readSoundEffect(WorldMapCacheName.archive4, var4.soundEffectId, 0); // L: 76 - if (var7 != null) { // L: 77 - RawSound var8 = var7.toRawSound().resample(World.decimator); // L: 78 - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79 - var9.setNumLoops(-1); // L: 80 - VarbitComposition.pcmStreamMixer.addSubStream(var9); // L: 81 - var4.stream1 = var9; // L: 82 + if (var6 == 1) { // L: 10116 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 10117 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 10118 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 10119 + var9 = var2[var4++] << 16; // L: 10120 + var9 += var2[var4++]; // L: 10121 + var10 = class139.getWidget(var9); // L: 10122 + var11 = var2[var4++]; // L: 10123 + if (var11 != -1 && (!class23.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10124 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10125 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10126 + var7 += var10.itemQuantities[var12]; + } } } - } else { - var4.stream1.method2796(var6); // L: 86 } - if (var4.stream2 == null) { // L: 87 - if (var4.soundEffectIds != null && (var4.field1097 -= var3) <= 0) { // L: 88 - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89 - SoundEffect var12 = SoundEffect.readSoundEffect(WorldMapCacheName.archive4, var4.soundEffectIds[var11], 0); // L: 90 - if (var12 != null) { // L: 91 - RawSound var13 = var12.toRawSound().resample(World.decimator); // L: 92 - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93 - var10.setNumLoops(0); // L: 94 - VarbitComposition.pcmStreamMixer.addSubStream(var10); // L: 95 - var4.stream2 = var10; // L: 96 - var4.field1097 = var4.field1095 + (int)(Math.random() * (double)(var4.field1096 - var4.field1095)); // L: 97 + if (var6 == 5) { // L: 10130 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 10131 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 10132 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 10133 + var7 = Varcs.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 10134 + for (var9 = 0; var9 < 25; ++var9) { // L: 10135 + if (Skills.Skills_enabled[var9]) { // L: 10136 + var7 += Client.levels[var9]; } } + } + + if (var6 == 10) { // L: 10139 + var9 = var2[var4++] << 16; // L: 10140 + var9 += var2[var4++]; // L: 10141 + var10 = class139.getWidget(var9); // L: 10142 + var11 = var2[var4++]; // L: 10143 + if (var11 != -1 && (!class23.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10144 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10145 + if (var11 + 1 == var10.itemIds[var12]) { // L: 10146 + var7 = 999999999; // L: 10147 + break; // L: 10148 + } + } + } + } + + if (var6 == 11) { // L: 10153 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 10154 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 10155 + var9 = Varps.Varps_main[var2[var4++]]; // L: 10156 + int var13 = var2[var4++]; // L: 10157 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10158 + } + + if (var6 == 14) { // L: 10160 + var9 = var2[var4++]; // L: 10161 + var7 = class2.getVarbit(var9); // L: 10162 + } + + if (var6 == 15) { // L: 10164 + var8 = 1; + } + + if (var6 == 16) { // L: 10165 + var8 = 2; + } + + if (var6 == 17) { // L: 10166 + var8 = 3; + } + + if (var6 == 18) { // L: 10167 + var7 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; + } + + if (var6 == 19) { // L: 10168 + var7 = (Varcs.localPlayer.y >> 7) + Tile.baseY; + } + + if (var6 == 20) { // L: 10169 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 10170 + if (var5 == 0) { // L: 10171 + var3 += var7; + } + + if (var5 == 1) { // L: 10172 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 10173 + var3 /= var7; + } + + if (var5 == 3) { // L: 10174 + var3 *= var7; + } + + var5 = 0; // L: 10175 } else { - var4.stream2.method2796(var6); // L: 102 - if (!var4.stream2.hasNext()) { // L: 103 - var4.stream2 = null; // L: 104 - } - } - } else { - if (var4.stream1 != null) { // L: 61 - VarbitComposition.pcmStreamMixer.removeSubStream(var4.stream1); // L: 62 - var4.stream1 = null; // L: 63 - } - - if (var4.stream2 != null) { // L: 65 - VarbitComposition.pcmStreamMixer.removeSubStream(var4.stream2); // L: 66 - var4.stream2 = null; // L: 67 - } - } - } - } - - } // L: 108 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "([BIIIIIIILeq;[Lfe;I)V", - garbageValue = "2043009976" - ) - static final void method310(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); // L: 173 - int var11 = -1; // L: 174 - - while (true) { - int var12 = var10.method5704(); // L: 176 - if (var12 == 0) { // L: 177 - return; // L: 232 - } - - var11 += var12; // L: 178 - int var13 = 0; // L: 179 - - while (true) { - int var14 = var10.readUShortSmart(); // L: 181 - if (var14 == 0) { // L: 182 - break; - } - - var13 += var14 - 1; // L: 183 - int var15 = var13 & 63; // L: 184 - int var16 = var13 >> 6 & 63; // L: 185 - int var17 = var13 >> 12; // L: 186 - int var18 = var10.readUnsignedByte(); // L: 187 - int var19 = var18 >> 2; // L: 188 - int var20 = var18 & 3; // L: 189 - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 190 - ObjectComposition var21 = WorldMapAreaData.getObjectDefinition(var11); // L: 191 - int var24 = var16 & 7; // L: 194 - int var25 = var15 & 7; // L: 195 - int var27 = var21.sizeX; // L: 197 - int var28 = var21.sizeY; // L: 198 - int var29; - if ((var20 & 1) == 1) { // L: 200 - var29 = var27; // L: 201 - var27 = var28; // L: 202 - var28 = var29; // L: 203 - } - - int var26 = var7 & 3; // L: 205 - int var23; - if (var26 == 0) { // L: 206 - var23 = var24; // L: 207 - } else if (var26 == 1) { // L: 210 - var23 = var25; // L: 211 - } else if (var26 == 2) { // L: 214 - var23 = 7 - var24 - (var27 - 1); // L: 215 - } else { - var23 = 7 - var25 - (var28 - 1); // L: 218 - } - - var29 = var2 + var23; // L: 220 - int var30 = var3 + DevicePcmPlayerProvider.method921(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 221 - if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { // L: 222 - int var31 = var1; // L: 223 - if ((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) { // L: 224 - var31 = var1 - 1; - } - - CollisionMap var32 = null; // L: 225 - if (var31 >= 0) { // L: 226 - var32 = var9[var31]; - } - - GameEngine.method1134(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 227 + var5 = var8; // L: 10177 } } + } catch (Exception var14) { // L: 10180 + return -1; // L: 10181 } + } else { + return -2; } } - - @ObfuscatedName("ew") - @ObfuscatedSignature( - descriptor = "(I)Lmf;", - garbageValue = "355278253" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return SoundSystem.worldMap; // L: 663 - } - - @ObfuscatedName("fp") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-116" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { // L: 3468 - WorldMapSectionType.clientPreferences.roofsHidden = !WorldMapSectionType.clientPreferences.roofsHidden; // L: 3469 - class23.savePreferences(); // L: 3470 - if (WorldMapSectionType.clientPreferences.roofsHidden) { // L: 3471 - AbstractWorldMapData.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - AbstractWorldMapData.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3472 - } - } - - if (var0.equalsIgnoreCase("displayfps")) { // L: 3474 - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.renderSelf = !Client.renderSelf; // L: 3475 - } - - if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3476 - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { // L: 3477 - if (var0.equalsIgnoreCase("errortest")) { // L: 3478 - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { // L: 3479 - SoundSystem.worldMap.showCoord = !SoundSystem.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { // L: 3480 - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { - Client.displayFps = false; // L: 3481 - } - - if (var0.equalsIgnoreCase("gc")) { // L: 3482 - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { // L: 3483 - class8.method90(); - } - } - - PacketBufferNode var1 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); // L: 3486 - var1.packetBuffer.writeByte(var0.length() + 1); // L: 3487 - var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3488 - Client.packetWriter.addNode(var1); // L: 3489 - } // L: 3490 } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 7a6b0f310d..c41cc32181 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -3,50 +3,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ap") +@ObfuscatedName("ff") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "[Lly;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("n") + @ObfuscatedName("h") + public static short[] field1753; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1101754891 + intValue = -1410379801 ) @Export("minPlane") int minPlane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 112760039 + intValue = -1271552449 ) @Export("planes") int planes; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1255981351 + intValue = -1025111875 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 282137725 + intValue = -151560709 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2048603637 + intValue = -857538819 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -2025477005 + intValue = 1507190369 ) @Export("regionEndY") int regionEndY; @@ -54,10 +49,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } // L: 14 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "112" + descriptor = "(Leq;I)V", + garbageValue = "-609192354" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -79,10 +74,10 @@ public class WorldMapSection1 implements WorldMapSection { } // L: 21 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-90" + descriptor = "(IIII)Z", + garbageValue = "-2146205978" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -93,20 +88,20 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-5" + descriptor = "(III)Z", + garbageValue = "-916390789" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; // L: 31 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-76" + descriptor = "(IIII)[I", + garbageValue = "1101045563" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -118,10 +113,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "-1841969392" + descriptor = "(III)Lhk;", + garbageValue = "1643926479" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -134,15 +129,15 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-489268143" + descriptor = "(Lnu;I)V", + garbageValue = "-576756767" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); - this.planes = var1.readUnsignedByte(); + 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 @@ -150,147 +145,65 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); // L: 60 } // L: 61 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "12" + garbageValue = "-28" ) @Export("postRead") void postRead() { } // L: 63 - @ObfuscatedName("y") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "103" + descriptor = "(CI)C", + garbageValue = "-1918017802" ) - public static void method671() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 54 - } // L: 55 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "4" - ) - static boolean method657(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { // L: 777 - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { // L: 778 - return true; - } + static char method3154(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 } - - return false; // L: 780 } - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-1029416071" + descriptor = "(Lir;Ljava/lang/String;Ljava/lang/String;I)Low;", + garbageValue = "-466976069" ) - static int method679(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 948 - var0 -= 1000; // L: 949 - var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 950 + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 152 + int var4 = var0.getFileId(var3, var2); // L: 153 + byte[] var7 = var0.takeFile(var3, var4); // L: 158 + boolean var6; + if (var7 == null) { // L: 159 + var6 = false; // L: 160 } else { - var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 952 + class244.SpriteBuffer_decode(var7); // L: 163 + var6 = true; // L: 164 } - String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 953 - int[] var5 = null; // L: 954 - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 955 - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 956 - if (var6 > 0) { // L: 957 - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { // L: 958 959 - } - } - - var4 = var4.substring(0, var4.length() - 1); // L: 961 - } - - Object[] var8 = new Object[var4.length() + 1]; // L: 963 - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 964 - if (var4.charAt(var7 - 1) == 's') { - var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 965 - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 966 - } - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 968 - if (var7 != -1) { // L: 969 - var8[0] = new Integer(var7); + IndexedSprite var5; + if (!var6) { // L: 166 + var5 = null; // L: 167 } else { - var8 = null; // L: 970 + var5 = ArchiveLoader.method2076(); // L: 170 } - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; // L: 971 - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 972 - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 973 - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 974 - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 975 - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 976 - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 977 - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 978 - var3.onVarTransmit = var8; // L: 979 - var3.varTransmitTriggers = var5; // L: 980 - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 982 - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 983 - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 984 - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 985 - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 986 - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 987 - var3.onInvTransmit = var8; // L: 988 - var3.invTransmitTriggers = var5; // L: 989 - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 991 - var3.onStatTransmit = var8; // L: 992 - var3.statTransmitTriggers = var5; // L: 993 - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 995 - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 996 - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 997 - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 998 - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 999 - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1000 - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1001 - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1002 - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1003 - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1004 - var3.onStockTransmit = var8; - } else if (var0 == 1426) { // L: 1005 - var3.field2678 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { // L: 1006 - return 2; // L: 1007 - } + return var5; // L: 172 + } - var3.onResize = var8; - } - - var3.hasListener = true; // L: 1008 - return 1; // L: 1009 + @ObfuscatedName("k") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 77 } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 86d2498a51..8ceeea6d8f 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,98 +4,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ak") +@ObfuscatedName("en") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("n") + @ObfuscatedName("qa") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1261462593 + intValue = -169381135 ) @Export("minPlane") int minPlane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 673564695 + intValue = 487968763 ) @Export("planes") int planes; - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1568075511 + intValue = -317879561 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1256357453 + intValue = -1129962761 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1568273265 + intValue = -1913181737 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1493611659 + intValue = -198835895 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1992152745 + intValue = 1054522171 ) - int field227; - @ObfuscatedName("e") + int field1587; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 360944973 + intValue = 2073575157 ) - int field228; - @ObfuscatedName("q") + int field1588; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1394856673 + intValue = -1399481235 ) - int field222; - @ObfuscatedName("l") + int field1583; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1765677155 + intValue = -186882901 ) - int field230; + int field1584; WorldMapSection2() { } // L: 18 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "112" + descriptor = "(Leq;I)V", + garbageValue = "-609192354" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field227) { // L: 21 - var1.regionLowX = this.field227; + if (var1.regionLowX > this.field1587) { // L: 21 + var1.regionLowX = this.field1587; } - if (var1.regionHighX < this.field222) { - var1.regionHighX = this.field222; // L: 22 + if (var1.regionHighX < this.field1583) { + var1.regionHighX = this.field1583; // L: 22 } - if (var1.regionLowY > this.field228) { // L: 23 - var1.regionLowY = this.field228; + if (var1.regionLowY > this.field1588) { // L: 23 + var1.regionLowY = this.field1588; } - if (var1.regionHighY < this.field230) { // L: 24 - var1.regionHighY = this.field230; + if (var1.regionHighY < this.field1584) { // L: 24 + var1.regionHighY = this.field1584; } } // L: 25 - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-90" + descriptor = "(IIII)Z", + garbageValue = "-2146205978" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -106,51 +109,51 @@ public class WorldMapSection2 implements WorldMapSection { } } - @ObfuscatedName("d") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-5" + descriptor = "(III)Z", + garbageValue = "-916390789" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field227 && var1 >> 6 <= this.field222 && var2 >> 6 >= this.field228 && var2 >> 6 <= this.field230; // L: 35 + return var1 >> 6 >= this.field1587 && var1 >> 6 <= this.field1583 && var2 >> 6 >= this.field1588 && var2 >> 6 <= this.field1584; // L: 35 } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-76" + descriptor = "(IIII)[I", + garbageValue = "1101045563" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { // L: 39 return null; // L: 40 } else { - int[] var4 = new int[]{var2 + (this.field227 * 64 - this.regionStartX * 64), var3 + (this.field228 * 64 - this.regionStartY * 64)}; // L: 42 43 44 + int[] var4 = new int[]{var2 + (this.field1587 * 64 - this.regionStartX * 64), var3 + (this.field1588 * 64 - this.regionStartY * 64)}; // L: 42 43 44 return var4; // L: 45 } } - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "-1841969392" + descriptor = "(III)Lhk;", + garbageValue = "1643926479" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { // L: 49 return null; // L: 50 } else { - int var3 = this.regionStartX * 64 - this.field227 * 64 + var1; // L: 52 - int var4 = var2 + (this.regionStartY * 64 - this.field228 * 64); // L: 53 + int var3 = this.regionStartX * 64 - this.field1587 * 64 + var1; // L: 52 + int var4 = var2 + (this.regionStartY * 64 - this.field1588 * 64); // L: 53 return new Coord(this.minPlane, var3, var4); // L: 54 } } - @ObfuscatedName("h") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-489268143" + descriptor = "(Lnu;I)V", + garbageValue = "-576756767" ) @Export("read") public void read(Buffer var1) { @@ -160,124 +163,163 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); // L: 61 this.regionEndX = var1.readUnsignedShort(); // L: 62 this.regionEndY = var1.readUnsignedShort(); // L: 63 - this.field227 = var1.readUnsignedShort(); // L: 64 - this.field228 = var1.readUnsignedShort(); // L: 65 - this.field222 = var1.readUnsignedShort(); // L: 66 - this.field230 = var1.readUnsignedShort(); // L: 67 + this.field1587 = var1.readUnsignedShort(); // L: 64 + this.field1588 = var1.readUnsignedShort(); // L: 65 + this.field1583 = var1.readUnsignedShort(); // L: 66 + this.field1584 = var1.readUnsignedShort(); // L: 67 this.postRead(); // L: 68 } // L: 69 - @ObfuscatedName("z") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "16256" + descriptor = "(I)V", + garbageValue = "-50622469" ) @Export("postRead") void postRead() { } // L: 71 - @ObfuscatedName("h") + @ObfuscatedName("im") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1722479891" + descriptor = "(Lkc;IIII)V", + garbageValue = "1629548080" ) - public static void method387() { - try { - JagexCache.JagexCache_dat2File.close(); // L: 297 - - for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 298 - WorldMapEvent.JagexCache_idxFiles[var0].close(); + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { // L: 9212 + if (var0.transforms != null) { // L: 9213 + var0 = var0.transform(); } - JagexCache.JagexCache_idx255File.close(); // L: 299 - JagexCache.JagexCache_randomDat.close(); // L: 300 - } catch (Exception var2) { // L: 302 + if (var0 != null) { // L: 9214 + if (var0.isInteractable) { // L: 9215 + if (!var0.isFollower || Client.followerIndex == var1) { // L: 9216 + String var4 = var0.name; // L: 9217 + int var7; + int var8; + if (var0.combatLevel != 0) { // L: 9218 + var7 = var0.combatLevel; // L: 9221 + var8 = Varcs.localPlayer.combatLevel; // L: 9222 + int var9 = var8 - var7; // L: 9224 + String var6; + if (var9 < -9) { // L: 9225 + var6 = DefaultsGroup.colorStartTag(16711680); // L: 9226 + } else if (var9 < -6) { // L: 9229 + var6 = DefaultsGroup.colorStartTag(16723968); // L: 9230 + } else if (var9 < -3) { // L: 9233 + var6 = DefaultsGroup.colorStartTag(16740352); // L: 9234 + } else if (var9 < 0) { // L: 9237 + var6 = DefaultsGroup.colorStartTag(16756736); // L: 9238 + } else if (var9 > 9) { // L: 9241 + var6 = DefaultsGroup.colorStartTag(65280); // L: 9242 + } else if (var9 > 6) { // L: 9245 + var6 = DefaultsGroup.colorStartTag(4259584); // L: 9246 + } else if (var9 > 3) { // L: 9249 + var6 = DefaultsGroup.colorStartTag(8453888); // L: 9250 + } else if (var9 > 0) { // L: 9253 + var6 = DefaultsGroup.colorStartTag(12648192); // L: 9254 + } else { + var6 = DefaultsGroup.colorStartTag(16776960); // L: 9257 + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9259 + } + + if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9261 + SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9262 + } + + if (Client.isItemSelected == 1) { // L: 9265 + SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9266 + } else if (Client.isSpellSelected) { // L: 9269 + if ((UserComparator10.selectedSpellFlags & 2) == 2) { // L: 9270 + SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9271 + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9276 + String[] var11 = var0.actions; // L: 9277 + if (var11 != null) { // L: 9278 + for (var7 = 4; var7 >= 0; --var7) { // L: 9279 + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9280 + var8 = 0; // L: 9281 + if (var7 == 0) { // L: 9282 + var8 = var10 + 9; + } + + if (var7 == 1) { // L: 9283 + var8 = var10 + 10; + } + + if (var7 == 2) { // L: 9284 + var8 = var10 + 11; + } + + if (var7 == 3) { // L: 9285 + var8 = var10 + 12; + } + + if (var7 == 4) { // L: 9286 + var8 = var10 + 13; + } + + SpriteMask.insertMenuItemNoShift(var11[var7], DefaultsGroup.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9287 + } + } + } + + if (var11 != null) { // L: 9292 + for (var7 = 4; var7 >= 0; --var7) { // L: 9293 + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9294 + short var12 = 0; // L: 9295 + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9296 + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Varcs.localPlayer.combatLevel) { // L: 9297 + var12 = 2000; // L: 9298 + } + + var8 = 0; // L: 9300 + if (var7 == 0) { // L: 9301 + var8 = var12 + 9; + } + + if (var7 == 1) { // L: 9302 + var8 = var12 + 10; + } + + if (var7 == 2) { // L: 9303 + var8 = var12 + 11; + } + + if (var7 == 3) { // L: 9304 + var8 = var12 + 12; + } + + if (var7 == 4) { // L: 9305 + var8 = var12 + 13; + } + + SpriteMask.insertMenuItemNoShift(var11[var7], DefaultsGroup.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9306 + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9311 + SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9312 + } + } + + } + } + } } + } // L: 9316 - } // L: 303 - - @ObfuscatedName("fn") + @ObfuscatedName("iw") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "815934971" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "0" ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - SecureRandomCallable.logOut(); // L: 2617 - switch(var0) { // L: 2618 - case 1: - Login.loginIndex = 24; // L: 2630 - InvDefinition.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2631 - break; - case 2: - Login.loginIndex = 24; // L: 2622 - InvDefinition.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 2623 - } - - } // L: 2636 - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "8447233" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { // L: 8877 - Widget var0 = ArchiveLoader.getWidgetChild(MidiPcmStream.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8878 - if (var0 != null && var0.onTargetLeave != null) { // L: 8879 - ScriptEvent var1 = new ScriptEvent(); // L: 8880 - var1.widget = var0; // L: 8881 - var1.args = var0.onTargetLeave; // L: 8882 - PacketWriter.runScriptEvent(var1); // L: 8883 - } - - Client.isSpellSelected = false; // L: 8885 - IsaacCipher.invalidateWidget(var0); // L: 8886 - } - } // L: 8887 - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(Lhz;B)V", - garbageValue = "59" - ) - static final void method401(Widget var0) { - int var1 = var0.contentType; // L: 11181 - if (var1 == 324) { // L: 11182 - if (Client.field850 == -1) { // L: 11183 - Client.field850 = var0.spriteId2; // L: 11184 - Client.field927 = var0.spriteId; // L: 11185 - } - - if (Client.playerAppearance.isFemale) { // L: 11187 - var0.spriteId2 = Client.field850; - } else { - var0.spriteId2 = Client.field927; // L: 11188 - } - - } else if (var1 == 325) { // L: 11191 - if (Client.field850 == -1) { // L: 11192 - Client.field850 = var0.spriteId2; // L: 11193 - Client.field927 = var0.spriteId; // L: 11194 - } - - if (Client.playerAppearance.isFemale) { // L: 11196 - var0.spriteId2 = Client.field927; - } else { - var0.spriteId2 = Client.field850; // L: 11197 - } - - } else if (var1 == 327) { // L: 11200 - var0.modelAngleX = 150; // L: 11201 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11202 - var0.modelType = 5; // L: 11203 - var0.modelId = 0; // L: 11204 - } else if (var1 == 328) { // L: 11207 - var0.modelAngleX = 150; // L: 11208 - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11209 - var0.modelType = 5; // L: 11210 - var0.modelId = 1; // L: 11211 - } - } // L: 11189 11198 11205 11212 11214 + static final String method2726(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 10081 10082 + } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 514dec3e6f..2cb5e16da5 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,53 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("ed") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Led;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("v") + WORLDMAPSECTIONTYPE0(2, (byte)0), + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Led;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(0, (byte)1), - @ObfuscatedName("d") + WORLDMAPSECTIONTYPE1(1, (byte)1), + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Led;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(2, (byte)2), - @ObfuscatedName("c") + WORLDMAPSECTIONTYPE2(3, (byte)2), + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lae;" + descriptor = "Led;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(1, (byte)3); + WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("sm") - @ObfuscatedSignature( - descriptor = "Lcf;" - ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("sv") - @ObfuscatedSignature( - descriptor = "Li;" - ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("y") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -695780183 + intValue = 624022127 ) @Export("type") final int type; - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("id") final byte id; @@ -59,130 +47,35 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; // L: 18 } // L: 19 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(I)I", + garbageValue = "-1000839247" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; // L: 22 } - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(Liy;IIIBZI)V", - garbageValue = "-1369121256" + descriptor = "(IZIZI)V", + garbageValue = "-998879160" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); // L: 60 - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 61 - if (var8 == null) { // L: 62 - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 63 - if (var8 == null) { // L: 64 - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 65 - if (var8 != null) { // L: 66 - if (var5) { // L: 67 - var8.removeDual(); // L: 68 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 69 - --NetCache.NetCache_pendingWritesCount; // L: 70 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 71 - } - - } else { - if (!var5) { // L: 75 - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 76 - if (var8 != null) { // L: 77 - return; - } - } - - var8 = new NetFileRequest(); // L: 79 - var8.archive = var0; // L: 80 - var8.crc = var3; // L: 81 - var8.padding = var4; // L: 82 - if (var5) { // L: 83 - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 84 - ++NetCache.NetCache_pendingPriorityWritesCount; // L: 85 - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 88 - NetCache.NetCache_pendingWrites.put(var8, var6); // L: 89 - ++NetCache.NetCache_pendingWritesCount; // L: 90 - } - - } - } + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class9.World_worlds != null) { // L: 171 + class368.doWorldSorting(0, class9.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 } - } // L: 73 92 - @ObfuscatedName("a") + } // L: 174 + + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-103793569" + descriptor = "(II)Z", + garbageValue = "583371585" ) - static final int method320(int var0, int var1) { - int var2 = var1 * 57 + var0; // L: 558 - var2 ^= var2 << 13; // L: 559 - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; // L: 560 - return var3 >> 19 & 255; // L: 561 + public static boolean method3066(int var0) { + return var0 >= WorldMapDecorationType.field2834.id && var0 <= WorldMapDecorationType.field2835.id; // L: 42 } - - @ObfuscatedName("go") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-177467978" - ) - static final void method318(int var0, int var1, int var2, int var3) { - Client.field778 = 0; // L: 4869 - int var4 = (UserComparator9.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; // L: 4870 - int var5 = (UserComparator9.localPlayer.y >> 7) + NetCache.baseY; // L: 4871 - if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { // L: 4872 - Client.field778 = 1; - } - - if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { // L: 4873 - Client.field778 = 1; - } - - if (Client.field778 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { // L: 4874 - Client.field778 = 0; - } - - } // L: 4876 - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "417722917" - ) - static final void method319() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7291 7292 7311 - if (var0.hitpoints > 0) { // L: 7293 - --var0.hitpoints; - } - - if (var0.hitpoints == 0) { // L: 7294 - if (var0.objectId < 0 || TaskHandler.method3673(var0.objectId, var0.field945)) { // L: 7295 - SpriteMask.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field944, var0.field945); // L: 7296 - var0.remove(); // L: 7297 - } - } else { - if (var0.delay > 0) { // L: 7301 - --var0.delay; - } - - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || TaskHandler.method3673(var0.id, var0.field948))) { // L: 7302 7303 - SpriteMask.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field948); // L: 7304 - var0.delay = -1; // L: 7305 - if (var0.objectId == var0.id && var0.objectId == -1) { // L: 7306 - var0.remove(); - } else if (var0.id == var0.objectId && var0.field944 == var0.orientation && var0.field948 == var0.field945) { // L: 7307 - var0.remove(); - } - } - } - } - - } // L: 7313 } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index c950fc4d01..07c27de153 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -3,25 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("ea") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("q") - static int[][] field257; - @ObfuscatedName("l") - public static short[][] field259; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lfm;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("ji") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - static Widget field260; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("tileColors") final int[] tileColors; @@ -33,133 +18,53 @@ public final class WorldMapSprite { this.tileColors = var1; // L: 15 } // L: 16 - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-36950090" + descriptor = "(IIB)I", + garbageValue = "-92" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var2 * 64 + var1]; // L: 19 } - @ObfuscatedName("n") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Lgd;Lmw;S)Lgk;", - garbageValue = "22306" + descriptor = "(I)V", + garbageValue = "-2142917261" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24 - var2 = new PacketBufferNode(); // L: 25 - } else { - var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28 + static final void method3108() { + if (!ViewportMouse.ViewportMouse_false0) { // L: 95 + int var0 = Scene.Scene_cameraPitchSine; // L: 96 + int var1 = Scene.Scene_cameraPitchCosine; // L: 97 + int var2 = Scene.Scene_cameraYawSine; // L: 98 + int var3 = Scene.Scene_cameraYawCosine; // L: 99 + byte var4 = 50; // L: 100 + short var5 = 3500; // L: 101 + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 102 + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 103 + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 104 + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 105 + int var10 = Rasterizer3D.method3400(var7, var4, var1, var0); // L: 107 + int var11 = Rasterizer3D.method3367(var7, var4, var1, var0); // L: 108 + var7 = var10; // L: 109 + var10 = Rasterizer3D.method3400(var9, var5, var1, var0); // L: 110 + int var12 = Rasterizer3D.method3367(var9, var5, var1, var0); // L: 111 + var9 = var10; // L: 112 + var10 = Rasterizer3D.method3379(var6, var11, var3, var2); // L: 113 + var11 = Rasterizer3D.method3380(var6, var11, var3, var2); // L: 114 + var6 = var10; // L: 115 + var10 = Rasterizer3D.method3379(var8, var12, var3, var2); // L: 116 + var12 = Rasterizer3D.method3380(var8, var12, var3, var2); // L: 117 + UserComparator10.field1439 = (var10 + var6) / 2; // L: 119 + MusicPatchPcmStream.field2544 = (var7 + var9) / 2; // L: 120 + WorldMapLabelSize.field1568 = (var11 + var12) / 2; // L: 121 + ViewportMouse.field2135 = (var10 - var6) / 2; // L: 122 + ViewportMouse.field2136 = (var9 - var7) / 2; // L: 123 + Varps.field2580 = (var12 - var11) / 2; // L: 124 + Login.field1018 = Math.abs(ViewportMouse.field2135); // L: 125 + ViewportMouse.field2137 = Math.abs(ViewportMouse.field2136); // L: 126 + class24.field189 = Math.abs(Varps.field2580); // L: 127 } - - var2.clientPacket = var0; // L: 31 - var2.clientPacketLength = var0.length; // L: 32 - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); // L: 33 - } else if (var2.clientPacketLength == -2) { // L: 34 - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); // L: 35 - } else if (var2.clientPacketLength <= 98) { // L: 36 - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); // L: 37 - } - - var2.packetBuffer.setIsaacCipher(var1); // L: 38 - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39 - var2.index = 0; // L: 40 - return var2; // L: 41 - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "(Lef;IIII)Z", - garbageValue = "1577408669" - ) - static final boolean method498(Model var0, int var1, int var2, int var3) { - boolean var4 = ViewportMouse.ViewportMouse_isInViewport; // L: 112 - if (!var4) { // L: 114 - return false; - } else { - int var5; - int var6; - int var7; - int var8; - int var11; - int var12; - int var13; - int var16; - int var17; - if (!ViewportMouse.ViewportMouse_false0) { // L: 116 - var5 = Scene.Scene_cameraPitchSine; // L: 117 - var6 = Scene.Scene_cameraPitchCosine; // L: 118 - var7 = Scene.Scene_cameraYawSine; // L: 119 - var8 = Scene.Scene_cameraYawCosine; // L: 120 - byte var9 = 50; // L: 121 - short var10 = 3500; // L: 122 - var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; // L: 123 - var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; // L: 124 - var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; // L: 125 - int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; // L: 126 - int var15 = Rasterizer3D.method3188(var12, var9, var6, var5); // L: 128 - var16 = Rasterizer3D.method3189(var12, var9, var6, var5); // L: 129 - var12 = var15; // L: 130 - var15 = Rasterizer3D.method3188(var14, var10, var6, var5); // L: 131 - var17 = Rasterizer3D.method3189(var14, var10, var6, var5); // L: 132 - var14 = var15; // L: 133 - var15 = Rasterizer3D.method3186(var11, var16, var8, var7); // L: 134 - var16 = Rasterizer3D.method3187(var11, var16, var8, var7); // L: 135 - var11 = var15; // L: 136 - var15 = Rasterizer3D.method3186(var13, var17, var8, var7); // L: 137 - var17 = Rasterizer3D.method3187(var13, var17, var8, var7); // L: 138 - ViewportMouse.field1757 = (var15 + var11) / 2; // L: 140 - class8.field45 = (var14 + var12) / 2; // L: 141 - class39.field288 = (var16 + var17) / 2; // L: 142 - ViewportMouse.field1758 = (var15 - var11) / 2; // L: 143 - ViewportMouse.field1759 = (var14 - var12) / 2; // L: 144 - class25.field146 = (var17 - var16) / 2; // L: 145 - MusicPatchPcmStream.field2516 = Math.abs(ViewportMouse.field1758); // L: 146 - class7.field35 = Math.abs(ViewportMouse.field1759); // L: 147 - DynamicObject.field1311 = Math.abs(class25.field146); // L: 148 - } - - var5 = var0.xMid + var1; // L: 150 - var6 = var2 + var0.yMid; // L: 151 - var7 = var3 + var0.zMid; // L: 152 - var8 = var0.xMidOffset; // L: 153 - var16 = var0.yMidOffset; // L: 154 - var17 = var0.zMidOffset; // L: 155 - var11 = ViewportMouse.field1757 - var5; // L: 156 - var12 = class8.field45 - var6; // L: 157 - var13 = class39.field288 - var7; // L: 158 - if (Math.abs(var11) > var8 + MusicPatchPcmStream.field2516) { // L: 159 - return false; // L: 160 - } else if (Math.abs(var12) > var16 + class7.field35) { // L: 162 - return false; // L: 163 - } else if (Math.abs(var13) > var17 + DynamicObject.field1311) { // L: 165 - return false; // L: 166 - } else if (Math.abs(var13 * ViewportMouse.field1759 - var12 * class25.field146) > var16 * DynamicObject.field1311 + var17 * class7.field35) { // L: 168 - return false; // L: 169 - } else if (Math.abs(var11 * class25.field146 - var13 * ViewportMouse.field1758) > var8 * DynamicObject.field1311 + var17 * MusicPatchPcmStream.field2516) { // L: 171 - return false; // L: 172 - } else { - return Math.abs(var12 * ViewportMouse.field1758 - var11 * ViewportMouse.field1759) <= var8 * class7.field35 + var16 * MusicPatchPcmStream.field2516; // L: 174 - } - } - } - - @ObfuscatedName("kv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1984621095" - ) - static void method496(int var0) { - Client.oculusOrbState = var0; // L: 11620 - } // L: 11621 + } // L: 128 } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 38047647bd..fdff4c6eac 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,10 +2,10 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fa") +@ObfuscatedName("gm") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; // L: 9 } // L: 10 - @ObfuscatedName("n") + @ObfuscatedName("f") @Export("get") abstract Object get(); - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index b23bc9b726..c3dd11f8ec 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,19 +1,209 @@ +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("n") -public interface class0 { +@ObfuscatedName("f") +public class class0 extends class14 { + @ObfuscatedName("rd") + @ObfuscatedGetter( + intValue = 1748086525 + ) + static int field6; + @ObfuscatedName("p") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkx;B)V", - garbageValue = "-41" + descriptor = "Lbn;" ) - void vmethod48(Object var1, Buffer var2); - - @ObfuscatedName("v") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("bp") + static String field4; + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "(Lkx;I)Ljava/lang/Object;", - garbageValue = "1678106953" + descriptor = "Lig;" ) - Object vmethod45(Buffer var1); + @Export("archive17") + static Archive archive17; + @ObfuscatedName("fm") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -962316939 + ) + int field0; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 1307131140437744357L + ) + long field2; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class0(class2 var1) { + this.this$0 = var1; // L: 307 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field0 = var1.readInt(); // L: 310 + this.field2 = var1.readLong(); // L: 311 + } // L: 312 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method157(this.field0, this.field2); // L: 315 + } // L: 316 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([I[II)V", + garbageValue = "-1322537982" + ) + public static void method12(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + UserComparator3.ByteArrayPool_alternativeSizes = var0; // L: 25 + class221.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 + ScriptFrame.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 + + for (int var2 = 0; var2 < UserComparator3.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 + ScriptFrame.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 + } + + } else { + UserComparator3.ByteArrayPool_alternativeSizes = null; + class221.ByteArrayPool_altSizeArrayCounts = null; // L: 21 + ScriptFrame.ByteArrayPool_arrays = null; // L: 22 + } + } // L: 23 31 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;ZB)[B", + garbageValue = "69" + ) + public static byte[] method11(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 ? ScriptFrame.method1175(var3) : var3; // L: 11 + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 14 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 15 + return var2.get(); // L: 16 + } else { + throw new IllegalArgumentException(); // L: 18 + } + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;I)V", + garbageValue = "1509718075" + ) + public static void method13(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 19 + } // L: 20 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-2075885468" + ) + static int method10(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2000 + class16.Interpreter_intStackSize -= 2; // L: 2001 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2002 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2003 + EnumComposition var10 = class159.getEnum(var3); // L: 2004 + if (var10.outputType != 's') { // L: 2005 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2006 + if (var9 == var10.keys[var6]) { // L: 2007 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2008 + var10 = null; // L: 2009 + break; + } + } + + if (var10 != null) { // L: 2013 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 2014 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 2016 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2042 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2043 + EnumComposition var4 = class159.getEnum(var3); // L: 2044 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.size(); // L: 2045 + return 1; // L: 2046 + } else { + return 2; // L: 2048 + } + } else { + class16.Interpreter_intStackSize -= 4; // L: 2017 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2018 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2019 + int var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2020 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 2021 + EnumComposition var7 = class159.getEnum(var5); // L: 2022 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2023 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2028 + if (var6 == var7.keys[var8]) { // L: 2029 + if (var9 == 115) { // L: 2030 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2031 + } + + var7 = null; // L: 2032 + break; + } + } + + if (var7 != null) { // L: 2036 + if (var9 == 115) { // L: 2037 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2038 + } + } + + return 1; // L: 2040 + } else { + if (var9 == 115) { // L: 2024 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2025 + } + + return 1; // L: 2026 + } + } + } } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index d5aad294bc..6d89070c18 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,85 +1,225 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Iterator; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("v") -final class class1 implements class0 { - @ObfuscatedName("v") - @Export("localPlayerName") - public static String localPlayerName; - @ObfuscatedName("z") - static byte[][][] field1; - @ObfuscatedName("av") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - @ObfuscatedName("bj") - @Export("otp") - static String otp; - @ObfuscatedName("ex") - static int[] field5; - +@ObfuscatedName("o") +public class class1 extends class14 { @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkx;B)V", - garbageValue = "-41" + @ObfuscatedGetter( + intValue = -1229554835 ) - public void vmethod48(Object var1, Buffer var2) { - this.method6((Integer)var1, var2); // L: 20 - } // L: 21 + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1803634055 + ) + int field11; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1796954451 + ) + int field9; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1821011721 + ) + int field14; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -193244971 + ) + int field10; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkx;I)Ljava/lang/Object;", - garbageValue = "1678106953" + descriptor = "(Lu;)V" ) - public Object vmethod45(Buffer var1) { - return var1.readInt(); // L: 16 + class1(class2 var1) { + this.this$0 = var1; // L: 289 } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lkx;B)V", - garbageValue = "127" + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" ) - void method6(Integer var1, Buffer var2) { - var2.writeInt(var1); // L: 12 - } + void vmethod371(Buffer var1) { + this.field11 = var1.readInt(); // L: 292 + this.field10 = var1.readInt(); // L: 293 + this.field9 = var1.readUnsignedByte(); // L: 294 + this.field14 = var1.readUnsignedByte(); // L: 295 + } // L: 296 - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)[Liu;", - garbageValue = "1202436859" + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" ) - public static GameBuild[] method16() { - return new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.LIVE, GameBuild.RC, GameBuild.WIP}; // L: 13 - } + void vmethod376(class11 var1) { + var1.method156(this.field11, this.field10, this.field9, this.field14); // L: 299 + } // L: 300 - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-116" + descriptor = "(Lnu;II)V", + garbageValue = "1928874463" ) - @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 + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 129 + var2.size = var0.readUnsignedByte(); // L: 130 + var2.id = var0.readInt(); // L: 131 + var2.operations = new int[var2.size]; // L: 132 + var2.creationErrors = new int[var2.size]; // L: 133 + var2.fields = new Field[var2.size]; // L: 134 + var2.intReplaceValues = new int[var2.size]; // L: 135 + var2.methods = new Method[var2.size]; // L: 136 + var2.arguments = new byte[var2.size][][]; // L: 137 - for (int var5 = 0; var5 < 4; ++var5) { // L: 68 - if (World.World_sortOption1[var5] != var0) { // L: 69 - var2[var4] = World.World_sortOption1[var5]; // L: 70 - var3[var4] = World.World_sortOption2[var5]; // L: 71 - ++var4; // L: 72 + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 138 + try { + int var4 = var0.readUnsignedByte(); // L: 140 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 141 + if (var4 == 3 || var4 == 4) { // L: 151 + var5 = var0.readStringCp1252NullTerminated(); // L: 152 + var6 = var0.readStringCp1252NullTerminated(); // L: 153 + var7 = var0.readUnsignedByte(); // L: 154 + String[] var8 = new String[var7]; // L: 155 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 156 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 157 + byte[][] var10 = new byte[var7][]; // L: 158 + int var12; + if (var4 == 3) { // L: 159 + for (int var11 = 0; var11 < var7; ++var11) { // L: 160 + var12 = var0.readInt(); // L: 161 + var10[var11] = new byte[var12]; // L: 162 + var0.readBytes(var10[var11], 0, var12); // L: 163 + } + } + + var2.operations[var3] = var4; // L: 166 + Class[] var21 = new Class[var7]; // L: 167 + + for (var12 = 0; var12 < var7; ++var12) { // L: 168 + var21[var12] = FileSystem.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = FileSystem.loadClassFromDescriptor(var20); // L: 169 + if (FileSystem.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 170 + throw new SecurityException(); + } + + Method[] var13 = FileSystem.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 171 + Method[] var14 = var13; // L: 173 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 174 + Method var16 = var14[var15]; // L: 175 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 177 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 178 + if (var17.length == var21.length) { // L: 179 + boolean var18 = true; // L: 180 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 181 + if (var17[var19] != var21[var19]) { // L: 182 + var18 = false; // L: 183 + break; // L: 184 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 187 + var2.methods[var3] = var16; // L: 188 + } + } + } + } + + var2.arguments[var3] = var10; // L: 195 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 142 + var6 = var0.readStringCp1252NullTerminated(); // L: 143 + var7 = 0; // L: 144 + if (var4 == 1) { // L: 145 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 146 + var2.intReplaceValues[var3] = var7; // L: 147 + if (FileSystem.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 148 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(FileSystem.loadClassFromDescriptor(var5), var6); // L: 149 + } + } catch (ClassNotFoundException var24) { // L: 198 + var2.creationErrors[var3] = -1; // L: 199 + } catch (SecurityException var25) { // L: 201 + var2.creationErrors[var3] = -2; // L: 202 + } catch (NullPointerException var26) { // L: 204 + var2.creationErrors[var3] = -3; // L: 205 + } catch (Exception var27) { // L: 207 + var2.creationErrors[var3] = -4; // L: 208 + } catch (Throwable var28) { // L: 210 + var2.creationErrors[var3] = -5; // L: 211 } } - World.World_sortOption1 = var2; // L: 75 - World.World_sortOption2 = var3; // L: 76 - class206.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 - } // L: 78 + class69.reflectionChecks.addFirst(var2); // L: 214 + } // L: 215 + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1851920597" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 11485 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 11486 + var1.clearIsFromIgnored(); // L: 11488 + } + + if (InterfaceParent.clanChat != null) { // L: 11492 + InterfaceParent.clanChat.invalidateIgnoreds(); // L: 11493 + } + + } // L: 11495 + + @ObfuscatedName("la") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1189472309" + ) + static String method24(String var0) { + PlayerType[] var1 = WallDecoration.PlayerType_values(); // L: 11720 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11721 + PlayerType var3 = var1[var2]; // L: 11722 + if (var3.modIcon != -1 && var0.startsWith(class337.method5986(var3.modIcon))) { // L: 11724 11725 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11726 + break; + } + } + + return var0; // L: 11733 + } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 0ff75aaf04..73a8ae64d5 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -1,35 +1,97 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") -public class class10 { - @ObfuscatedName("n") - final int field60; - @ObfuscatedName("v") - final int field61; - @ObfuscatedName("d") - final String field62; +@ObfuscatedName("l") +public class class10 extends class14 { + @ObfuscatedName("ah") + @Export("client") + @ObfuscatedSignature( + descriptor = "Lclient;" + ) + static Client client; + @ObfuscatedName("dt") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1376783639 + ) + int field72; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; @ObfuscatedSignature( - descriptor = "(Lkx;)V" + descriptor = "(Lu;)V" ) - class10(Buffer var1) { - this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 - } // L: 20 + class10(class2 var1) { + this.this$0 = var1; + this.field72 = -1; // L: 213 + } // L: 215 - class10(int var1, int var2, String var3) { - this.field60 = var1; // L: 13 - this.field61 = var2; // L: 14 - this.field62 = var3; // L: 15 - } // L: 16 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field72 = var1.readUnsignedShort(); // L: 218 + } // L: 219 - @ObfuscatedName("n") - String method115() { - return Integer.toHexString(this.field60) + Integer.toHexString(this.field61) + this.field62; // L: 23 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method180(this.field72); // L: 222 + } // L: 223 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-1498407424" + ) + static int method136(int var0, int var1) { + FloorOverlayDefinition var2 = Login.method1968(var0); // L: 15 + if (var2 == null) { // L: 16 + return var1; // L: 17 + } else if (var2.secondaryRgb >= 0) { // L: 19 + return var2.secondaryRgb | -16777216; // L: 20 + } else { + int var3; + if (var2.texture >= 0) { // L: 22 + var3 = Players.method2285(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96); // L: 23 + return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; // L: 24 + } else if (var2.primaryRgb == 16711935) { // L: 26 + return var1; // L: 27 + } else { + var3 = WallDecoration.method3808(var2.hue, var2.saturation, var2.lightness); // L: 30 + int var4 = Players.method2285(var3, 96); // L: 31 + return Rasterizer3D.Rasterizer3D_colorPalette[var4] | -16777216; // L: 32 + } + } } - @ObfuscatedName("v") - int method111() { - return this.field61; // L: 27 + @ObfuscatedName("b") + public static boolean method137(long var0) { + return (int)(var0 >>> 16 & 1L) == 1; // L: 69 } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "86" + ) + static void method129() { + Login.loginIndex = 24; // L: 1391 + class9.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1392 + } // L: 1393 } diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index 890f59cb3b..7f2d9611d5 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -1,167 +1,86 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("dm") public class class105 { - @ObfuscatedName("n") + @ObfuscatedName("tp") @ObfuscatedSignature( - descriptor = "Ljv;" + descriptor = "Ljf;" ) - @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("c") - @Export("SpriteBuffer_xOffsets") - public static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("e") - public static short[][] field1339; + public static class263 field1331; + @ObfuscatedName("ge") + @ObfuscatedGetter( + intValue = -674832797 + ) + static int field1327; - static { - reflectionChecks = new IterableNodeDeque(); // L: 17 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;Lme;I)Lme;", + garbageValue = "1158705779" + ) + @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("hq") - @ObfuscatedSignature( - descriptor = "(ZLkd;I)V", - garbageValue = "1935543269" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; // L: 4978 - int var2; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { // L: 4979 - var2 = var1.method5728(); // L: 4980 - int var3 = var1.method5727(); // L: 4981 - var4 = var1.readUnsignedShort(); // L: 4982 - Bounds.xteaKeys = new int[var4][4]; // L: 4983 - - for (var5 = 0; var5 < var4; ++var5) { // L: 4984 - for (var6 = 0; var6 < 4; ++var6) { // L: 4985 - Bounds.xteaKeys[var5][var6] = var1.readInt(); // L: 4986 - } - } - - class238.regions = new int[var4]; // L: 4989 - class92.regionMapArchiveIds = new int[var4]; // L: 4990 - MusicPatchNode2.regionLandArchiveIds = new int[var4]; // L: 4991 - class2.regionLandArchives = new byte[var4][]; // L: 4992 - Interpreter.regionMapArchives = new byte[var4][]; // L: 4993 - boolean var16 = false; // L: 4994 - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 4995 - var16 = true; - } - - if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 4996 - var16 = true; - } - - var4 = 0; // L: 4997 - - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 4998 - for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 4999 - var8 = var7 + (var6 << 8); // L: 5000 - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5001 - class238.regions[var4] = var8; // L: 5002 - class92.regionMapArchiveIds[var4] = class8.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5003 - MusicPatchNode2.regionLandArchiveIds[var4] = class8.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5004 - ++var4; // L: 5005 - } - } - } - - PcmPlayer.method2661(var3, var2, true); // L: 5008 - } else { - var2 = var1.method5729(); // L: 5011 - boolean var15 = var1.method5776() == 1; // L: 5012 - var4 = var1.method5727(); // L: 5013 - var5 = var1.readUnsignedShort(); // L: 5014 - var1.importIndex(); // L: 5015 - - int var9; - for (var6 = 0; var6 < 4; ++var6) { // L: 5016 - for (var7 = 0; var7 < 13; ++var7) { // L: 5017 - for (var8 = 0; var8 < 13; ++var8) { // L: 5018 - var9 = var1.readBits(1); // L: 5019 - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5020 - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5021 - } - } - } - } - - var1.exportIndex(); // L: 5025 - Bounds.xteaKeys = new int[var5][4]; // L: 5026 - - for (var6 = 0; var6 < var5; ++var6) { // L: 5027 - for (var7 = 0; var7 < 4; ++var7) { // L: 5028 - Bounds.xteaKeys[var6][var7] = var1.readInt(); // L: 5029 - } - } - - class238.regions = new int[var5]; // L: 5032 - class92.regionMapArchiveIds = new int[var5]; // L: 5033 - MusicPatchNode2.regionLandArchiveIds = new int[var5]; // L: 5034 - class2.regionLandArchives = new byte[var5][]; // L: 5035 - Interpreter.regionMapArchives = new byte[var5][]; // L: 5036 - var5 = 0; // L: 5037 - - for (var6 = 0; var6 < 4; ++var6) { // L: 5038 - for (var7 = 0; var7 < 13; ++var7) { // L: 5039 - for (var8 = 0; var8 < 13; ++var8) { // L: 5040 - var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5041 - if (var9 != -1) { // L: 5042 - int var10 = var9 >> 14 & 1023; // L: 5043 - int var11 = var9 >> 3 & 2047; // L: 5044 - int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5045 - - int var13; - for (var13 = 0; var13 < var5; ++var13) { // L: 5046 - if (class238.regions[var13] == var12) { - var12 = -1; // L: 5047 - break; - } - } - - if (var12 != -1) { // L: 5050 - class238.regions[var5] = var12; // L: 5051 - var13 = var12 >> 8 & 255; // L: 5052 - int var14 = var12 & 255; // L: 5053 - class92.regionMapArchiveIds[var5] = class8.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5054 - MusicPatchNode2.regionLandArchiveIds[var5] = class8.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5055 - ++var5; // L: 5056 - } - } - } - } - } - - PcmPlayer.method2661(var4, var2, !var15); // L: 5062 - } - - } // L: 5064 - - @ObfuscatedName("kk") + @ObfuscatedName("jx") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1205267134" + garbageValue = "1281510950" ) - static final void method2448() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11427 - Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11428 - var1.clearIsFriend(); // L: 11429 + static void method2255() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11041 + int var1 = var0.group; // L: 11042 + if (class15.loadInterface(var1)) { // L: 11043 + boolean var2 = true; // L: 11044 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 11045 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 11046 + if (var3[var4] != null) { // L: 11047 + var2 = var3[var4].isIf3; // L: 11048 + break; + } + } + + if (!var2) { // L: 11052 + var4 = (int)var0.key; // L: 11053 + Widget var5 = class139.getWidget(var4); // L: 11054 + if (var5 != null) { // L: 11055 + class29.invalidateWidget(var5); + } + } + } } - RouteStrategy.method3795(); // L: 11431 - if (WorldMapID.clanChat != null) { // L: 11432 - WorldMapID.clanChat.clearFriends(); // L: 11433 - } - - } // L: 11435 + } // L: 11059 } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index b7fb5aeef7..9b0a851f1c 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,5 +1,1096 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("b") -public interface class11 { +@ObfuscatedName("m") +public class class11 { + @ObfuscatedName("er") + @ObfuscatedGetter( + intValue = 278389515 + ) + static int field108; + @ObfuscatedName("gi") + @Export("regions") + static int[] regions; + @ObfuscatedName("lk") + @ObfuscatedGetter( + intValue = 1521848179 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("nk") + @ObfuscatedGetter( + intValue = 883989245 + ) + static int field106; + @ObfuscatedName("o") + boolean field77; + @ObfuscatedName("u") + boolean field104; + @ObfuscatedName("p") + @ObfuscatedGetter( + longValue = 4921630429052482837L + ) + long field79; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1752668535 + ) + int field80; + @ObfuscatedName("e") + public String field81; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 1200113713 + ) + int field82; + @ObfuscatedName("g") + public boolean field90; + @ObfuscatedName("h") + public byte field84; + @ObfuscatedName("n") + public byte field83; + @ObfuscatedName("l") + public byte field86; + @ObfuscatedName("m") + public byte field87; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 2068831427 + ) + public int field88; + @ObfuscatedName("c") + long[] field89; + @ObfuscatedName("j") + public byte[] field76; + @ObfuscatedName("r") + int[] field91; + @ObfuscatedName("q") + int[] field92; + @ObfuscatedName("t") + public int[] field94; + @ObfuscatedName("v") + public boolean[] field78; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -813326745 + ) + public int field100; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1955278431 + ) + public int field96; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1976456997 + ) + public int field97; + @ObfuscatedName("a") + long[] field107; + @ObfuscatedName("w") + public String[] field99; + @ObfuscatedName("s") + public String[] field105; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lme;" + ) + IterableNodeHashTable field95; + + @ObfuscatedSignature( + descriptor = "(Lnu;)V" + ) + public class11(Buffer var1) { + this.field80 = 0; // L: 14 + this.field81 = null; // L: 15 + this.field82 = 0; + this.field100 = -1; // L: 29 + this.field96 = -1; + this.method181(var1); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1055386571" + ) + void method140(int var1) { + if (this.field77) { // L: 47 + if (this.field89 != null) { + System.arraycopy(this.field89, 0, this.field89 = new long[var1], 0, this.field88); + } else { + this.field89 = new long[var1]; + } + } + + if (this.field104) { + if (this.field99 != null) { // L: 52 + System.arraycopy(this.field99, 0, this.field99 = new String[var1], 0, this.field88); + } else { + this.field99 = new String[var1]; + } + } + + if (this.field76 != null) { + System.arraycopy(this.field76, 0, this.field76 = new byte[var1], 0, this.field88); + } else { + this.field76 = new byte[var1]; + } + + if (this.field92 != null) { + System.arraycopy(this.field92, 0, this.field92 = new int[var1], 0, this.field88); + } else { + this.field92 = new int[var1]; // L: 58 + } + + if (this.field94 != null) { + System.arraycopy(this.field94, 0, this.field94 = new int[var1], 0, this.field88); + } else { + this.field94 = new int[var1]; + } + + if (this.field78 != null) { + System.arraycopy(this.field78, 0, this.field78 = new boolean[var1], 0, this.field88); + } else { + this.field78 = new boolean[var1]; + } + + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "13" + ) + void method175(int var1) { + if (this.field77) { // L: 66 + if (this.field107 != null) { + System.arraycopy(this.field107, 0, this.field107 = new long[var1], 0, this.field97); + } else { + this.field107 = new long[var1]; + } + } + + if (this.field104) { + if (this.field105 != null) { + System.arraycopy(this.field105, 0, this.field105 = new String[var1], 0, this.field97); + } else { + this.field105 = new String[var1]; + } + } + + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-933779475" + ) + public int method142(String var1) { + if (var1 != null && var1.length() != 0) { + for (int var2 = 0; var2 < this.field88; ++var2) { + if (this.field99[var2].equals(var1)) { + return var2; + } + } + + return -1; + } else { + return -1; + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "2138892447" + ) + public int method143(int var1, int var2, int var3) { + int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; + return (this.field92[var1] & var4) >>> var2; + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IS)Ljava/lang/Integer;", + garbageValue = "-30268" + ) + public Integer method144(int var1) { + if (this.field95 == null) { + return null; + } else { + Node var2 = this.field95.get((long)var1); // L: 91 + return var2 != null && var2 instanceof IntegerNode ? new Integer(((IntegerNode)var2).integer) : null; + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)[I", + garbageValue = "645088980" + ) + public int[] method159() { + if (this.field91 == null) { + String[] var1 = new String[this.field88]; + this.field91 = new int[this.field88]; + + for (int var2 = 0; var2 < this.field88; this.field91[var2] = var2++) { + var1[var2] = this.field99[var2]; + if (var1[var2] != null) { + var1[var2] = var1[var2].toLowerCase(); + } + } + + int[] var3 = this.field91; + GrandExchangeOffer.method4633(var1, var3, 0, var1.length - 1); + } + + return this.field91; + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;IB)V", + garbageValue = "-16" + ) + void method146(long var1, String var3, int var4) { + if (var3 != null && var3.length() == 0) { + var3 = null; + } + + if (var1 > 0L != this.field77) { + throw new RuntimeException(""); + } else if (var3 != null != this.field104) { + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.field89 == null || this.field88 >= this.field89.length) || var3 != null && (this.field99 == null || this.field88 >= this.field99.length)) { + this.method140(this.field88 + 5); + } + + if (this.field89 != null) { // L: 118 + this.field89[this.field88] = var1; + } + + if (this.field99 != null) { + this.field99[this.field88] = var3; + } + + if (this.field100 == -1) { + this.field100 = this.field88; + this.field76[this.field88] = 126; + } else { + this.field76[this.field88] = 0; + } + + this.field92[this.field88] = 0; // L: 127 + this.field94[this.field88] = var4; + this.field78[this.field88] = false; + ++this.field88; + this.field91 = null; + } + } // L: 132 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-48" + ) + void method147(int var1) { + if (var1 >= 0 && var1 < this.field88) { // L: 135 + --this.field88; // L: 136 + this.field91 = null; + if (this.field88 == 0) { + this.field89 = null; + this.field99 = null; // L: 140 + this.field76 = null; + this.field92 = null; + this.field94 = null; + this.field78 = null; + this.field100 = -1; + this.field96 = -1; + } else { + System.arraycopy(this.field76, var1 + 1, this.field76, var1, this.field88 - var1); // L: 149 + System.arraycopy(this.field92, var1 + 1, this.field92, var1, this.field88 - var1); + System.arraycopy(this.field94, var1 + 1, this.field94, var1, this.field88 - var1); + System.arraycopy(this.field78, var1 + 1, this.field78, var1, this.field88 - var1); + if (this.field89 != null) { + System.arraycopy(this.field89, var1 + 1, this.field89, var1, this.field88 - var1); + } + + if (this.field99 != null) { // L: 154 + System.arraycopy(this.field99, var1 + 1, this.field99, var1, this.field88 - var1); + } + + this.method164(); // L: 155 + } + + } else { + throw new RuntimeException(""); + } + } // L: 157 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + void method164() { + if (this.field88 == 0) { + this.field100 = -1; + this.field96 = -1; // L: 162 + } else { + this.field100 = -1; + this.field96 = -1; + int var1 = 0; + byte var2 = this.field76[0]; + + for (int var3 = 1; var3 < this.field88; ++var3) { + if (this.field76[var3] > var2) { // L: 170 + if (var2 == 125) { // L: 171 + this.field96 = var1; + } + + var1 = var3; + var2 = this.field76[var3]; + } else if (this.field96 == -1 && this.field76[var3] == 125) { // L: 175 + this.field96 = var3; + } + } + + this.field100 = var1; // L: 179 + if (this.field100 != -1) { // L: 180 + this.field76[this.field100] = 126; + } + + } + } // L: 181 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;I)V", + garbageValue = "2100738609" + ) + void method188(long var1, String var3) { + if (var3 != null && var3.length() == 0) { // L: 184 + var3 = null; + } + + if (var1 > 0L != this.field77) { // L: 185 + throw new RuntimeException(""); + } else if (this.field104 != (var3 != null)) { // L: 186 + throw new RuntimeException(""); + } else { + if (var1 > 0L && (this.field107 == null || this.field97 >= this.field107.length) || var3 != null && (this.field105 == null || this.field97 >= this.field105.length)) { // L: 187 + this.method175(this.field97 + 5); + } + + if (this.field107 != null) { // L: 188 + this.field107[this.field97] = var1; + } + + if (this.field105 != null) { + this.field105[this.field97] = var3; + } + + ++this.field97; // L: 190 + } + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-123" + ) + void method180(int var1) { + --this.field97; // L: 194 + if (this.field97 == 0) { // L: 195 + this.field107 = null; // L: 196 + this.field105 = null; // L: 197 + } else { + if (this.field107 != null) { // L: 200 + System.arraycopy(this.field107, var1 + 1, this.field107, var1, this.field97 - var1); + } + + if (this.field105 != null) { + System.arraycopy(this.field105, var1 + 1, this.field105, var1, this.field97 - var1); // L: 201 + } + } + + } // L: 203 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(IBB)I", + garbageValue = "-51" + ) + int method151(int var1, byte var2) { + if (var2 != 126 && var2 != 127) { // L: 206 + if (this.field100 == var1 && (this.field96 == -1 || this.field76[this.field96] < 125)) { // L: 207 + return -1; + } else if (this.field76[var1] == var2) { // L: 208 + return -1; + } else { + this.field76[var1] = var2; // L: 209 + this.method164(); // L: 210 + return var1; // L: 211 + } + } else { + return -1; + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-243833615" + ) + boolean method190(int var1) { + if (this.field100 != var1 && this.field76[var1] != 126) { // L: 215 + this.field76[this.field100] = 125; // L: 216 + this.field96 = this.field100; // L: 217 + this.field76[var1] = 126; // L: 218 + this.field100 = var1; // L: 219 + return true; // L: 220 + } else { + return false; + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IZI)I", + garbageValue = "-1814028575" + ) + int method153(int var1, boolean var2) { + if (this.field78[var1] == var2) { // L: 224 + return -1; + } else { + this.field78[var1] = var2; // L: 225 + return var1; // L: 226 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIII)I", + garbageValue = "-110007630" + ) + int method154(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 230 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231 + int var7 = var6 ^ var5; // L: 232 + var2 <<= var3; // L: 233 + var2 &= var7; // L: 234 + int var8 = this.field92[var1]; // L: 235 + if ((var8 & var7) == var2) { + return -1; // L: 236 + } else { + var8 &= ~var7; // L: 237 + this.field92[var1] = var8 | var2; // L: 238 + return var1; // L: 239 + } + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-418167741" + ) + boolean method178(int var1, int var2) { + if (this.field95 != null) { // L: 243 + Node var3 = this.field95.get((long)var1); // L: 244 + if (var3 != null) { // L: 245 + if (var3 instanceof IntegerNode) { // L: 246 + IntegerNode var4 = (IntegerNode)var3; // L: 247 + if (var2 == var4.integer) { // L: 248 + return false; + } + + var4.integer = var2; // L: 249 + return true; // L: 250 + } + + var3.remove(); // L: 252 + } + } else { + this.field95 = new IterableNodeHashTable(4); // L: 255 + } + + this.field95.put(new IntegerNode(var2), (long)var1); // L: 256 + return true; // L: 257 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(IIIIB)Z", + garbageValue = "92" + ) + boolean method156(int var1, int var2, int var3, int var4) { + int var5 = (1 << var3) - 1; // L: 261 + int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262 + int var7 = var6 ^ var5; // L: 263 + var2 <<= var3; // L: 264 + var2 &= var7; // L: 265 + if (this.field95 != null) { // L: 266 + Node var8 = this.field95.get((long)var1); // L: 267 + if (var8 != null) { // L: 268 + if (var8 instanceof IntegerNode) { // L: 269 + IntegerNode var9 = (IntegerNode)var8; // L: 270 + if ((var9.integer & var7) == var2) { // L: 271 + return false; + } + + var9.integer &= ~var7; // L: 272 + var9.integer |= var2; // L: 273 + return true; // L: 274 + } + + var8.remove(); // L: 276 + } + } else { + this.field95 = new IterableNodeHashTable(4); // L: 279 + } + + this.field95.put(new IntegerNode(var2), (long)var1); // L: 280 + return true; // L: 281 + } + + @ObfuscatedName("t") + boolean method157(int var1, long var2) { + if (this.field95 != null) { // L: 285 + Node var4 = this.field95.get((long)var1); // L: 286 + if (var4 != null) { // L: 287 + if (var4 instanceof class348) { // L: 288 + class348 var5 = (class348)var4; // L: 289 + if (var5.field3938 == var2) { // L: 290 + return false; + } + + var5.field3938 = var2; // L: 291 + return true; // L: 292 + } + + var4.remove(); // L: 294 + } + } else { + this.field95 = new IterableNodeHashTable(4); // L: 297 + } + + this.field95.put(new class348(var2), (long)var1); // L: 298 + return true; // L: 299 + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)Z", + garbageValue = "-222016163" + ) + boolean method158(int var1, String var2) { + if (var2 == null) { // L: 303 + var2 = ""; + } else if (var2.length() > 80) { // L: 304 + var2 = var2.substring(0, 80); + } + + if (this.field95 != null) { // L: 305 + Node var3 = this.field95.get((long)var1); // L: 306 + if (var3 != null) { // L: 307 + if (var3 instanceof ObjectNode) { // L: 308 + ObjectNode var4 = (ObjectNode)var3; // L: 309 + if (var4.obj instanceof String) { // L: 310 + if (var2.equals(var4.obj)) { // L: 311 + return false; + } + + var4.remove(); // L: 312 + this.field95.put(new ObjectNode(var2), var4.key); // L: 313 + return true; // L: 314 + } + } + + var3.remove(); // L: 317 + } + } else { + this.field95 = new IterableNodeHashTable(4); // L: 320 + } + + this.field95.put(new ObjectNode(var2), (long)var1); // L: 321 + return true; // L: 322 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "495563881" + ) + void method181(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 326 + if (var2 >= 1 && var2 <= 6) { // L: 327 + int var3 = var1.readUnsignedByte(); // L: 328 + if ((var3 & 1) != 0) { // L: 329 + this.field77 = true; + } + + if ((var3 & 2) != 0) { // L: 330 + this.field104 = true; + } + + if (!this.field77) { // L: 331 + this.field89 = null; // L: 332 + this.field107 = null; // L: 333 + } + + if (!this.field104) { // L: 335 + this.field99 = null; // L: 336 + this.field105 = null; // L: 337 + } + + this.field80 = var1.readInt(); // L: 339 + this.field82 = var1.readInt(); // L: 340 + if (var2 <= 3 && this.field82 != 0) { // L: 341 + this.field82 += 16912800; + } + + this.field88 = var1.readUnsignedShort(); // L: 342 + this.field97 = var1.readUnsignedByte(); // L: 343 + this.field81 = var1.readStringCp1252NullTerminated(); // L: 344 + if (var2 >= 4) { // L: 345 + var1.readInt(); // L: 346 + } + + this.field90 = var1.readUnsignedByte() == 1; // L: 348 + this.field84 = var1.readByte(); // L: 349 + this.field83 = var1.readByte(); // L: 350 + this.field86 = var1.readByte(); // L: 351 + this.field87 = var1.readByte(); // L: 352 + int var4; + if (this.field88 > 0) { // L: 353 + if (this.field77 && (this.field89 == null || this.field89.length < this.field88)) { // L: 354 + this.field89 = new long[this.field88]; + } + + if (this.field104 && (this.field99 == null || this.field99.length < this.field88)) { // L: 355 + this.field99 = new String[this.field88]; + } + + if (this.field76 == null || this.field76.length < this.field88) { // L: 356 + this.field76 = new byte[this.field88]; + } + + if (this.field92 == null || this.field92.length < this.field88) { // L: 357 + this.field92 = new int[this.field88]; + } + + if (this.field94 == null || this.field94.length < this.field88) { // L: 358 + this.field94 = new int[this.field88]; + } + + if (this.field78 == null || this.field78.length < this.field88) { // L: 359 + this.field78 = new boolean[this.field88]; + } + + for (var4 = 0; var4 < this.field88; ++var4) { // L: 360 + if (this.field77) { // L: 361 + this.field89[var4] = var1.readLong(); + } + + if (this.field104) { // L: 362 + this.field99[var4] = var1.readStringCp1252NullTerminatedOrNull(); + } + + this.field76[var4] = var1.readByte(); // L: 363 + if (var2 >= 2) { // L: 364 + this.field92[var4] = var1.readInt(); + } + + if (var2 >= 5) { // L: 365 + this.field94[var4] = var1.readUnsignedShort(); + } else { + this.field94[var4] = 0; // L: 366 + } + + if (var2 >= 6) { // L: 367 + this.field78[var4] = var1.readUnsignedByte() == 1; + } else { + this.field78[var4] = false; // L: 368 + } + } + + this.method164(); // L: 370 + } + + if (this.field97 > 0) { // L: 372 + if (this.field77 && (this.field107 == null || this.field107.length < this.field97)) { // L: 373 + this.field107 = new long[this.field97]; + } + + if (this.field104 && (this.field105 == null || this.field105.length < this.field97)) { // L: 374 + this.field105 = new String[this.field97]; + } + + for (var4 = 0; var4 < this.field97; ++var4) { // L: 375 + if (this.field77) { // L: 376 + this.field107[var4] = var1.readLong(); + } + + if (this.field104) { // L: 377 + this.field105[var4] = var1.readStringCp1252NullTerminatedOrNull(); + } + } + } + + if (var2 >= 3) { // L: 380 + var4 = var1.readUnsignedShort(); // L: 381 + if (var4 > 0) { // L: 382 + int var5; + int var6; + int var7; + if (var4 < 16) { // L: 384 + var7 = var4 - 1; // L: 388 + var7 |= var7 >>> 1; // L: 389 + var7 |= var7 >>> 2; // L: 390 + var7 |= var7 >>> 4; // L: 391 + var7 |= var7 >>> 8; // L: 392 + var7 |= var7 >>> 16; // L: 393 + var6 = var7 + 1; // L: 394 + var5 = var6; // L: 396 + } else { + var5 = 16; // L: 398 + } + + this.field95 = new IterableNodeHashTable(var5); // L: 399 + + while (var4-- > 0) { // L: 400 + var6 = var1.readInt(); // L: 401 + var7 = var6 & 1073741823; // L: 402 + int var8 = var6 >>> 30; // L: 403 + if (var8 == 0) { // L: 404 + int var13 = var1.readInt(); // L: 405 + this.field95.put(new IntegerNode(var13), (long)var7); // L: 406 + } else if (var8 == 1) { // L: 408 + long var11 = var1.readLong(); // L: 409 + this.field95.put(new class348(var11), (long)var7); // L: 410 + } else if (var8 == 2) { // L: 412 + String var9 = var1.readStringCp1252NullTerminated(); // L: 413 + this.field95.put(new ObjectNode(var9), (long)var7); // L: 414 + } + } + } + } + + } else { + throw new RuntimeException("" + var2); + } + } // L: 419 + + @ObfuscatedName("f") + public static String method196(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 + if (var0 % 37L == 0L) { // L: 17 + return null; + } else { + int var2 = 0; // L: 18 + + for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 19 20 22 + ++var2; // L: 21 + } + + StringBuilder var5 = new StringBuilder(var2); // L: 24 + + while (0L != var0) { // L: 25 + long var6 = var0; // L: 26 + var0 /= 37L; // L: 27 + var5.append(class304.base37Table[(int)(var6 - 37L * var0)]); // L: 28 + } + + return var5.reverse().toString(); // L: 30 + } + } else { + return null; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnk;B)V", + garbageValue = "37" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 31 + if (var1 != null) { // L: 32 + int var2 = var0.offset; // L: 33 + var0.writeInt(var1.id); // L: 34 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 35 + if (var1.creationErrors[var3] != 0) { // L: 36 + var0.writeByte(var1.creationErrors[var3]); // L: 37 + } else { + try { + int var4 = var1.operations[var3]; // L: 41 + Field var5; + int var6; + if (var4 == 0) { // L: 42 + var5 = var1.fields[var3]; // L: 43 + var6 = Reflection.getInt(var5, (Object)null); // L: 44 + var0.writeByte(0); // L: 45 + var0.writeInt(var6); // L: 46 + } else if (var4 == 1) { // L: 48 + var5 = var1.fields[var3]; // L: 49 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 50 + var0.writeByte(0); // L: 51 + } else if (var4 == 2) { // L: 53 + var5 = var1.fields[var3]; // L: 54 + var6 = var5.getModifiers(); // L: 55 + var0.writeByte(0); // L: 56 + var0.writeInt(var6); // L: 57 + } + + Method var25; + if (var4 != 3) { // L: 59 + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); // L: 82 + var0.writeInt(var6); // L: 83 + } + } else { + var25 = var1.methods[var3]; // L: 60 + byte[][] var10 = var1.arguments[var3]; // L: 61 + Object[] var7 = new Object[var10.length]; // L: 62 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 63 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 64 + var7[var8] = var9.readObject(); // L: 65 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 67 + if (var11 == null) { // L: 68 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 69 + var0.writeByte(1); // L: 70 + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { // L: 73 + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { // L: 89 + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { // L: 92 + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); // L: 96 + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { // L: 104 + var0.writeByte(-16); // L: 105 + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { // L: 110 + var0.writeByte(-18); // L: 111 + } catch (NullPointerException var22) { // L: 113 + var0.writeByte(-19); // L: 114 + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } + } + + var0.writeCrc(var2); + var1.remove(); + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnk;II)V", + garbageValue = "-1263790804" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + int var3 = 0; // L: 74 + var0.importIndex(); // L: 75 + + byte[] var10000; + int var4; + int var6; + int var7; + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 + var7 = Players.Players_indices[var4]; // L: 77 + if ((Players.field1350[var7] & 1) == 0) { // L: 78 + if (var3 > 0) { // L: 79 + --var3; // L: 80 + var10000 = Players.field1350; // L: 81 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 84 + if (var6 == 0) { // L: 85 + var3 = class264.method4680(var0); // L: 86 + var10000 = Players.field1350; // L: 87 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + MenuAction.readPlayerUpdate(var0, var7); // L: 90 + } + } + } + } + + var0.exportIndex(); // L: 93 + if (var3 != 0) { // L: 94 + throw new RuntimeException(); // L: 95 + } else { + var0.importIndex(); // L: 97 + + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 + var7 = Players.Players_indices[var4]; // L: 99 + if ((Players.field1350[var7] & 1) != 0) { // L: 100 + if (var3 > 0) { // L: 101 + --var3; // L: 102 + var10000 = Players.field1350; // L: 103 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 106 + if (var6 == 0) { // L: 107 + var3 = class264.method4680(var0); // L: 108 + var10000 = Players.field1350; // L: 109 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + MenuAction.readPlayerUpdate(var0, var7); // L: 112 + } + } + } + } + + var0.exportIndex(); // L: 115 + if (var3 != 0) { // L: 116 + throw new RuntimeException(); // L: 117 + } else { + var0.importIndex(); // L: 119 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 + var7 = Players.Players_emptyIndices[var4]; // L: 121 + if ((Players.field1350[var7] & 1) != 0) { // L: 122 + if (var3 > 0) { // L: 123 + --var3; // L: 124 + var10000 = Players.field1350; // L: 125 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 128 + if (var6 == 0) { // L: 129 + var3 = class264.method4680(var0); // L: 130 + var10000 = Players.field1350; // L: 131 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (WorldMapDecoration.updateExternalPlayer(var0, var7)) { // L: 134 + var10000 = Players.field1350; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 137 + if (var3 != 0) { // L: 138 + throw new RuntimeException(); // L: 139 + } else { + var0.importIndex(); // L: 141 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 + var7 = Players.Players_emptyIndices[var4]; // L: 143 + if ((Players.field1350[var7] & 1) == 0) { // L: 144 + if (var3 > 0) { // L: 145 + --var3; // L: 146 + var10000 = Players.field1350; // L: 147 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 150 + if (var6 == 0) { // L: 151 + var3 = class264.method4680(var0); // L: 152 + var10000 = Players.field1350; // L: 153 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (WorldMapDecoration.updateExternalPlayer(var0, var7)) { // L: 156 + var10000 = Players.field1350; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 159 + if (var3 != 0) { // L: 160 + throw new RuntimeException(); // L: 161 + } else { + Players.Players_count = 0; // L: 163 + Players.Players_emptyIdxCount = 0; // L: 164 + + for (var4 = 1; var4 < 2048; ++var4) { // L: 165 + var10000 = Players.field1350; // L: 166 + var10000[var4] = (byte)(var10000[var4] >> 1); + Player var5 = Client.players[var4]; // L: 167 + if (var5 != null) { // L: 168 + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 + } + } + + PcmPlayer.method857(var0); // L: 172 + if (var0.offset - var2 != var1) { // L: 173 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 174 + } + } + } + } + } + } // L: 176 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "80" + ) + static final void method205(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 189 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your friend list first").toString(); + class69.addGameMessage(30, "", var1); // L: 191 + } // L: 193 + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Lhu;B)Ljava/lang/String;", + garbageValue = "-44" + ) + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (class223.Widget_unpackTargetMask(DirectByteArrayCopier.getWidgetFlags(var0)) == 0) { // L: 11599 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11600 11601 11603 + } + } } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 72646a06f5..04ebacc54e 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,11 +1,327 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") -public interface class12 { - @ObfuscatedName("n") +@ObfuscatedName("d") +public class class12 extends class16 { + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "(Lkx;)Lkx;" + descriptor = "Lig;" ) - Buffer vmethod120(Buffer var1); + @Export("archive7") + static Archive archive7; + @ObfuscatedName("f") + String field111; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1521537625 + ) + int field110; + @ObfuscatedName("u") + byte field109; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lx;" + ) + final class19 this$0; + + @ObfuscatedSignature( + descriptor = "(Lx;)V" + ) + class12(class19 var1) { + this.this$0 = var1; + this.field111 = null; // L: 54 + } // L: 58 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1239860939" + ) + void vmethod356(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 61 + --var1.offset; // L: 62 + var1.readLong(); // L: 63 + } + + this.field111 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65 + this.field110 = var1.readUnsignedShort(); // L: 66 + this.field109 = var1.readByte(); // L: 67 + var1.readLong(); // L: 68 + } // L: 69 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1583378087" + ) + void vmethod352(class3 var1) { + class9 var2 = new class9(); // L: 72 + var2.field65 = this.field111; // L: 73 + var2.field64 = this.field110; // L: 74 + var2.field66 = this.field109; // L: 75 + var1.method61(var2); // L: 76 + } // L: 77 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ZZI)Low;", + garbageValue = "-430901660" + ) + static IndexedSprite method213(boolean var0, boolean var1) { + return var0 ? (var1 ? VarcInt.field3429 : Skeleton.options_buttons_2Sprite) : (var1 ? UrlRequester.field1400 : TileItem.options_buttons_0Sprite); // L: 183 + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-1693166177" + ) + static int method209(int var0, Script var1, boolean var2) { + if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4167 + if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4171 + if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4175 + if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4179 + if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4183 + if (var0 != 7031 && var0 != 7032) { // L: 4187 + if (var0 == 7033) { // L: 4192 + --Interpreter.Interpreter_stringStackSize; // L: 4193 + return 1; // L: 4194 + } else if (var0 != 7036 && var0 != 7037) { // L: 4196 + if (var0 == 7038) { // L: 4200 + --class16.Interpreter_intStackSize; // L: 4201 + return 1; // L: 4202 + } else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4204 + return 2; // L: 4208 + } else { + --class16.Interpreter_intStackSize; // L: 4205 + return 1; // L: 4206 + } + } else { + class16.Interpreter_intStackSize -= 2; // L: 4197 + return 1; // L: 4198 + } + } else { + --Interpreter.Interpreter_stringStackSize; // L: 4188 + --class16.Interpreter_intStackSize; // L: 4189 + return 1; // L: 4190 + } + } else { + --class16.Interpreter_intStackSize; // L: 4184 + return 1; // L: 4185 + } + } else { + class16.Interpreter_intStackSize -= 2; // L: 4180 + return 1; // L: 4181 + } + } else { + class16.Interpreter_intStackSize -= 2; // L: 4176 + return 1; // L: 4177 + } + } else { + class16.Interpreter_intStackSize -= 3; // L: 4172 + return 1; // L: 4173 + } + } else { + class16.Interpreter_intStackSize -= 5; // L: 4168 + return 1; // L: 4169 + } + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "(Lhu;IIB)V", + garbageValue = "1" + ) + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 10208 + SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10209 + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10212 + var3 = class11.Widget_getSpellActionName(var0); // L: 10213 + if (var3 != null) { // L: 10214 + SpriteMask.insertMenuItemNoShift(var3, DefaultsGroup.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10215 + } + } + + if (var0.buttonType == 3) { // L: 10219 + SpriteMask.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10220 + } + + if (var0.buttonType == 4) { // L: 10223 + SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10224 + } + + if (var0.buttonType == 5) { // L: 10227 + SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10228 + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10231 + SpriteMask.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10232 + } + + int var4; + int var6; + int var7; + int var15; + if (var0.type == 2) { // L: 10235 + var15 = 0; // L: 10236 + + for (var4 = 0; var4 < var0.height; ++var4) { // L: 10237 + for (int var17 = 0; var17 < var0.width; ++var17) { // L: 10238 + var6 = (var0.paddingX + 32) * var17; // L: 10239 + var7 = (var0.paddingY + 32) * var4; // L: 10240 + if (var15 < 20) { // L: 10241 + var6 += var0.inventoryXOffsets[var15]; // L: 10242 + var7 += var0.inventoryYOffsets[var15]; // L: 10243 + } + + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 10245 + Client.dragItemSlotDestination = var15; // L: 10246 + ScriptFrame.hoveredItemContainer = var0; // L: 10247 + if (var0.itemIds[var15] > 0) { // L: 10248 + ItemComposition var8 = class23.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 10249 + if (Client.isItemSelected == 1 && class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10250 + if (var0.id != UserComparator6.selectedItemWidget || var15 != class208.selectedItemSlot) { // L: 10251 + SpriteMask.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 10252 + } + } else if (Client.isSpellSelected && class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10256 + if ((UserComparator10.selectedSpellFlags & 16) == 16) { // L: 10257 + SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + DefaultsGroup.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); // L: 10258 + } + } else { + String[] var9 = var8.inventoryActions; // L: 10263 + int var10 = -1; // L: 10264 + boolean var11; + if (Client.shiftClickDrop) { // L: 10265 + var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10268 + if (var11) { // L: 10270 + var10 = var8.getShiftClickIndex(); // L: 10271 + } + } + + if (class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10274 + for (int var20 = 4; var20 >= 3; --var20) { // L: 10275 + if (var10 != var20) { // L: 10276 + World.addWidgetItemMenuItem(var0, var8, var15, var20, false); // L: 10277 + } + } + } + + int var12 = DirectByteArrayCopier.getWidgetFlags(var0); // L: 10281 + var11 = (var12 >> 31 & 1) != 0; // L: 10283 + if (var11) { // L: 10285 + SpriteMask.insertMenuItemNoShift("Use", DefaultsGroup.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); // L: 10286 + } + + Object var10000 = null; // L: 10289 + int var13; + if (class221.method4200(DirectByteArrayCopier.getWidgetFlags(var0))) { + for (var13 = 2; var13 >= 0; --var13) { // L: 10290 + if (var10 != var13) { // L: 10291 + World.addWidgetItemMenuItem(var0, var8, var15, var13, false); // L: 10292 + } + } + + if (var10 >= 0) { // L: 10294 + World.addWidgetItemMenuItem(var0, var8, var15, var10, true); // L: 10295 + } + } + + var9 = var0.itemActions; // L: 10298 + if (var9 != null) { // L: 10299 + for (var13 = 4; var13 >= 0; --var13) { // L: 10300 + if (var9[var13] != null) { // L: 10301 + byte var14 = 0; // L: 10302 + if (var13 == 0) { // L: 10303 + var14 = 39; + } + + if (var13 == 1) { // L: 10304 + var14 = 40; + } + + if (var13 == 2) { // L: 10305 + var14 = 41; + } + + if (var13 == 3) { // L: 10306 + var14 = 42; + } + + if (var13 == 4) { // L: 10307 + var14 = 43; + } + + SpriteMask.insertMenuItemNoShift(var9[var13], DefaultsGroup.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); // L: 10308 + } + } + } + + SpriteMask.insertMenuItemNoShift("Examine", DefaultsGroup.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); // L: 10313 + } + } + } + + ++var15; // L: 10318 + } + } + } + + if (var0.isIf3) { // L: 10322 + if (Client.isSpellSelected) { // L: 10323 + if (class223.method4239(DirectByteArrayCopier.getWidgetFlags(var0)) && (UserComparator10.selectedSpellFlags & 32) == 32) { // L: 10324 + SpriteMask.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10325 + } + } else { + for (var15 = 9; var15 >= 5; --var15) { // L: 10330 + var6 = DirectByteArrayCopier.getWidgetFlags(var0); // L: 10334 + boolean var21 = (var6 >> var15 + 1 & 1) != 0; // L: 10336 + String var18; + if (!var21 && var0.onOp == null) { // L: 10338 + var18 = null; // L: 10339 + } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { // L: 10342 + var18 = var0.actions[var15]; // L: 10346 + } else { + var18 = null; // L: 10343 + } + + if (var18 != null) { // L: 10349 + SpriteMask.insertMenuItemNoShift(var18, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); // L: 10350 + } + } + + var3 = class11.Widget_getSpellActionName(var0); // L: 10354 + if (var3 != null) { // L: 10355 + SpriteMask.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10356 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 10359 + var7 = DirectByteArrayCopier.getWidgetFlags(var0); // L: 10363 + boolean var19 = (var7 >> var4 + 1 & 1) != 0; // L: 10365 + String var5; + if (!var19 && var0.onOp == null) { // L: 10367 + var5 = null; // L: 10368 + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10371 + var5 = var0.actions[var4]; // L: 10375 + } else { + var5 = null; // L: 10372 + } + + if (var5 != null) { // L: 10378 + AbstractByteArrayCopier.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10379 + } + } + + if (WorldMapEvent.method3267(DirectByteArrayCopier.getWidgetFlags(var0))) { // L: 10383 + SpriteMask.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10384 + } + } + } + + } // L: 10389 } diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java new file mode 100644 index 0000000000..51316ef059 --- /dev/null +++ b/runescape-client/src/main/java/class123.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("dk") +public interface class123 { +} diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java new file mode 100644 index 0000000000..ab8b5bf15b --- /dev/null +++ b/runescape-client/src/main/java/class124.java @@ -0,0 +1,74 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("df") +public class class124 implements class123 { + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1858583893 + ) + @Export("SpriteBuffer_spriteCount") + static int SpriteBuffer_spriteCount; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1284583399" + ) + public static int method2490() { + return ViewportMouse.ViewportMouse_entityCount; // L: 44 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "2146818180" + ) + public static int method2489(int var0, int var1) { + return (-3 - var0 << 8) + var1; // L: 17 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(CLjh;B)I", + garbageValue = "3" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 104 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105 + var0 = Character.toLowerCase(var0); // L: 106 + var2 = (var0 << 4) + 1; // L: 107 + } + + if (var0 == 241 && var1 == Language.Language_ES) { // L: 109 + var2 = 1762; + } + + return var2; // L: 110 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lir;Ljava/lang/String;Ljava/lang/String;I)[Loh;", + garbageValue = "-64813696" + ) + public static SpritePixels[] method2492(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 176 + int var4 = var0.getFileId(var3, var2); // L: 177 + return class337.method5985(var0, var3, var4); // L: 178 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1303478774" + ) + static final void method2488() { + Object var10000 = null; // L: 118 + String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + class69.addGameMessage(30, "", var0); // L: 120 + } // L: 122 +} diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java new file mode 100644 index 0000000000..4c72abe22f --- /dev/null +++ b/runescape-client/src/main/java/class125.java @@ -0,0 +1,61 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("dx") +public enum class125 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ldx;" + ) + field1459(1, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ldx;" + ) + field1456(0, 1), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ldx;" + ) + field1458(2, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Ldx;" + ) + field1457(3, 3); + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Low;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1286472181 + ) + public final int field1460; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1985750631 + ) + @Export("id") + final int id; + + class125(int var3, int var4) { + this.field1460 = var3; // L: 16 + this.id = var4; // L: 17 + } // L: 18 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 21 + } +} diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 01297ab912..8549aca763 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,343 +1,102 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") -public final class class13 { - @ObfuscatedName("ho") +@ObfuscatedName("c") +public class class13 extends class14 { + @ObfuscatedName("si") @ObfuscatedSignature( - descriptor = "[Llm;" + descriptor = "Lbl;" ) - @Export("headIconHintSprites") - static SpritePixels[] headIconHintSprites; - - @ObfuscatedName("ga") + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "1434868681" + descriptor = "[Low;" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; // L: 3970 - World.method1925(); // L: 3971 - if (Client.renderSelf) { // L: 3973 - WorldMapScaleHandler.addPlayerToScene(UserComparator9.localPlayer, false); // L: 3974 + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 5109296971613093853L + ) + long field119; + @ObfuscatedName("o") + String field116; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class13(class2 var1) { + this.this$0 = var1; + this.field119 = -1L; // L: 194 + this.field116 = null; // L: 195 + } // L: 197 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 200 + --var1.offset; // L: 201 + this.field119 = var1.readLong(); // L: 202 } - RouteStrategy.method3794(); // L: 3977 - GameEngine.addNpcsToScene(true); // L: 3978 - int var4 = Players.Players_count; // L: 3980 - int[] var5 = Players.Players_indices; // L: 3981 + this.field116 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204 + } // L: 205 - int var6; - for (var6 = 0; var6 < var4; ++var6) { // L: 3982 - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 3983 - WorldMapScaleHandler.addPlayerToScene(Client.players[var5[var6]], true); // L: 3984 - } - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method188(this.field119, this.field116); // L: 208 + } // L: 209 - GameEngine.addNpcsToScene(false); // L: 3987 - Decimator.method2708(); // L: 3988 - DevicePcmPlayerProvider.method920(); // L: 3989 - MenuAction.setViewportShape(var0, var1, var2, var3, true); // L: 3990 - var0 = Client.viewportOffsetX; // L: 3991 - var1 = Client.viewportOffsetY; // L: 3992 - var2 = Client.viewportWidth; // L: 3993 - var3 = Client.viewportHeight; // L: 3994 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 3995 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 3996 - int var7; - int var8; - int var11; - int var28; - if (!Client.isCameraLocked) { // L: 3997 - var4 = Client.camAngleX; // L: 3998 - if (Client.field880 / 256 > var4) { // L: 3999 - var4 = Client.field880 / 256; - } - - if (Client.field907[4] && Client.field909[4] + 128 > var4) { // L: 4000 - var4 = Client.field909[4] + 128; - } - - var28 = Client.camAngleY & 2047; // L: 4001 - var6 = HealthBarUpdate.oculusOrbFocalPointX; // L: 4002 - var7 = ModelData0.field1882; // L: 4003 - var8 = ApproximateRouteStrategy.oculusOrbFocalPointY; // L: 4004 - var11 = var4 * 3 + 600; // L: 4009 - class258.method4685(var6, var7, var8, var4, var28, var11, var3); // L: 4011 - } - - if (!Client.isCameraLocked) { // L: 4014 - var4 = AbstractWorldMapIcon.method712(); + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(Lhu;I)Lhu;", + garbageValue = "1854915849" + ) + static Widget method220(Widget var0) { + Widget var2 = var0; // L: 11063 + int var3 = AbstractWorldMapData.method3079(DirectByteArrayCopier.getWidgetFlags(var0)); // L: 11065 + Widget var1; + if (var3 == 0) { // L: 11066 + var1 = null; // L: 11067 } else { - var4 = class171.method3639(); // L: 4015 - } + int var4 = 0; - var28 = SecureRandomFuture.cameraX; // L: 4016 - var6 = ArchiveLoader.cameraY; // L: 4017 - var7 = ObjectSound.cameraZ; // L: 4018 - var8 = KeyHandler.cameraPitch; // L: 4019 - int var9 = class39.cameraYaw; // L: 4020 - - int var10; - for (var10 = 0; var10 < 5; ++var10) { // L: 4021 - if (Client.field907[var10]) { // L: 4022 - var11 = (int)(Math.random() * (double)(Client.field908[var10] * 2 + 1) - (double)Client.field908[var10] + Math.sin((double)Client.field799[var10] / 100.0D * (double)Client.field911[var10]) * (double)Client.field909[var10]); // L: 4023 - if (var10 == 0) { // L: 4024 - SecureRandomFuture.cameraX += var11; + while (true) { + if (var4 >= var3) { + var1 = var2; // L: 11077 + break; } - if (var10 == 1) { - ArchiveLoader.cameraY += var11; // L: 4025 + var2 = class139.getWidget(var2.parentId); // L: 11071 + if (var2 == null) { // L: 11072 + var1 = null; // L: 11073 + break; // L: 11074 } - if (var10 == 2) { // L: 4026 - ObjectSound.cameraZ += var11; - } - - if (var10 == 3) { // L: 4027 - class39.cameraYaw = var11 + class39.cameraYaw & 2047; - } - - if (var10 == 4) { // L: 4028 - KeyHandler.cameraPitch += var11; // L: 4029 - if (KeyHandler.cameraPitch < 128) { // L: 4030 - KeyHandler.cameraPitch = 128; - } - - if (KeyHandler.cameraPitch > 383) { // L: 4031 - KeyHandler.cameraPitch = 383; - } - } + ++var4; // L: 11070 } } - var10 = MouseHandler.MouseHandler_x; // L: 4035 - var11 = MouseHandler.MouseHandler_y; // L: 4036 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4037 - var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4038 - var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4039 + Widget var5 = var1; // L: 11079 + if (var1 == null) { // L: 11080 + var5 = var0.parent; } - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4041 - GrandExchangeOfferWorldComparator.method137(var10 - var0, var11 - var1); // L: 4042 - } else { - ViewportMouse.ViewportMouse_isInViewport = false; // L: 4046 - ViewportMouse.ViewportMouse_entityCount = 0; // L: 4047 - } - - UserComparator5.playPcmPlayers(); // L: 4050 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4051 - UserComparator5.playPcmPlayers(); // L: 4052 - int var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4053 - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4054 - MilliClock.scene.draw(SecureRandomFuture.cameraX, ArchiveLoader.cameraY, ObjectSound.cameraZ, KeyHandler.cameraPitch, class39.cameraYaw, var4); // L: 4055 - Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4056 - UserComparator5.playPcmPlayers(); // L: 4057 - MilliClock.scene.clearTempGameObjects(); // L: 4058 - Client.overheadTextCount = 0; // L: 4060 - boolean var13 = false; // L: 4061 - int var14 = -1; // L: 4062 - int var15 = -1; // L: 4063 - int var16 = Players.Players_count; // L: 4064 - int[] var17 = Players.Players_indices; // L: 4065 - - int var18; - for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { // L: 4066 - Object var30; - if (var18 < var16) { // L: 4068 - var30 = Client.players[var17[var18]]; // L: 4069 - if (var17[var18] == Client.combatTargetPlayerIndex) { // L: 4070 - var13 = true; // L: 4071 - var14 = var18; // L: 4072 - continue; - } - - if (var30 == UserComparator9.localPlayer) { // L: 4075 - var15 = var18; // L: 4076 - continue; // L: 4077 - } - } else { - var30 = Client.npcs[Client.npcIndices[var18 - var16]]; // L: 4080 - } - - UserComparator5.drawActor2d((Actor)var30, var18, var0, var1, var2, var3); // L: 4081 - } - - if (Client.renderSelf && var15 != -1) { // L: 4083 - UserComparator5.drawActor2d(UserComparator9.localPlayer, var15, var0, var1, var2, var3); // L: 4084 - } - - if (var13) { // L: 4086 - UserComparator5.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); // L: 4087 - } - - for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { // L: 4089 - int var19 = Client.overheadTextXs[var18]; // L: 4090 - int var20 = Client.overheadTextYs[var18]; // L: 4091 - int var21 = Client.overheadTextXOffsets[var18]; // L: 4092 - int var22 = Client.overheadTextAscents[var18]; // L: 4093 - boolean var23 = true; // L: 4094 - - while (var23) { - var23 = false; // L: 4096 - - for (int var29 = 0; var29 < var18; ++var29) { // L: 4097 - if (var20 + 2 > Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] && var20 - var22 < Client.overheadTextYs[var29] + 2 && var19 - var21 < Client.overheadTextXs[var29] + Client.overheadTextXOffsets[var29] && var21 + var19 > Client.overheadTextXs[var29] - Client.overheadTextXOffsets[var29] && Client.overheadTextYs[var29] - Client.overheadTextAscents[var29] < var20) { // L: 4098 4099 - var20 = Client.overheadTextYs[var29] - Client.overheadTextAscents[var29]; // L: 4100 - var23 = true; // L: 4101 - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var18]; // L: 4106 - Client.viewportTempY = Client.overheadTextYs[var18] = var20; // L: 4107 - String var24 = Client.overheadText[var18]; // L: 4108 - if (Client.chatEffects == 0) { // L: 4109 - int var25 = 16776960; // L: 4110 - if (Client.overheadTextColors[var18] < 6) { // L: 4111 - var25 = Client.field879[Client.overheadTextColors[var18]]; - } - - if (Client.overheadTextColors[var18] == 6) { // L: 4112 - var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var18] == 7) { // L: 4113 - var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var18] == 8) { // L: 4114 - var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var26; - if (Client.overheadTextColors[var18] == 9) { // L: 4115 - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4116 - if (var26 < 50) { // L: 4117 - var25 = var26 * 1280 + 16711680; - } else if (var26 < 100) { // L: 4118 - var25 = 16776960 - (var26 - 50) * 327680; - } else if (var26 < 150) { // L: 4119 - var25 = (var26 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var18] == 10) { // L: 4121 - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4122 - if (var26 < 50) { // L: 4123 - var25 = var26 * 5 + 16711680; - } else if (var26 < 100) { // L: 4124 - var25 = 16711935 - (var26 - 50) * 327680; - } else if (var26 < 150) { // L: 4125 - var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; - } - } - - if (Client.overheadTextColors[var18] == 11) { // L: 4127 - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4128 - if (var26 < 50) { // L: 4129 - var25 = 16777215 - var26 * 327685; - } else if (var26 < 100) { // L: 4130 - var25 = (var26 - 50) * 327685 + 65280; - } else if (var26 < 150) { // L: 4131 - var25 = 16777215 - (var26 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var18] == 0) { // L: 4133 - ScriptEvent.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); - } - - if (Client.overheadTextEffects[var18] == 1) { // L: 4134 - ScriptEvent.fontBold12.drawCenteredWave(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 2) { // L: 4135 - ScriptEvent.fontBold12.drawCenteredWave2(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 3) { // L: 4136 - ScriptEvent.fontBold12.drawCenteredShake(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); - } - - if (Client.overheadTextEffects[var18] == 4) { // L: 4137 - var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (ScriptEvent.fontBold12.stringWidth(var24) + 100) / 150; // L: 4138 - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4139 - ScriptEvent.fontBold12.draw(var24, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); // L: 4140 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4141 - } - - if (Client.overheadTextEffects[var18] == 5) { // L: 4143 - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; // L: 4144 - int var27 = 0; // L: 4145 - if (var26 < 25) { // L: 4146 - var27 = var26 - 25; - } else if (var26 > 125) { // L: 4147 - var27 = var26 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - ScriptEvent.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4148 - ScriptEvent.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); // L: 4149 - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4150 - } - } else { - ScriptEvent.fontBold12.drawCentered(var24, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4154 - } - } - - if (Client.hintArrowType == 2) { // L: 4159 - ParamComposition.worldToScreen((Client.hintArrowX - GrandExchangeOfferNameComparator.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - NetCache.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4160 - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4161 - headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field808); // L: 4163 - WorldMapSectionType.method318(var0, var1, var2, var3); // L: 4164 - SecureRandomFuture.cameraX = var28; // L: 4165 - ArchiveLoader.cameraY = var6; // L: 4166 - ObjectSound.cameraZ = var7; // L: 4167 - KeyHandler.cameraPitch = var8; // L: 4168 - class39.cameraYaw = var9; // L: 4169 - if (Client.isLoading) { // L: 4170 - byte var31 = 0; // L: 4173 - var14 = var31 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4174 - if (var14 == 0) { // L: 4178 - Client.isLoading = false; - } - } - - if (Client.isLoading) { // L: 4180 - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4181 - WorldMapIcon_1.drawLoadingMessage("Loading - please wait.", false); // L: 4182 - } - - } // L: 4184 - - @ObfuscatedName("lx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1775407691" - ) - static void method122() { - if (Client.field747 && UserComparator9.localPlayer != null) { // L: 11630 - int var0 = UserComparator9.localPlayer.pathX[0]; // L: 11631 - int var1 = UserComparator9.localPlayer.pathY[0]; // L: 11632 - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11633 - return; - } - - HealthBarUpdate.oculusOrbFocalPointX = UserComparator9.localPlayer.x; // L: 11634 - int var2 = WorldMapRegion.getTileHeight(UserComparator9.localPlayer.x, UserComparator9.localPlayer.y, class90.Client_plane) - Client.camFollowHeight; // L: 11635 - if (var2 < ModelData0.field1882) { // L: 11636 - ModelData0.field1882 = var2; - } - - ApproximateRouteStrategy.oculusOrbFocalPointY = UserComparator9.localPlayer.y; // L: 11637 - Client.field747 = false; // L: 11638 - } - - } // L: 11640 + return var5; // L: 11081 + } } diff --git a/runescape-client/src/main/java/class137.java b/runescape-client/src/main/java/class137.java new file mode 100644 index 0000000000..3e191d050c --- /dev/null +++ b/runescape-client/src/main/java/class137.java @@ -0,0 +1,235 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eg") +public class class137 { + @ObfuscatedName("u") + @Export("directions") + public static int[][] directions; + @ObfuscatedName("p") + @Export("distances") + public static int[][] distances; + @ObfuscatedName("g") + @Export("bufferX") + public static int[] bufferX; + @ObfuscatedName("h") + @Export("bufferY") + public static int[] bufferY; + + static { + directions = new int[128][128]; // L: 6 + distances = new int[128][128]; // L: 7 + bufferX = new int[4096]; // L: 11 + bufferY = new int[4096]; // L: 12 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-2142993463" + ) + public static int method2654(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 + } + + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "(Lcd;II)V", + garbageValue = "391699616" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + if (var0.field1255 >= Client.cycle) { // L: 3299 + class26.method367(var0); + } else if (var0.field1268 >= Client.cycle) { // L: 3300 + WorldMapData_1.method2990(var0); + } else { + class22.method330(var0); // L: 3301 + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3302 + var0.sequence = -1; // L: 3303 + var0.spotAnimation = -1; // L: 3304 + var0.field1255 = 0; // L: 3305 + var0.field1268 = 0; // L: 3306 + var0.x = var0.pathX[0] * 128 + var0.field1258 * 64; // L: 3307 + var0.y = var0.field1258 * 64 + var0.pathY[0] * 128; // L: 3308 + var0.method2157(); // L: 3309 + } + + if (Varcs.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3311 3312 + var0.sequence = -1; // L: 3313 + var0.spotAnimation = -1; // L: 3314 + var0.field1255 = 0; // L: 3315 + var0.field1268 = 0; // L: 3316 + var0.x = var0.field1258 * 64 + var0.pathX[0] * 128; // L: 3317 + var0.y = var0.field1258 * 64 + var0.pathY[0] * 128; // L: 3318 + var0.method2157(); // L: 3319 + } + + int var5; + if (var0.field1262 != 0) { // L: 3323 + if (var0.targetIndex != -1) { // L: 3324 + Object var2 = null; // L: 3325 + if (var0.targetIndex < 32768) { // L: 3326 + var2 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 3327 + var2 = Client.players[var0.targetIndex - 32768]; + } + + if (var2 != null) { // L: 3328 + int var3 = var0.x - ((Actor)var2).x; // L: 3329 + int var4 = var0.y - ((Actor)var2).y; // L: 3330 + if (var3 != 0 || var4 != 0) { // L: 3331 + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 3333 + var0.targetIndex = -1; // L: 3334 + var0.false0 = false; // L: 3335 + } + } + + if (var0.field1237 != -1 && (var0.pathLength == 0 || var0.field1267 > 0)) { // L: 3338 + var0.orientation = var0.field1237; // L: 3339 + var0.field1237 = -1; // L: 3340 + } + + var5 = var0.orientation - var0.rotation & 2047; // L: 3342 + if (var5 == 0 && var0.false0) { // L: 3343 + var0.targetIndex = -1; // L: 3344 + var0.false0 = false; // L: 3345 + } + + if (var5 != 0) { // L: 3347 + ++var0.field1261; // L: 3348 + boolean var8; + if (var5 > 1024) { // L: 3349 + var0.rotation -= var0.field1262; // L: 3350 + var8 = true; // L: 3351 + if (var5 < var0.field1262 || var5 > 2048 - var0.field1262) { // L: 3352 + var0.rotation = var0.orientation; // L: 3353 + var8 = false; // L: 3354 + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1261 > 25 || var8)) { // L: 3356 + if (var0.turnLeftSequence != -1) { // L: 3357 + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3358 + } + } + } else { + var0.rotation += var0.field1262; // L: 3362 + var8 = true; // L: 3363 + if (var5 < var0.field1262 || var5 > 2048 - var0.field1262) { // L: 3364 + var0.rotation = var0.orientation; // L: 3365 + var8 = false; // L: 3366 + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1261 > 25 || var8)) { // L: 3368 + if (var0.turnRightSequence != -1) { // L: 3369 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3370 + } + } + } + + var0.rotation &= 2047; // L: 3374 + } else { + var0.field1261 = 0; // L: 3376 + } + } + + var0.isWalking = false; // L: 3379 + SequenceDefinition var7; + if (var0.movementSequence != -1) { // L: 3380 + var7 = class225.SequenceDefinition_get(var0.movementSequence); // L: 3381 + if (var7 != null && var7.frameIds != null) { // L: 3382 + ++var0.movementFrameCycle; // L: 3383 + if (var0.movementFrame < var7.frameIds.length && var0.movementFrameCycle > var7.frameLengths[var0.movementFrame]) { // L: 3384 + var0.movementFrameCycle = 1; // L: 3385 + ++var0.movementFrame; // L: 3386 + class232.method4364(var7, var0.movementFrame, var0.x, var0.y); // L: 3387 + } + + if (var0.movementFrame >= var7.frameIds.length) { // L: 3389 + var0.movementFrameCycle = 0; // L: 3390 + var0.movementFrame = 0; // L: 3391 + class232.method4364(var7, var0.movementFrame, var0.x, var0.y); // L: 3392 + } + } else { + var0.movementSequence = -1; // L: 3395 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1249) { // L: 3397 + if (var0.spotAnimationFrame < 0) { // L: 3398 + var0.spotAnimationFrame = 0; + } + + var5 = Varps.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3399 + if (var5 != -1) { // L: 3400 + SequenceDefinition var6 = class225.SequenceDefinition_get(var5); // L: 3401 + if (var6 != null && var6.frameIds != null) { // L: 3402 + ++var0.spotAnimationFrameCycle; // L: 3403 + if (var0.spotAnimationFrame < var6.frameIds.length && var0.spotAnimationFrameCycle > var6.frameLengths[var0.spotAnimationFrame]) { // L: 3404 + var0.spotAnimationFrameCycle = 1; // L: 3405 + ++var0.spotAnimationFrame; // L: 3406 + class232.method4364(var6, var0.spotAnimationFrame, var0.x, var0.y); // L: 3407 + } + + if (var0.spotAnimationFrame >= var6.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var6.frameIds.length)) { // L: 3409 3410 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 3413 + } + } else { + var0.spotAnimation = -1; // L: 3415 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3417 + var7 = class225.SequenceDefinition_get(var0.sequence); // L: 3418 + if (var7.field3722 == 1 && var0.field1224 > 0 && var0.field1255 <= Client.cycle && var0.field1268 < Client.cycle) { // L: 3419 3420 + var0.sequenceDelay = 1; // L: 3421 + return; // L: 3448 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3426 + var7 = class225.SequenceDefinition_get(var0.sequence); // L: 3427 + if (var7 != null && var7.frameIds != null) { // L: 3428 + ++var0.sequenceFrameCycle; // L: 3429 + if (var0.sequenceFrame < var7.frameIds.length && var0.sequenceFrameCycle > var7.frameLengths[var0.sequenceFrame]) { // L: 3430 + var0.sequenceFrameCycle = 1; // L: 3431 + ++var0.sequenceFrame; // L: 3432 + class232.method4364(var7, var0.sequenceFrame, var0.x, var0.y); // L: 3433 + } + + if (var0.sequenceFrame >= var7.frameIds.length) { // L: 3435 + var0.sequenceFrame -= var7.frameCount; // L: 3436 + ++var0.field1245; // L: 3437 + if (var0.field1245 >= var7.field3721) { // L: 3438 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var7.frameIds.length) { // L: 3439 + class232.method4364(var7, var0.sequenceFrame, var0.x, var0.y); // L: 3440 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var7.field3712; // L: 3442 + } else { + var0.sequence = -1; // L: 3444 + } + } + + if (var0.sequenceDelay > 0) { // L: 3446 + --var0.sequenceDelay; + } + + } +} diff --git a/runescape-client/src/main/java/class139.java b/runescape-client/src/main/java/class139.java new file mode 100644 index 0000000000..6669e5a03e --- /dev/null +++ b/runescape-client/src/main/java/class139.java @@ -0,0 +1,52 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("eh") +public class class139 { + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 276144893 + ) + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("ae") + @ObfuscatedGetter( + intValue = -135678653 + ) + static int field1560; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IB)Lhu;", + garbageValue = "83" + ) + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 188 + int var2 = var0 & 65535; // L: 189 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 190 + boolean var3 = class15.loadInterface(var1); // L: 191 + if (!var3) { // L: 192 + return null; + } + } + + return Widget.Widget_interfaceComponents[var1][var2]; // L: 194 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "17" + ) + public static void method2669() { + if (MouseHandler.MouseHandler_instance != null) { // L: 50 + synchronized(MouseHandler.MouseHandler_instance) { // L: 51 + MouseHandler.MouseHandler_instance = null; // L: 52 + } // L: 53 + } + + } // L: 55 +} diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java new file mode 100644 index 0000000000..d496d5e84f --- /dev/null +++ b/runescape-client/src/main/java/class14.java @@ -0,0 +1,218 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("j") +public abstract class class14 extends Node { + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("mapMarkerSprites") + static SpritePixels[] mapMarkerSprites; + + class14() { + } // L: 68 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + abstract void vmethod371(Buffer var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + abstract void vmethod376(class11 var1); + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "([BI)V", + garbageValue = "1423124086" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 + } else { + if (ScriptFrame.ByteArrayPool_arrays != null) { // L: 88 + for (int var1 = 0; var1 < UserComparator3.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 + if (var0.length == UserComparator3.ByteArrayPool_alternativeSizes[var1] && class221.ByteArrayPool_altSizeArrayCounts[var1] < ScriptFrame.ByteArrayPool_arrays[var1].length) { // L: 90 + ScriptFrame.ByteArrayPool_arrays[var1][class221.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 + return; // L: 92 + } + } + } + + } + } // L: 78 82 86 96 + + @ObfuscatedName("fp") + @ObfuscatedSignature( + descriptor = "(Lhu;III)V", + garbageValue = "-326398113" + ) + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3110 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3111 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3112 + if (var3 == null) { // L: 3113 + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3114 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3115 + if (var3.contains(var4, var5)) { // L: 3116 + var4 -= var3.width / 2; // L: 3117 + var5 -= var3.height / 2; // L: 3118 + int var6 = Client.camAngleY & 2047; // L: 3119 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3120 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3121 + int var9 = var4 * var8 + var7 * var5 >> 11; // L: 3122 + int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3123 + int var11 = var9 + Varcs.localPlayer.x >> 7; // L: 3124 + int var12 = Varcs.localPlayer.y - var10 >> 7; // L: 3125 + PacketBufferNode var13 = ObjectComposition.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); // L: 3127 + var13.packetBuffer.writeByte(18); // L: 3128 + var13.packetBuffer.method6771(var12 + Tile.baseY); // L: 3129 + var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3130 + var13.packetBuffer.writeIntME(var11 + ItemLayer.baseX); // L: 3131 + var13.packetBuffer.writeByte(var4); // L: 3132 + var13.packetBuffer.writeByte(var5); // L: 3133 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3134 + var13.packetBuffer.writeByte(57); // L: 3135 + var13.packetBuffer.writeByte(0); // L: 3136 + var13.packetBuffer.writeByte(0); // L: 3137 + var13.packetBuffer.writeByte(89); // L: 3138 + var13.packetBuffer.writeShort(Varcs.localPlayer.x); // L: 3139 + var13.packetBuffer.writeShort(Varcs.localPlayer.y); // L: 3140 + var13.packetBuffer.writeByte(63); // L: 3141 + Client.packetWriter.addNode(var13); // L: 3142 + Client.destinationX = var11; // L: 3143 + Client.destinationY = var12; // L: 3144 + } + } + + } + } // L: 3147 + + @ObfuscatedName("gp") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "8" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4608 + int var3 = UserComparator7.getTileHeight(var0, var1, class26.Client_plane) - var2; // L: 4613 + var0 -= ModeWhere.cameraX; // L: 4614 + var3 -= WorldMapRectangle.cameraY; // L: 4615 + var1 -= ReflectionCheck.cameraZ; // L: 4616 + int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapArea.cameraPitch]; // L: 4617 + int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapArea.cameraPitch]; // L: 4618 + int var6 = Rasterizer3D.Rasterizer3D_sine[class69.cameraYaw]; // L: 4619 + int var7 = Rasterizer3D.Rasterizer3D_cosine[class69.cameraYaw]; // L: 4620 + int var8 = var0 * var7 + var6 * var1 >> 16; // L: 4621 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 4622 + var0 = var8; // L: 4623 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 4624 + var1 = var5 * var1 + var3 * var4 >> 16; // L: 4625 + if (var1 >= 50) { // L: 4627 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 4628 + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 4629 + } else { + Client.viewportTempX = -1; // L: 4632 + Client.viewportTempY = -1; // L: 4633 + } + + } else { + Client.viewportTempX = -1; // L: 4609 + Client.viewportTempY = -1; // L: 4610 + } + } // L: 4611 4635 + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "62" + ) + @Export("createMinimapSprite") + static final void createMinimapSprite(int var0) { + int[] var1 = class19.sceneMinimapSprite.pixels; // L: 5146 + int var2 = var1.length; // L: 5147 + + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 5148 + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 5149 + var4 = (103 - var3) * 2048 + 24628; // L: 5150 + + for (var5 = 1; var5 < 103; ++var5) { // L: 5151 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5152 + WorldMapArea.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5153 + WorldMapArea.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 5154 + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5157 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5158 + class19.sceneMinimapSprite.setRaster(); // L: 5159 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 5160 + for (var6 = 1; var6 < 103; ++var6) { // L: 5161 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5162 + AbstractRasterProvider.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5163 + AbstractRasterProvider.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 5166 + + for (var5 = 0; var5 < 104; ++var5) { // L: 5167 + for (var6 = 0; var6 < 104; ++var6) { // L: 5168 + long var7 = WorldMapArea.scene.getFloorDecorationTag(class26.Client_plane, var5, var6); // L: 5169 + if (var7 != 0L) { // L: 5170 + int var9 = WorldMapSection1.Entity_unpackID(var7); // L: 5171 + int var10 = class19.getObjectDefinition(var9).mapIconId; // L: 5172 + if (var10 >= 0 && ByteArrayPool.WorldMapElement_get(var10).field3412) { // L: 5173 5174 + Client.mapIcons[Client.mapIconCount] = ByteArrayPool.WorldMapElement_get(var10).getSpriteBool(false); // L: 5177 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 5178 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 5179 + ++Client.mapIconCount; // L: 5180 + } + } + } + } + + GameEngine.rasterProvider.apply(); // L: 5185 + } // L: 5186 +} diff --git a/runescape-client/src/main/java/class147.java b/runescape-client/src/main/java/class147.java new file mode 100644 index 0000000000..b1e82e5cbd --- /dev/null +++ b/runescape-client/src/main/java/class147.java @@ -0,0 +1,181 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ev") +public class class147 implements WorldMapSection { + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1280849379 + ) + int field1645; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1221605639 + ) + int field1648; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -641667831 + ) + int field1646; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -810016507 + ) + int field1650; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1487941663 + ) + int field1647; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1266044735 + ) + int field1649; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -474039865 + ) + int field1644; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -104843799 + ) + int field1651; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 774094829 + ) + int field1652; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 2136007461 + ) + int field1653; + + class147() { + } // L: 18 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Leq;I)V", + garbageValue = "-609192354" + ) + @Export("expandBounds") + public void expandBounds(WorldMapArea var1) { + if (var1.regionLowX > this.field1647) { // L: 21 + var1.regionLowX = this.field1647; + } + + if (var1.regionHighX < this.field1647) { + var1.regionHighX = this.field1647; // L: 22 + } + + if (var1.regionLowY > this.field1649) { // L: 23 + var1.regionLowY = this.field1649; + } + + if (var1.regionHighY < this.field1649) { // L: 24 + var1.regionHighY = this.field1649; + } + + } // L: 25 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-2146205978" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field1645 && var1 < this.field1648 + this.field1645) { // L: 28 + return var2 >= (this.field1646 << 6) + (this.field1644 << 3) && var2 <= (this.field1646 << 6) + (this.field1644 << 3) + 7 && var3 >= (this.field1650 << 6) + (this.field1651 << 3) && var3 <= (this.field1650 << 6) + (this.field1651 << 3) + 7; // L: 31 + } else { + return false; // L: 29 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-916390789" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field1647 << 6) + (this.field1652 << 3) && var1 <= (this.field1647 << 6) + (this.field1652 << 3) + 7 && var2 >= (this.field1649 << 6) + (this.field1653 << 3) && var2 <= (this.field1649 << 6) + (this.field1653 << 3) + 7; // L: 35 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "1101045563" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; // L: 40 + } else { + int[] var4 = new int[]{var2 + (this.field1647 * 64 - this.field1646 * 64) + (this.field1652 * 8 - this.field1644 * 8), var3 + (this.field1649 * 64 - this.field1650 * 64) + (this.field1653 * 8 - this.field1651 * 8)}; // L: 42 43 44 + return var4; // L: 45 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)Lhk;", + garbageValue = "1643926479" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 + } else { + int var3 = this.field1646 * 64 - this.field1647 * 64 + (this.field1644 * 8 - this.field1652 * 8) + var1; // L: 52 + int var4 = var2 + (this.field1650 * 64 - this.field1649 * 64) + (this.field1651 * 8 - this.field1653 * 8); // L: 53 + return new Coord(this.field1645, var3, var4); // L: 54 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-576756767" + ) + @Export("read") + public void read(Buffer var1) { + this.field1645 = var1.readUnsignedByte(); // L: 58 + this.field1648 = var1.readUnsignedByte(); // L: 59 + this.field1646 = var1.readUnsignedShort(); // L: 60 + this.field1644 = var1.readUnsignedByte(); // L: 61 + this.field1650 = var1.readUnsignedShort(); // L: 62 + this.field1651 = var1.readUnsignedByte(); // L: 63 + this.field1647 = var1.readUnsignedShort(); // L: 64 + this.field1652 = var1.readUnsignedByte(); // L: 65 + this.field1649 = var1.readUnsignedShort(); // L: 66 + this.field1653 = var1.readUnsignedByte(); // L: 67 + this.method2998(); // L: 68 + } // L: 69 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-65" + ) + void method2998() { + } // L: 71 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;S)V", + garbageValue = "-460" + ) + static final void method3014(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); // L: 125 + class69.addGameMessage(30, "", var1); // L: 127 + } // L: 129 +} diff --git a/runescape-client/src/main/java/class148.java b/runescape-client/src/main/java/class148.java new file mode 100644 index 0000000000..af3adda64f --- /dev/null +++ b/runescape-client/src/main/java/class148.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("er") +public class class148 { + @ObfuscatedName("my") + @ObfuscatedGetter( + intValue = -2100278607 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "366368994" + ) + static final int method3015(int var0, int var1) { + int var2 = GrandExchangeOfferWorldComparator.method4609(var0 + 45365, 91923 + var1, 4) - 128 + (GrandExchangeOfferWorldComparator.method4609(var0 + 10294, var1 + 37821, 2) - 128 >> 1) + (GrandExchangeOfferWorldComparator.method4609(var0, var1, 1) - 128 >> 2); // L: 940 + var2 = (int)(0.3D * (double)var2) + 35; // L: 941 + if (var2 < 10) { // L: 942 + var2 = 10; + } else if (var2 > 60) { // L: 943 + var2 = 60; + } + + return var2; // L: 944 + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Lbu;S)V", + garbageValue = "-13863" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1350 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1351 + Actor.method2173(var0.isMembersOnly()); // L: 1352 + } + + if (var0.properties != Client.worldProperties) { // L: 1354 + Archive var1 = SoundSystem.archive8; // L: 1355 + int var2 = var0.properties; // L: 1356 + if ((var2 & 536870912) != 0) { // L: 1358 + class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 1359 + } else if ((var2 & 1073741824) != 0) { // L: 1361 + class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 1362 + } else { + class125.logoSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 1365 + } + } + + MusicPatch.worldHost = var0.host; // L: 1369 + Client.worldId = var0.id; // L: 1370 + Client.worldProperties = var0.properties; // L: 1371 + AttackOption.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1372 + Calendar.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1373 + class5.currentPort = AttackOption.worldPort; // L: 1374 + } // L: 1375 +} diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java new file mode 100644 index 0000000000..92762e36cc --- /dev/null +++ b/runescape-client/src/main/java/class15.java @@ -0,0 +1,128 @@ +import java.io.File; +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("r") +public class class15 extends class14 { + @ObfuscatedName("gu") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("f") + String field128; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class15(class2 var1) { + this.this$0 = var1; // L: 229 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field128 = var1.readStringCp1252NullTerminated(); // L: 232 + var1.readInt(); // L: 233 + } // L: 234 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.field81 = this.field128; // L: 237 + } // L: 238 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1672620512" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (class69.Widget_loadedInterfaces[var0]) { // L: 205 + return true; + } else if (!FloorDecoration.Widget_archive.tryLoadGroup(var0)) { // L: 206 + return false; + } else { + int var1 = FloorDecoration.Widget_archive.getGroupFileCount(var0); // L: 207 + if (var1 == 0) { // L: 208 + class69.Widget_loadedInterfaces[var0] = true; // L: 209 + return true; // L: 210 + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 212 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 213 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 214 + byte[] var3 = FloorDecoration.Widget_archive.takeFile(var0, var2); // L: 215 + if (var3 != null) { // L: 216 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 217 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 218 + if (var3[0] == -1) { // L: 219 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 220 + } + } + } + } + + class69.Widget_loadedInterfaces[var0] = true; // L: 224 + return true; // L: 225 + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lni;", + garbageValue = "1945002537" + ) + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 247 + if (var3.exists()) { // L: 248 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 250 + return var10; // L: 251 + } catch (IOException var9) { // L: 253 + } + } + + String var4 = ""; // L: 255 + if (class20.cacheGamebuild == 33) { // L: 256 + var4 = "_rc"; + } else if (class20.cacheGamebuild == 34) { // L: 257 + var4 = "_wip"; + } + + File var5 = new File(Canvas.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 258 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 259 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 261 + return var6; // L: 262 + } catch (IOException var8) { // L: 264 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 267 + return var6; // L: 268 + } catch (IOException var7) { // L: 270 + throw new RuntimeException(); // L: 271 + } + } +} diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java deleted file mode 100644 index 9f7b222cda..0000000000 --- a/runescape-client/src/main/java/class155.java +++ /dev/null @@ -1,7 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ez") -public interface class155 { - @ObfuscatedName("n") - void method3493(Object var1); -} diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/class157.java new file mode 100644 index 0000000000..8fae451a3b --- /dev/null +++ b/runescape-client/src/main/java/class157.java @@ -0,0 +1,554 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fy") +public class class157 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + static final class157 field1732; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lfy;" + ) + static final class157 field1733; + @ObfuscatedName("k") + @Export("SpriteBuffer_spriteHeights") + static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -2045645693 + ) + @Export("value") + final int value; + + static { + field1732 = new class157(0); // L: 4 + field1733 = new class157(1); // L: 5 + } + + class157(int var1) { + this.value = var1; // L: 9 + } // L: 10 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "([BIIIIIIILfu;[Lel;I)V", + garbageValue = "-1535300065" + ) + static final void method3114(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); // L: 252 + int var11 = -1; // L: 253 + + while (true) { + int var12 = var10.method6595(); // L: 255 + if (var12 == 0) { // L: 256 + return; // L: 339 + } + + var11 += var12; // L: 257 + int var13 = 0; // L: 258 + + while (true) { + int var14 = var10.readUShortSmart(); // L: 260 + if (var14 == 0) { // L: 261 + break; + } + + var13 += var14 - 1; // L: 262 + int var15 = var13 & 63; // L: 263 + int var16 = var13 >> 6 & 63; // L: 264 + int var17 = var13 >> 12; // L: 265 + int var18 = var10.readUnsignedByte(); // L: 266 + int var19 = var18 >> 2; // L: 267 + int var20 = var18 & 3; // L: 268 + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 269 + ObjectComposition var21 = class19.getObjectDefinition(var11); // L: 270 + int var24 = var16 & 7; // L: 273 + int var25 = var15 & 7; // L: 274 + int var27 = var21.sizeX; // L: 276 + int var28 = var21.sizeY; // L: 277 + int var29; + if ((var20 & 1) == 1) { // L: 279 + var29 = var27; // L: 280 + var27 = var28; // L: 281 + var28 = var29; // L: 282 + } + + int var26 = var7 & 3; // L: 284 + int var23; + if (var26 == 0) { // L: 285 + var23 = var24; // L: 286 + } else if (var26 == 1) { // L: 289 + var23 = var25; // L: 290 + } else if (var26 == 2) { // L: 293 + var23 = 7 - var24 - (var27 - 1); // L: 294 + } else { + var23 = 7 - var25 - (var28 - 1); // L: 297 + } + + var29 = var2 + var23; // L: 299 + int var32 = var16 & 7; // L: 302 + int var33 = var15 & 7; // L: 303 + int var35 = var21.sizeX; // L: 305 + int var36 = var21.sizeY; // L: 306 + int var37; + if ((var20 & 1) == 1) { // L: 308 + var37 = var35; // L: 309 + var35 = var36; // L: 310 + var36 = var37; // L: 311 + } + + int var34 = var7 & 3; // L: 313 + int var31; + if (var34 == 0) { // L: 314 + var31 = var33; // L: 315 + } else if (var34 == 1) { // L: 318 + var31 = 7 - var32 - (var35 - 1); // L: 319 + } else if (var34 == 2) { // L: 322 + var31 = 7 - var33 - (var36 - 1); // L: 323 + } else { + var31 = var32; // L: 326 + } + + var37 = var31 + var3; // L: 328 + if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { // L: 329 + int var38 = var1; // L: 330 + if ((Tiles.Tiles_renderFlags[1][var29][var37] & 2) == 2) { // L: 331 + var38 = var1 - 1; + } + + CollisionMap var39 = null; // L: 332 + if (var38 >= 0) { // L: 333 + var39 = var9[var38]; + } + + method3115(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); // L: 334 + } + } + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IIIIIILfu;Lel;B)V", + garbageValue = "26" + ) + static final void method3115(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: 342 343 344 + if (var0 < Tiles.Tiles_minPlane) { // L: 347 + Tiles.Tiles_minPlane = var0; + } + + ObjectComposition var8 = class19.getObjectDefinition(var3); // L: 348 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 351 + var9 = var8.sizeX; // L: 356 + var10 = var8.sizeY; // L: 357 + } else { + var9 = var8.sizeY; // L: 352 + var10 = var8.sizeX; // L: 353 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 363 + var11 = (var9 >> 1) + var1; // L: 364 + var12 = (var9 + 1 >> 1) + var1; // L: 365 + } else { + var11 = var1; // L: 368 + var12 = var1 + 1; // L: 369 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 371 + var13 = (var10 >> 1) + var2; // L: 372 + var14 = var2 + (var10 + 1 >> 1); // L: 373 + } else { + var13 = var2; // L: 376 + var14 = var2 + 1; // L: 377 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 379 + int var16 = var15[var12][var13] + var15[var11][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 380 + int var17 = (var1 << 7) + (var9 << 6); // L: 381 + int var18 = (var2 << 7) + (var10 << 6); // L: 382 + long var19 = AttackOption.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 383 + int var21 = var5 + (var4 << 6); // L: 384 + if (var8.int3 == 1) { // L: 385 + var21 += 256; + } + + int var23; + int var24; + if (var8.hasSound()) { // L: 386 + ObjectSound var22 = new ObjectSound(); // L: 387 + var22.plane = var0; // L: 388 + var22.x = var1 * 128; // L: 389 + var22.y = var2 * 128; // L: 390 + var23 = var8.sizeX; // L: 391 + var24 = var8.sizeY; // L: 392 + if (var4 == 1 || var4 == 3) { // L: 393 + var23 = var8.sizeY; // L: 394 + var24 = var8.sizeX; // L: 395 + } + + var22.field916 = (var23 + var1) * 128; // L: 397 + var22.field917 = (var24 + var2) * 128; // L: 398 + var22.soundEffectId = var8.ambientSoundId; // L: 399 + var22.field918 = var8.int4 * 128; // L: 400 + var22.field921 = var8.int5; // L: 401 + var22.field922 = var8.int6; // L: 402 + var22.soundEffectIds = var8.soundEffectIds; // L: 403 + if (var8.transforms != null) { // L: 404 + var22.obj = var8; // L: 405 + var22.set(); // L: 406 + } + + ObjectSound.objectSounds.addFirst(var22); // L: 408 + if (var22.soundEffectIds != null) { // L: 409 + var22.field924 = var22.field921 + (int)(Math.random() * (double)(var22.field922 - var22.field921)); + } + } + + Object var34; + if (var5 == 22) { // L: 411 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 412 + if (var8.animationId == -1 && var8.transforms == null) { // L: 414 + var34 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 415 + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 416 + if (var8.interactType == 1 && var7 != null) { // L: 417 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else if (var5 != 10 && var5 != 11) { // L: 420 + int[] var10000; + if (var5 >= 12) { // L: 441 + if (var8.animationId == -1 && var8.transforms == null) { // L: 443 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 444 + } + + var6.method3445(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 445 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 446 + var10000 = MidiPcmStream.field2489[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { // L: 447 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 450 + if (var8.animationId == -1 && var8.transforms == null) { // L: 452 + var34 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 453 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1094[var4], 0, var19, var21); // L: 454 + if (var4 == 0) { // L: 455 + if (var8.clipped) { // L: 456 + SecureRandomCallable.field1106[var0][var1][var2] = 50; // L: 457 + SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; // L: 458 + } + + if (var8.modelClipped) { // L: 460 + var10000 = MidiPcmStream.field2489[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 462 + if (var8.clipped) { // L: 463 + SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; // L: 464 + SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; // L: 465 + } + + if (var8.modelClipped) { // L: 467 + var10000 = MidiPcmStream.field2489[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { // L: 469 + if (var8.clipped) { // L: 470 + SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; // L: 471 + SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; // L: 472 + } + + if (var8.modelClipped) { // L: 474 + var10000 = MidiPcmStream.field2489[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 476 + if (var8.clipped) { // L: 477 + SecureRandomCallable.field1106[var0][var1][var2] = 50; // L: 478 + SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; // L: 479 + } + + if (var8.modelClipped) { // L: 481 + var10000 = MidiPcmStream.field2489[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 483 + var7.method2613(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 484 + var6.method3538(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 487 + if (var8.animationId == -1 && var8.transforms == null) { // L: 489 + var34 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 490 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1098[var4], 0, var19, var21); // L: 491 + if (var8.clipped) { // L: 492 + if (var4 == 0) { // L: 493 + SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 494 + SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 495 + SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 496 + SecureRandomCallable.field1106[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 498 + var7.method2613(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { // L: 501 + var28 = var4 + 1 & 3; // L: 502 + Object var31; + Object var32; + if (var8.animationId == -1 && var8.transforms == null) { // L: 505 + var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 506 + var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 507 + } else { + var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 510 + var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 511 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field1094[var4], Tiles.field1094[var28], var19, var21); // L: 513 + if (var8.modelClipped) { // L: 514 + if (var4 == 0) { // L: 515 + var10000 = MidiPcmStream.field2489[var0][var1]; // L: 516 + var10000[var2] |= 585; + var10000 = MidiPcmStream.field2489[var0][var1]; // L: 517 + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { // L: 519 + var10000 = MidiPcmStream.field2489[var0][var1]; // L: 520 + var10000[1 + var2] |= 1170; + var10000 = MidiPcmStream.field2489[var0][var1 + 1]; // L: 521 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 523 + var10000 = MidiPcmStream.field2489[var0][var1 + 1]; // L: 524 + var10000[var2] |= 585; + var10000 = MidiPcmStream.field2489[var0][var1]; // L: 525 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 527 + var10000 = MidiPcmStream.field2489[var0][var1]; // L: 528 + var10000[var2] |= 1170; + var10000 = MidiPcmStream.field2489[var0][var1]; // L: 529 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 532 + var7.method2613(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 533 + var6.method3538(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 536 + if (var8.animationId == -1 && var8.transforms == null) { // L: 538 + var34 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 539 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1098[var4], 0, var19, var21); // L: 540 + if (var8.clipped) { // L: 541 + if (var4 == 0) { // L: 542 + SecureRandomCallable.field1106[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 543 + SecureRandomCallable.field1106[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 544 + SecureRandomCallable.field1106[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 545 + SecureRandomCallable.field1106[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 547 + var7.method2613(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 550 + if (var8.animationId == -1 && var8.transforms == null) { // L: 552 + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 553 + } + + var6.method3445(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 554 + if (var8.interactType != 0 && var7 != null) { // L: 555 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 556 + var6.method3538(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 559 + if (var8.animationId == -1 && var8.transforms == null) { // L: 561 + var34 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 562 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field1094[var4], 0, 0, 0, var19, var21); // L: 563 + } else { + Object var25; + long var29; + if (var5 == 5) { // L: 566 + var28 = 16; // L: 567 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 568 + if (0L != var29) { // L: 569 + var28 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var29)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 571 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 572 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1094[var4], 0, var28 * Tiles.field1097[var4], var28 * Tiles.field1100[var4], var19, var21); // L: 573 + } else if (var5 == 6) { // L: 576 + var28 = 8; // L: 577 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 578 + if (var29 != 0L) { // L: 579 + var28 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var29)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 581 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 582 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field1101[var4], var28 * Tiles.field1099[var4], var19, var21); // L: 583 + } else if (var5 == 7) { // L: 586 + var23 = var4 + 2 & 3; // L: 588 + if (var8.animationId == -1 && var8.transforms == null) { // L: 589 + var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 590 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 591 + } else if (var5 == 8) { // L: 594 + var28 = 8; // L: 595 + var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 596 + if (var29 != 0L) { // L: 597 + var28 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var29)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 600 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 601 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 602 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 603 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 606 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 607 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field1101[var4], var28 * Tiles.field1099[var4], var19, var21); // L: 609 + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 422 + var34 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field3621, (Renderable)null); // L: 423 + } + + if (var34 != null && var6.method3445(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 424 425 + var23 = 15; // L: 426 + if (var34 instanceof Model) { // L: 427 + var23 = ((Model)var34).method3673() / 4; // L: 428 + if (var23 > 30) { // L: 429 + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { // L: 431 + for (int var33 = 0; var33 <= var10; ++var33) { // L: 432 + if (var23 > SecureRandomCallable.field1106[var0][var24 + var1][var33 + var2]) { // L: 433 + SecureRandomCallable.field1106[var0][var24 + var1][var33 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 438 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } // L: 418 439 448 485 499 534 548 557 564 574 584 592 610 612 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + static final void method3113() { + Object var10000 = null; // L: 175 + String var0 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + class69.addGameMessage(30, "", var0); // L: 177 + } // L: 179 + + @ObfuscatedName("ka") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1812084217" + ) + static final void method3112() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11498 + Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11499 + var1.clearIsInClanChat(); // L: 11500 + } + + } // L: 11502 +} diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java new file mode 100644 index 0000000000..8e57dfa32b --- /dev/null +++ b/runescape-client/src/main/java/class159.java @@ -0,0 +1,72 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("fe") +public class class159 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Ljz;", + garbageValue = "977172754" + ) + @Export("getEnum") + public static EnumComposition getEnum(int var0) { + EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; + } else { + byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 27 + var1 = new EnumComposition(); // L: 28 + if (var2 != null) { // L: 29 + var1.decode(new Buffer(var2)); + } + + EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 30 + return var1; // L: 31 + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(Lhu;I)Z", + garbageValue = "2141791356" + ) + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 10086 + return false; + } else { + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10087 + int var2 = WorldMapSection0.method3036(var0, var1); // L: 10088 + int var3 = var0.cs1ComparisonValues[var1]; // L: 10089 + if (var0.cs1Comparisons[var1] == 2) { // L: 10090 + if (var2 >= var3) { // L: 10091 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 10093 + if (var2 <= var3) { // L: 10094 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 10096 + if (var3 == var2) { // L: 10097 + return false; + } + } else if (var3 != var2) { // L: 10099 + return false; + } + } + + return true; // L: 10101 + } + } + + @ObfuscatedName("kj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2144364574" + ) + static final void method3121() { + Client.field798 = Client.cycleCntr; // L: 11509 + WorldMapSection2.ClanChat_inClanChat = true; // L: 11510 + } // L: 11511 +} diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java new file mode 100644 index 0000000000..355dd351ae --- /dev/null +++ b/runescape-client/src/main/java/class16.java @@ -0,0 +1,166 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("q") +public abstract class class16 extends Node { + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -2104011211 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("lx") + @ObfuscatedGetter( + intValue = 2074784147 + ) + @Export("menuX") + static int menuX; + + class16() { + } // L: 48 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1239860939" + ) + abstract void vmethod356(Buffer var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1583378087" + ) + abstract void vmethod352(class3 var1); + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Ljava/lang/String;", + garbageValue = "-1639083149" + ) + public static String method258(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); // L: 67 + if (var2 > 32767) { // L: 68 + var2 = 32767; + } + + byte[] var3 = new byte[var2]; // L: 69 + var0.offset += class227.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 70 + String var4 = class303.decodeStringCp1252(var3, 0, var2); // L: 71 + var1 = var4; // L: 72 + } catch (Exception var6) { // L: 74 + var1 = "Cabbage"; // L: 75 + } + + return var1; // L: 78 + } + + @ObfuscatedName("fy") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2104011211" + ) + static final void method259() { + ApproximateRouteStrategy.method1205(); // L: 2384 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2386 + KitDefinition.KitDefinition_cached.clear(); // L: 2389 + ObjectComposition.ObjectDefinition_cached.clear(); // L: 2392 + ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 2393 + ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 2394 + ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 2395 + MusicPatchPcmStream.method4123(); // L: 2397 + WorldMapLabelSize.method2678(); // L: 2398 + class22.method320(); // L: 2399 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2401 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2402 + WorldMapAreaData.method3212(); // L: 2404 + VarpDefinition.VarpDefinition_cached.clear(); // L: 2406 + Clock.method2600(); // L: 2408 + WorldMapLabelSize.method2676(); // L: 2409 + ParamComposition.method5096(); // L: 2410 + ParamComposition.ParamDefinition_cached.clear(); // L: 2412 + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2415 + PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2418 + ReflectionCheck.method1172(); // L: 2420 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2421 + Script.Script_cached.clear(); // L: 2422 + TriBool.archive0.clearFiles(); // L: 2423 + class367.archive1.clearFiles(); // L: 2424 + class5.archive3.clearFiles(); // L: 2425 + ItemContainer.archive4.clearFiles(); // L: 2426 + class157.archive5.clearFiles(); // L: 2427 + class8.archive6.clearFiles(); // L: 2428 + class12.archive7.clearFiles(); // L: 2429 + SoundSystem.archive8.clearFiles(); // L: 2430 + AbstractWorldMapData.archive9.clearFiles(); // L: 2431 + class373.archive10.clearFiles(); // L: 2432 + class10.archive11.clearFiles(); // L: 2433 + BuddyRankComparator.archive12.clearFiles(); // L: 2434 + } // L: 2435 + + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIIB)V", + garbageValue = "-60" + ) + @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: 6772 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6773 6774 6779 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 6775 + var9 = var10; // L: 6776 + break; + } + } + + if (var9 == null) { // L: 6781 + var9 = new PendingSpawn(); // L: 6782 + var9.plane = var0; // L: 6783 + var9.type = var3; // L: 6784 + var9.x = var1; // L: 6785 + var9.y = var2; // L: 6786 + long var11 = 0L; // L: 6788 + int var13 = -1; // L: 6789 + int var14 = 0; // L: 6790 + int var15 = 0; // L: 6791 + if (var9.type == 0) { // L: 6792 + var11 = WorldMapArea.scene.getBoundaryObjectTag(var9.plane, var9.x, var9.y); + } + + if (var9.type == 1) { // L: 6793 + var11 = WorldMapArea.scene.getWallDecorationTag(var9.plane, var9.x, var9.y); + } + + if (var9.type == 2) { // L: 6794 + var11 = WorldMapArea.scene.getGameObjectTag(var9.plane, var9.x, var9.y); + } + + if (var9.type == 3) { + var11 = WorldMapArea.scene.getFloorDecorationTag(var9.plane, var9.x, var9.y); // L: 6795 + } + + if (0L != var11) { // L: 6796 + int var16 = WorldMapArea.scene.getObjectFlags(var9.plane, var9.x, var9.y, var11); // L: 6797 + var13 = WorldMapSection1.Entity_unpackID(var11); // L: 6798 + var14 = var16 & 31; // L: 6799 + var15 = var16 >> 6 & 3; // L: 6800 + } + + var9.objectId = var13; // L: 6802 + var9.field1203 = var14; // L: 6803 + var9.field1199 = var15; // L: 6804 + Client.pendingSpawns.addFirst(var9); // L: 6806 + } + + var9.id = var4; // L: 6808 + var9.field1196 = var5; // L: 6809 + var9.orientation = var6; // L: 6810 + var9.delay = var7; // L: 6811 + var9.hitpoints = var8; // L: 6812 + } // L: 6813 +} diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java deleted file mode 100644 index 3fb4c4c30d..0000000000 --- a/runescape-client/src/main/java/class169.java +++ /dev/null @@ -1,647 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fw") -public enum class169 implements Enumerated { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lfw;" - ) - field2013(3, 0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lfw;" - ) - field2011(2, 1), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lfw;" - ) - field2012(1, 2), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lfw;" - ) - field2018(0, 3); - - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "[Llm;" - ) - @Export("headIconPrayerSprites") - static SpritePixels[] headIconPrayerSprites; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -786899821 - ) - public final int field2014; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 1802409949 - ) - @Export("id") - final int id; - - class169(int var3, int var4) { - this.field2014 = var3; // L: 16 - this.id = var4; // L: 17 - } // L: 18 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; // L: 21 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Lie;", - garbageValue = "-825659067" - ) - static VerticalAlignment[] method3631() { - return new VerticalAlignment[]{VerticalAlignment.field3236, VerticalAlignment.field3234, VerticalAlignment.VerticalAlignment_centered}; // L: 14 - } - - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(Ljs;IIII)V", - garbageValue = "1515768650" - ) - static void method3637(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && WorldMapSectionType.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3356 - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3357 - int var4 = var0.soundEffects[var1]; // L: 3358 - if (var4 != 0) { // L: 3359 - int var5 = var4 >> 8; // L: 3360 - int var6 = var4 >> 4 & 7; // L: 3361 - int var7 = var4 & 15; // L: 3362 - Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3363 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3364 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3365 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3366 - int var8 = (var2 - 64) / 128; // L: 3367 - int var9 = (var3 - 64) / 128; // L: 3368 - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3369 - ++Client.soundEffectCount; // L: 3370 - } - } - } - } // L: 3371 - - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "([Lhz;IIIIIIII)V", - garbageValue = "-1265489045" - ) - @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: 10379 - Widget var9 = var0[var8]; // L: 10380 - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class60.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10381 10382 10383 - if (var9.isIf3) { // L: 10384 - if (DevicePcmPlayerProvider.isComponentHidden(var9)) { // L: 10385 - continue; - } - } else if (var9.type == 0 && var9 != Canvas.mousedOverWidgetIf1 && DevicePcmPlayerProvider.isComponentHidden(var9)) { // L: 10388 - continue; - } - - int var10 = var9.x + var6; // L: 10390 - int var11 = var7 + var9.y; // L: 10391 - int var12; - int var13; - int var14; - int var15; - int var17; - int var18; - if (var9.type == 2) { // L: 10396 - var12 = var2; // L: 10397 - var13 = var3; // L: 10398 - var14 = var4; // L: 10399 - var15 = var5; // L: 10400 - } else { - int var16; - if (var9.type == 9) { // L: 10402 - var16 = var10; // L: 10403 - var17 = var11; // L: 10404 - var18 = var10 + var9.width; // L: 10405 - int var19 = var11 + var9.height; // L: 10406 - if (var18 < var10) { // L: 10407 - var16 = var18; // L: 10409 - var18 = var10; // L: 10410 - } - - if (var19 < var11) { // L: 10412 - var17 = var19; // L: 10414 - var19 = var11; // L: 10415 - } - - ++var18; // L: 10417 - ++var19; // L: 10418 - var12 = var16 > var2 ? var16 : var2; // L: 10419 - var13 = var17 > var3 ? var17 : var3; // L: 10420 - var14 = var18 < var4 ? var18 : var4; // L: 10421 - var15 = var19 < var5 ? var19 : var5; // L: 10422 - } else { - var16 = var10 + var9.width; // L: 10425 - var17 = var11 + var9.height; // L: 10426 - var12 = var10 > var2 ? var10 : var2; // L: 10427 - var13 = var11 > var3 ? var11 : var3; // L: 10428 - var14 = var16 < var4 ? var16 : var4; // L: 10429 - var15 = var17 < var5 ? var17 : var5; // L: 10430 - } - } - - if (var9 == Client.clickedWidget) { // L: 10432 - Client.field754 = true; // L: 10433 - Client.field784 = var10; // L: 10434 - Client.field847 = var11; // L: 10435 - } - - boolean var32 = false; // L: 10437 - if (var9.field2667) { // L: 10438 - switch(Client.field705) { // L: 10439 - case 0: - var32 = true; // L: 10451 - case 1: - default: - break; - case 2: - if (Client.field699 == var9.id >>> 16) { // L: 10441 - var32 = true; // L: 10442 - } - break; - case 3: - if (var9.id == Client.field699) { // L: 10446 - var32 = true; // L: 10447 - } - } - } - - if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10455 - if (var9.isIf3) { // L: 10456 - ScriptEvent var26; - if (var9.noClickThrough) { // L: 10457 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10458 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10459 - if (var26.isMouseInputEvent) { // L: 10460 - var26.remove(); // L: 10461 - var26.widget.containsMouse = false; // L: 10462 - } - } - - if (PlayerComposition.widgetDragDuration == 0) { // L: 10465 - Client.clickedWidget = null; // L: 10466 - Client.clickedWidgetParent = null; // L: 10467 - } - - if (!Client.isMenuOpen) { // L: 10469 - Player.addCancelMenuEntry(); // L: 10470 - } - } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10474 10475 - for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10476 - if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10477 - var26.remove(); // L: 10478 - } - } - } - } - - var17 = MouseHandler.MouseHandler_x; // L: 10484 - var18 = MouseHandler.MouseHandler_y; // L: 10485 - if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10486 - var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10487 - var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10488 - } - - boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10490 - if (var9.contentType == 1337) { // L: 10491 - if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10492 - Projectile.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { // L: 10495 - SecureRandomCallable.checkIfMinimapClicked(var9, var10, var11); // L: 10496 - } else { - if (var9.contentType == 1400) { // L: 10499 - SoundSystem.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10500 - } - - if (!Client.isMenuOpen && var33) { // L: 10502 - if (var9.contentType == 1400) { // L: 10503 - SoundSystem.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10504 - } else { - class58.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10507 - } - } - - boolean var21; - int var23; - if (var32) { // L: 10510 - for (int var20 = 0; var20 < var9.field2668.length; ++var20) { // L: 10511 - var21 = false; // L: 10512 - boolean var27 = false; // L: 10513 - if (!var21 && var9.field2668[var20] != null) { // L: 10514 - for (var23 = 0; var23 < var9.field2668[var20].length; ++var23) { // L: 10515 - boolean var24 = false; // L: 10516 - if (var9.field2660 != null) { // L: 10517 - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2668[var20][var23]]; // L: 10518 - } - - if (WorldMapLabel.method503(var9.field2668[var20][var23]) || var24) { // L: 10520 - var21 = true; // L: 10521 - if (var9.field2660 != null && var9.field2660[var20] > Client.cycle) { // L: 10522 - break; - } - - byte var31 = var9.field2669[var20][var23]; // L: 10523 - if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10524 10525 10526 10527 10528 - var27 = true; // L: 10530 - break; - } - } - } - } - - if (var27) { // L: 10536 - if (var20 < 10) { // L: 10537 - ApproximateRouteStrategy.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { // L: 10538 - WorldMapSection2.Widget_runOnTargetLeave(); // L: 10539 - ArchiveDisk.selectSpell(var9.id, var9.childIndex, MusicPatch.Widget_unpackTargetMask(class60.getWidgetFlags(var9)), var9.itemId); // L: 10540 - Client.selectedSpellActionName = Player.Widget_getSpellActionName(var9); // L: 10541 - if (Client.selectedSpellActionName == null) { // L: 10542 - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + FileSystem.colorStartTag(16777215); // L: 10543 - } - - var23 = var9.field2686[var20]; // L: 10545 - if (var9.field2660 == null) { // L: 10546 - var9.field2660 = new int[var9.field2668.length]; - } - - if (var9.field2599 == null) { // L: 10547 - var9.field2599 = new int[var9.field2668.length]; - } - - if (var23 != 0) { // L: 10548 - if (var9.field2660[var20] == 0) { // L: 10549 - var9.field2660[var20] = var23 + Client.cycle + var9.field2599[var20]; - } else { - var9.field2660[var20] = var23 + Client.cycle; // L: 10550 - } - } else { - var9.field2660[var20] = Integer.MAX_VALUE; // L: 10552 - } - } - - if (!var21 && var9.field2660 != null) { // L: 10554 10555 - var9.field2660[var20] = 0; - } - } - } - - if (var9.isIf3) { // L: 10559 - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10560 - var33 = true; - } else { - var33 = false; // L: 10561 - } - - boolean var34 = false; // L: 10562 - if ((MouseHandler.MouseHandler_currentButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10563 - var34 = true; - } - - var21 = false; // L: 10564 - if ((MouseHandler.MouseHandler_lastButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10565 - var21 = true; - } - - if (var21) { // L: 10566 - FriendSystem.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { // L: 10567 - SoundSystem.worldMap.method6525(var17, var18, var33 & var34, var33 & var21); // L: 10568 - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && CollisionMap.method3781(class60.getWidgetFlags(var9))) { // L: 10570 - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { // L: 10571 - Client.field912 = true; // L: 10572 - Client.field714 = var10; // L: 10573 - Client.field844 = var11; // L: 10574 - } - - if (var9.hasListener) { // L: 10576 - ScriptEvent var22; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10577 - var22 = new ScriptEvent(); // L: 10578 - var22.isMouseInputEvent = true; // L: 10579 - var22.widget = var9; // L: 10580 - var22.mouseY = Client.mouseWheelRotation; // L: 10581 - var22.args = var9.onScroll; // L: 10582 - Client.scriptEvents.addFirst(var22); // L: 10583 - } - - if (Client.clickedWidget != null || JagexCache.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10585 - var21 = false; // L: 10586 - var34 = false; // L: 10587 - var33 = false; // L: 10588 - } - - if (!var9.isClicked && var21) { // L: 10590 - var9.isClicked = true; // L: 10591 - if (var9.onClick != null) { // L: 10592 - var22 = new ScriptEvent(); // L: 10593 - var22.isMouseInputEvent = true; // L: 10594 - var22.widget = var9; // L: 10595 - var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10596 - var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10597 - var22.args = var9.onClick; // L: 10598 - Client.scriptEvents.addFirst(var22); // L: 10599 - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10602 10603 - var22 = new ScriptEvent(); // L: 10604 - var22.isMouseInputEvent = true; // L: 10605 - var22.widget = var9; // L: 10606 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10607 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10608 - var22.args = var9.onClickRepeat; // L: 10609 - Client.scriptEvents.addFirst(var22); // L: 10610 - } - - if (var9.isClicked && !var34) { // L: 10613 - var9.isClicked = false; // L: 10614 - if (var9.onRelease != null) { // L: 10615 - var22 = new ScriptEvent(); // L: 10616 - var22.isMouseInputEvent = true; // L: 10617 - var22.widget = var9; // L: 10618 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10619 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10620 - var22.args = var9.onRelease; // L: 10621 - Client.field865.addFirst(var22); // L: 10622 - } - } - - if (var34 && var9.onHold != null) { // L: 10625 10626 - var22 = new ScriptEvent(); // L: 10627 - var22.isMouseInputEvent = true; // L: 10628 - var22.widget = var9; // L: 10629 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10630 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10631 - var22.args = var9.onHold; // L: 10632 - Client.scriptEvents.addFirst(var22); // L: 10633 - } - - if (!var9.containsMouse && var33) { // L: 10636 - var9.containsMouse = true; // L: 10637 - if (var9.onMouseOver != null) { // L: 10638 - var22 = new ScriptEvent(); // L: 10639 - var22.isMouseInputEvent = true; // L: 10640 - var22.widget = var9; // L: 10641 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10642 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10643 - var22.args = var9.onMouseOver; // L: 10644 - Client.scriptEvents.addFirst(var22); // L: 10645 - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10648 10649 - var22 = new ScriptEvent(); // L: 10650 - var22.isMouseInputEvent = true; // L: 10651 - var22.widget = var9; // L: 10652 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10653 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10654 - var22.args = var9.onMouseRepeat; // L: 10655 - Client.scriptEvents.addFirst(var22); // L: 10656 - } - - if (var9.containsMouse && !var33) { // L: 10659 - var9.containsMouse = false; // L: 10660 - if (var9.onMouseLeave != null) { // L: 10661 - var22 = new ScriptEvent(); // L: 10662 - var22.isMouseInputEvent = true; // L: 10663 - var22.widget = var9; // L: 10664 - var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10665 - var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10666 - var22.args = var9.onMouseLeave; // L: 10667 - Client.field865.addFirst(var22); // L: 10668 - } - } - - if (var9.onTimer != null) { // L: 10671 - var22 = new ScriptEvent(); // L: 10672 - var22.widget = var9; // L: 10673 - var22.args = var9.onTimer; // L: 10674 - Client.field660.addFirst(var22); // L: 10675 - } - - ScriptEvent var25; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field2727) { // L: 10677 - if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field2727 <= 32) { // L: 10678 - label763: - for (var36 = var9.field2727; var36 < Client.changedVarpCount; ++var36) { // L: 10685 - var23 = Client.changedVarps[var36 & 31]; // L: 10686 - - for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10687 - if (var23 == var9.varTransmitTriggers[var35]) { // L: 10688 - var25 = new ScriptEvent(); // L: 10689 - var25.widget = var9; // L: 10690 - var25.args = var9.onVarTransmit; // L: 10691 - Client.scriptEvents.addFirst(var25); // L: 10692 - break label763; // L: 10693 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10679 - var22.widget = var9; // L: 10680 - var22.args = var9.onVarTransmit; // L: 10681 - Client.scriptEvents.addFirst(var22); // L: 10682 - } - - var9.field2727 = Client.changedVarpCount; // L: 10698 - } - - if (var9.onInvTransmit != null && Client.field870 > var9.field2728) { // L: 10700 - if (var9.invTransmitTriggers != null && Client.field870 - var9.field2728 <= 32) { // L: 10701 - label739: - for (var36 = var9.field2728; var36 < Client.field870; ++var36) { // L: 10708 - var23 = Client.changedItemContainers[var36 & 31]; // L: 10709 - - for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10710 - if (var23 == var9.invTransmitTriggers[var35]) { // L: 10711 - var25 = new ScriptEvent(); // L: 10712 - var25.widget = var9; // L: 10713 - var25.args = var9.onInvTransmit; // L: 10714 - Client.scriptEvents.addFirst(var25); // L: 10715 - break label739; // L: 10716 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10702 - var22.widget = var9; // L: 10703 - var22.args = var9.onInvTransmit; // L: 10704 - Client.scriptEvents.addFirst(var22); // L: 10705 - } - - var9.field2728 = Client.field870; // L: 10721 - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2729) { // L: 10723 - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2729 <= 32) { // L: 10724 - label715: - for (var36 = var9.field2729; var36 < Client.changedSkillsCount; ++var36) { // L: 10731 - var23 = Client.changedSkills[var36 & 31]; // L: 10732 - - for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10733 - if (var23 == var9.statTransmitTriggers[var35]) { // L: 10734 - var25 = new ScriptEvent(); // L: 10735 - var25.widget = var9; // L: 10736 - var25.args = var9.onStatTransmit; // L: 10737 - Client.scriptEvents.addFirst(var25); // L: 10738 - break label715; // L: 10739 - } - } - } - } else { - var22 = new ScriptEvent(); // L: 10725 - var22.widget = var9; // L: 10726 - var22.args = var9.onStatTransmit; // L: 10727 - Client.scriptEvents.addFirst(var22); // L: 10728 - } - - var9.field2729 = Client.changedSkillsCount; // L: 10744 - } - - if (Client.chatCycle > var9.field2719 && var9.onChatTransmit != null) { // L: 10746 - var22 = new ScriptEvent(); // L: 10747 - var22.widget = var9; // L: 10748 - var22.args = var9.onChatTransmit; // L: 10749 - Client.scriptEvents.addFirst(var22); // L: 10750 - } - - if (Client.field857 > var9.field2719 && var9.onFriendTransmit != null) { // L: 10752 - var22 = new ScriptEvent(); // L: 10753 - var22.widget = var9; // L: 10754 - var22.args = var9.onFriendTransmit; // L: 10755 - Client.scriptEvents.addFirst(var22); // L: 10756 - } - - if (Client.field858 > var9.field2719 && var9.onClanTransmit != null) { // L: 10758 - var22 = new ScriptEvent(); // L: 10759 - var22.widget = var9; // L: 10760 - var22.args = var9.onClanTransmit; // L: 10761 - Client.scriptEvents.addFirst(var22); // L: 10762 - } - - if (Client.field710 > var9.field2719 && var9.onStockTransmit != null) { // L: 10764 - var22 = new ScriptEvent(); // L: 10765 - var22.widget = var9; // L: 10766 - var22.args = var9.onStockTransmit; // L: 10767 - Client.scriptEvents.addFirst(var22); // L: 10768 - } - - if (Client.field860 > var9.field2719 && var9.field2678 != null) { // L: 10770 - var22 = new ScriptEvent(); // L: 10771 - var22.widget = var9; // L: 10772 - var22.args = var9.field2678; // L: 10773 - Client.scriptEvents.addFirst(var22); // L: 10774 - } - - if (Client.field861 > var9.field2719 && var9.onMiscTransmit != null) { // L: 10776 - var22 = new ScriptEvent(); // L: 10777 - var22.widget = var9; // L: 10778 - var22.args = var9.onMiscTransmit; // L: 10779 - Client.scriptEvents.addFirst(var22); // L: 10780 - } - - var9.field2719 = Client.cycleCntr; // L: 10782 - if (var9.onKey != null) { // L: 10783 - for (var36 = 0; var36 < Client.field885; ++var36) { // L: 10784 - ScriptEvent var30 = new ScriptEvent(); // L: 10785 - var30.widget = var9; // L: 10786 - var30.keyTyped = Client.field738[var36]; // L: 10787 - var30.keyPressed = Client.field886[var36]; // L: 10788 - var30.args = var9.onKey; // L: 10789 - Client.scriptEvents.addFirst(var30); // L: 10790 - } - } - } - } - - if (!var9.isIf3) { // L: 10795 - if (Client.clickedWidget != null || JagexCache.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10796 - 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: 10797 - if (var9.mouseOverRedirect >= 0) { // L: 10798 - Canvas.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - Canvas.mousedOverWidgetIf1 = var9; // L: 10799 - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10801 - GrandExchangeOffer.field100 = var9; // L: 10802 - } - - if (var9.scrollHeight > var9.height) { // L: 10804 - PrivateChatMode.method6107(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { // L: 10806 - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10807 - if (var9.children != null) { // L: 10808 - 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: 10809 - if (var28 != null) { // L: 10810 - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10811 - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10812 - if (var29.isMouseInputEvent) { // L: 10813 - var29.remove(); // L: 10814 - var29.widget.containsMouse = false; // L: 10815 - } - } - - if (PlayerComposition.widgetDragDuration == 0) { // L: 10818 - Client.clickedWidget = null; // L: 10819 - Client.clickedWidgetParent = null; // L: 10820 - } - - if (!Client.isMenuOpen) { // L: 10822 - Player.addCancelMenuEntry(); // L: 10823 - } - } - - class22.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10826 - } - } - } - } - } - } - - } // L: 10830 -} diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java new file mode 100644 index 0000000000..66950202d5 --- /dev/null +++ b/runescape-client/src/main/java/class17.java @@ -0,0 +1,54 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("t") +public class class17 extends class14 { + @ObfuscatedName("f") + boolean field136; + @ObfuscatedName("o") + byte field133; + @ObfuscatedName("u") + byte field134; + @ObfuscatedName("p") + byte field132; + @ObfuscatedName("b") + byte field135; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class17(class2 var1) { + this.this$0 = var1; // L: 248 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field136 = var1.readUnsignedByte() == 1; // L: 251 + this.field133 = var1.readByte(); // L: 252 + this.field134 = var1.readByte(); // L: 253 + this.field132 = var1.readByte(); // L: 254 + this.field135 = var1.readByte(); // L: 255 + } // L: 256 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.field90 = this.field136; // L: 259 + var1.field84 = this.field133; // L: 260 + var1.field83 = this.field134; // L: 261 + var1.field86 = this.field132; // L: 262 + var1.field87 = this.field135; // L: 263 + } // L: 264 +} diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java deleted file mode 100644 index 6e6d5d5e8a..0000000000 --- a/runescape-client/src/main/java/class170.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("ff") -public interface class170 { -} diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java deleted file mode 100644 index c384e7e0ee..0000000000 --- a/runescape-client/src/main/java/class171.java +++ /dev/null @@ -1,291 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("fd") -public class class171 implements class170 { - @ObfuscatedName("ee") - @ObfuscatedGetter( - intValue = -853566565 - ) - @Export("js5Port") - static int js5Port; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;Lig;IZI)Lel;", - garbageValue = "-2064266261" - ) - @Export("loadFrames") - public static Frames loadFrames(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { - boolean var4 = true; // L: 11 - int[] var5 = var0.getGroupFileIds(var2); // L: 12 - - for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 - byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 - if (var7 == null) { // L: 15 - var4 = false; // L: 16 - } else { - int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 - byte[] var9; - if (var3) { // L: 21 - var9 = var1.getFile(0, var8); - } else { - var9 = var1.getFile(var8, 0); // L: 22 - } - - if (var9 == null) { // L: 23 - var4 = false; - } - } - } - - if (!var4) { // L: 25 - return null; - } else { - try { - return new Frames(var0, var1, var2, var3); // L: 27 - } catch (Exception var11) { // L: 29 - return null; // L: 30 - } - } - } - - @ObfuscatedName("fj") - @ObfuscatedSignature( - descriptor = "(Lcv;II)V", - garbageValue = "478475301" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - if (var0.field999 >= Client.cycle) { // L: 3504 - GrandExchangeEvent.method147(var0); - } else { - int var3; - int var4; - int var5; - int var7; - int var11; - if (var0.field1000 >= Client.cycle) { // L: 3505 - if (var0.field1000 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > InterfaceParent.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3506 - var11 = var0.field1000 - var0.field999; // L: 3507 - var3 = Client.cycle - var0.field999; // L: 3508 - var4 = var0.field1007 * 64 + var0.field992 * 128; // L: 3509 - var5 = var0.field1007 * 64 + var0.field952 * 128; // L: 3510 - int var6 = var0.field1007 * 64 + var0.field996 * 128; // L: 3511 - var7 = var0.field1007 * 64 + var0.field998 * 128; // L: 3512 - var0.x = (var3 * var6 + var4 * (var11 - var3)) / var11; // L: 3513 - var0.y = (var3 * var7 + var5 * (var11 - var3)) / var11; // L: 3514 - } - - var0.field989 = 0; // L: 3516 - var0.orientation = var0.field1001; // L: 3517 - var0.rotation = var0.orientation; // L: 3518 - } else { - var0.movementSequence = var0.idleSequence; // L: 3521 - if (var0.pathLength == 0) { // L: 3522 - var0.field989 = 0; // L: 3523 - } else { - label280: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3526 - SequenceDefinition var2 = InterfaceParent.SequenceDefinition_get(var0.sequence); // L: 3527 - if (var0.field1012 > 0 && var2.field3564 == 0) { // L: 3528 - ++var0.field989; // L: 3529 - break label280; // L: 3530 - } - - if (var0.field1012 <= 0 && var2.field3565 == 0) { // L: 3532 - ++var0.field989; // L: 3533 - break label280; // L: 3534 - } - } - - var11 = var0.x; // L: 3537 - var3 = var0.y; // L: 3538 - var4 = var0.field1007 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3539 - var5 = var0.field1007 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3540 - if (var11 < var4) { // L: 3541 - if (var3 < var5) { // L: 3542 - var0.orientation = 1280; - } else if (var3 > var5) { // L: 3543 - var0.orientation = 1792; - } else { - var0.orientation = 1536; // L: 3544 - } - } else if (var11 > var4) { // L: 3546 - if (var3 < var5) { // L: 3547 - var0.orientation = 768; - } else if (var3 > var5) { // L: 3548 - var0.orientation = 256; - } else { - var0.orientation = 512; // L: 3549 - } - } else if (var3 < var5) { // L: 3551 - var0.orientation = 1024; - } else if (var3 > var5) { // L: 3552 - var0.orientation = 0; - } - - byte var12 = var0.pathTraversed[var0.pathLength - 1]; // L: 3553 - if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3554 - var7 = var0.orientation - var0.rotation & 2047; // L: 3561 - if (var7 > 1024) { // L: 3562 - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; // L: 3563 - if (var7 >= -256 && var7 <= 256) { // L: 3564 - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { // L: 3565 - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { // L: 3566 - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { // L: 3567 - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; // L: 3568 - int var9 = 4; // L: 3569 - boolean var10 = true; // L: 3570 - if (var0 instanceof NPC) { // L: 3571 - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { // L: 3572 - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1006 != 0) { // L: 3573 - var9 = 2; - } - - if (var0.pathLength > 2) { // L: 3574 - var9 = 6; - } - - if (var0.pathLength > 3) { // L: 3575 - var9 = 8; - } - - if (var0.field989 > 0 && var0.pathLength > 1) { // L: 3576 - var9 = 8; // L: 3577 - --var0.field989; // L: 3578 - } - } else { - if (var0.pathLength > 1) { // L: 3582 - var9 = 6; - } - - if (var0.pathLength > 2) { // L: 3583 - var9 = 8; - } - - if (var0.field989 > 0 && var0.pathLength > 1) { // L: 3584 - var9 = 8; // L: 3585 - --var0.field989; // L: 3586 - } - } - - if (var12 == 2) { // L: 3589 - var9 <<= 1; - } - - if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3590 - var0.movementSequence = var0.runSequence; - } - - if (var4 != var11 || var5 != var3) { // L: 3591 - if (var11 < var4) { // L: 3592 - var0.x += var9; // L: 3593 - if (var0.x > var4) { // L: 3594 - var0.x = var4; - } - } else if (var11 > var4) { // L: 3596 - var0.x -= var9; // L: 3597 - if (var0.x < var4) { // L: 3598 - var0.x = var4; - } - } - - if (var3 < var5) { // L: 3600 - var0.y += var9; // L: 3601 - if (var0.y > var5) { // L: 3602 - var0.y = var5; - } - } else if (var3 > var5) { // L: 3604 - var0.y -= var9; // L: 3605 - if (var0.y < var5) { // L: 3606 - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { // L: 3609 - --var0.pathLength; // L: 3610 - if (var0.field1012 > 0) { - --var0.field1012; // L: 3611 - } - } - } else { - var0.x = var4; // L: 3555 - var0.y = var5; // L: 3556 - --var0.pathLength; // L: 3557 - if (var0.field1012 > 0) { // L: 3558 - --var0.field1012; - } - } - } - } - } - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3614 - var0.sequence = -1; // L: 3615 - var0.spotAnimation = -1; // L: 3616 - var0.field999 = 0; // L: 3617 - var0.field1000 = 0; // L: 3618 - var0.x = var0.pathX[0] * 128 + var0.field1007 * 64; // L: 3619 - var0.y = var0.field1007 * 64 + var0.pathY[0] * 128; // L: 3620 - var0.method1848(); // L: 3621 - } - - if (UserComparator9.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3623 3624 - var0.sequence = -1; // L: 3625 - var0.spotAnimation = -1; // L: 3626 - var0.field999 = 0; // L: 3627 - var0.field1000 = 0; // L: 3628 - var0.x = var0.field1007 * 64 + var0.pathX[0] * 128; // L: 3629 - var0.y = var0.pathY[0] * 128 + var0.field1007 * 64; // L: 3630 - var0.method1848(); // L: 3631 - } - - GameObject.method3453(var0); // L: 3634 - Players.method2286(var0); // L: 3635 - } // L: 3636 - - @ObfuscatedName("gi") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-654550315" - ) - static final int method3639() { - if (WorldMapSectionType.clientPreferences.roofsHidden) { // L: 4411 - return class90.Client_plane; - } else { - int var0 = WorldMapRegion.getTileHeight(SecureRandomFuture.cameraX, ObjectSound.cameraZ, class90.Client_plane); // L: 4412 - return var0 - ArchiveLoader.cameraY < 800 && (Tiles.Tiles_renderFlags[class90.Client_plane][SecureRandomFuture.cameraX >> 7][ObjectSound.cameraZ >> 7] & 4) != 0 ? class90.Client_plane : 3; // L: 4413 4414 - } - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - @Export("updateSoundEffectVolume") - static final void updateSoundEffectVolume(int var0) { - var0 = Math.min(Math.max(var0, 0), 127); // L: 11112 - WorldMapSectionType.clientPreferences.soundEffectsVolume = var0; // L: 11113 - class23.savePreferences(); // L: 11114 - } // L: 11115 -} \ No newline at end of file diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java new file mode 100644 index 0000000000..867ae7f507 --- /dev/null +++ b/runescape-client/src/main/java/class18.java @@ -0,0 +1,197 @@ +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("v") +public class class18 extends class14 { + @ObfuscatedName("gq") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("gt") + @ObfuscatedGetter( + intValue = -1941852289 + ) + static int field145; + @ObfuscatedName("gc") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("crossSprites") + static SpritePixels[] crossSprites; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1821299355 + ) + int field140; + @ObfuscatedName("o") + boolean field141; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class18(class2 var1) { + this.this$0 = var1; + this.field140 = -1; // L: 178 + } // L: 181 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field140 = var1.readUnsignedShort(); // L: 184 + this.field141 = var1.readUnsignedByte() == 1; // L: 185 + } // L: 186 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method153(this.field140, this.field141); // L: 189 + } // L: 190 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;Lir;I)Z", + garbageValue = "1246242383" + ) + public static boolean method280(AbstractArchive var0, AbstractArchive var1) { + WorldMapElement.WorldMapElement_archive = var1; // L: 44 + if (!var0.isFullyLoaded()) { // L: 45 + return false; + } else { + class370.WorldMapElement_count = var0.getGroupFileCount(35); + GrandExchangeOfferNameComparator.WorldMapElement_cached = new WorldMapElement[class370.WorldMapElement_count]; // L: 49 + + for (int var2 = 0; var2 < class370.WorldMapElement_count; ++var2) { // L: 50 + byte[] var3 = var0.takeFile(35, var2); // L: 51 + GrandExchangeOfferNameComparator.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52 + if (var3 != null) { // L: 53 + GrandExchangeOfferNameComparator.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54 + GrandExchangeOfferNameComparator.WorldMapElement_cached[var2].method4907(); // L: 55 + } + } + + return true; // L: 58 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-608674034" + ) + @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 + } + } + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-17" + ) + static void method282() { + Login.Login_username = Login.Login_username.trim(); // L: 700 + if (Login.Login_username.length() == 0) { // L: 701 + class9.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 702 + } else { + long var1 = ObjectSound.method1798(); // L: 706 + int var0; + if (0L == var1) { // L: 707 + var0 = 5; + } else { + var0 = class19.method297(var1, Login.Login_username); // L: 708 + } + + switch(var0) { // L: 709 + case 2: + class9.setLoginResponseString(Strings.field2961, Strings.field2955, Strings.field3183); // L: 711 + Login.loginIndex = 6; // L: 712 + break; + case 3: + class9.setLoginResponseString("", "Error connecting to server.", ""); // L: 721 + break; // L: 722 + case 4: + class9.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 715 + break; // L: 716 + case 5: + class9.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 718 + break; // L: 719 + case 6: + class9.setLoginResponseString("", "Error connecting to server.", ""); // L: 727 + break; + case 7: + class9.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: 724 + } + + } + } // L: 703 730 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "11" + ) + static void method283() { + if (WorldMapAreaData.loadWorlds()) { // L: 1383 + Login.worldSelectOpen = true; // L: 1384 + Login.worldSelectPage = 0; // L: 1385 + Login.worldSelectPagesCount = 0; // L: 1386 + } + + } // L: 1388 +} diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java deleted file mode 100644 index 185c81086c..0000000000 --- a/runescape-client/src/main/java/class182.java +++ /dev/null @@ -1,307 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gl") -public class class182 { - @ObfuscatedName("d") - @Export("directions") - public static int[][] directions; - @ObfuscatedName("c") - @Export("distances") - public static int[][] distances; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1969487819 - ) - public static int field2118; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 512804251 - ) - public static int field2124; - @ObfuscatedName("e") - @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("q") - @Export("bufferY") - public static int[] bufferY; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ldy;" - ) - @Export("soundCache") - public static SoundCache soundCache; - - static { - directions = new int[128][128]; // L: 6 - distances = new int[128][128]; // L: 7 - bufferX = new int[4096]; // L: 11 - bufferY = new int[4096]; // L: 12 - } - - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "(ZLkd;B)V", - garbageValue = "-1" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field851 = 0; // L: 7561 - Client.field725 = 0; // L: 7562 - PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 7564 - var2.importIndex(); // L: 7565 - int var3 = var2.readBits(8); // L: 7566 - int var4; - if (var3 < Client.npcCount) { // L: 7567 - for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 7568 - Client.field845[++Client.field851 - 1] = Client.npcIndices[var4]; - } - } - - if (var3 > Client.npcCount) { // L: 7570 - throw new RuntimeException(""); - } else { - Client.npcCount = 0; // L: 7571 - - int var5; - int var7; - int var8; - int var9; - int var10; - int var11; - for (var4 = 0; var4 < var3; ++var4) { // L: 7572 - var5 = Client.npcIndices[var4]; // L: 7573 - NPC var16 = Client.npcs[var5]; // L: 7574 - var7 = var2.readBits(1); // L: 7575 - if (var7 == 0) { // L: 7576 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7577 - var16.npcCycle = Client.cycle; // L: 7578 - } else { - var8 = var2.readBits(2); // L: 7581 - if (var8 == 0) { // L: 7582 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7583 - var16.npcCycle = Client.cycle; // L: 7584 - Client.field697[++Client.field725 - 1] = var5; // L: 7585 - } else if (var8 == 1) { // L: 7588 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7589 - var16.npcCycle = Client.cycle; // L: 7590 - var9 = var2.readBits(3); // L: 7591 - var16.method2178(var9, (byte)1); // L: 7592 - var10 = var2.readBits(1); // L: 7593 - if (var10 == 1) { // L: 7594 - Client.field697[++Client.field725 - 1] = var5; - } - } else if (var8 == 2) { // L: 7597 - Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7598 - var16.npcCycle = Client.cycle; // L: 7599 - var9 = var2.readBits(3); // L: 7600 - var16.method2178(var9, (byte)2); // L: 7601 - var10 = var2.readBits(3); // L: 7602 - var16.method2178(var10, (byte)2); // L: 7603 - var11 = var2.readBits(1); // L: 7604 - if (var11 == 1) { // L: 7605 - Client.field697[++Client.field725 - 1] = var5; - } - } else if (var8 == 3) { // L: 7608 - Client.field845[++Client.field851 - 1] = var5; // L: 7609 - } - } - } - - SpriteMask.method4174(var0, var1); // L: 7614 - - int var14; - for (var14 = 0; var14 < Client.field725; ++var14) { // L: 7616 - var3 = Client.field697[var14]; // L: 7617 - NPC var15 = Client.npcs[var3]; // L: 7618 - var5 = var1.readUnsignedByte(); // L: 7619 - if ((var5 & 16) != 0) { // L: 7620 - var15.field992 = var1.method5721(); // L: 7621 - var15.field952 = var1.method5721(); // L: 7622 - var15.field996 = var1.method5747(); // L: 7623 - var15.field998 = var1.readByte(); // L: 7624 - var15.field999 = var1.readUnsignedShort() + Client.cycle; // L: 7625 - var15.field1000 = var1.method5729() + Client.cycle; // L: 7626 - var15.field1001 = var1.method5729(); // L: 7627 - var15.pathLength = 1; // L: 7628 - var15.field1012 = 0; // L: 7629 - var15.field992 += var15.pathX[0]; // L: 7630 - var15.field952 += var15.pathY[0]; // L: 7631 - var15.field996 += var15.pathX[0]; // L: 7632 - var15.field998 += var15.pathY[0]; // L: 7633 - } - - int var6; - if ((var5 & 1) != 0) { // L: 7635 - var15.spotAnimation = var1.method5727(); // L: 7636 - var6 = var1.readInt(); // L: 7637 - var15.field994 = var6 >> 16; // L: 7638 - var15.field993 = (var6 & 65535) + Client.cycle; // L: 7639 - var15.spotAnimationFrame = 0; // L: 7640 - var15.spotAnimationFrameCycle = 0; // L: 7641 - if (var15.field993 > Client.cycle) { // L: 7642 - var15.spotAnimationFrame = -1; - } - - if (var15.spotAnimation == 65535) { // L: 7643 - var15.spotAnimation = -1; - } - } - - if ((var5 & 2) != 0) { // L: 7645 - var15.definition = class90.getNpcDefinition(var1.method5728()); // L: 7646 - var15.field1007 = var15.definition.size; // L: 7647 - var15.field1006 = var15.definition.rotation; // L: 7648 - var15.walkSequence = var15.definition.walkSequence; // L: 7649 - var15.walkBackSequence = var15.definition.walkBackSequence; // L: 7650 - var15.walkLeftSequence = var15.definition.walkLeftSequence; // L: 7651 - var15.walkRightSequence = var15.definition.walkRightSequence; // L: 7652 - var15.idleSequence = var15.definition.idleSequence; // L: 7653 - var15.turnLeftSequence = var15.definition.turnLeftSequence; // L: 7654 - var15.turnRightSequence = var15.definition.turnRightSequence; // L: 7655 - } - - if ((var5 & 4) != 0) { // L: 7657 - var6 = var1.method5727(); // L: 7658 - if (var6 == 65535) { // L: 7659 - var6 = -1; - } - - var7 = var1.method5717(); // L: 7660 - if (var6 == var15.sequence && var6 != -1) { // L: 7661 - var8 = InterfaceParent.SequenceDefinition_get(var6).field3548; // L: 7662 - if (var8 == 1) { // L: 7663 - var15.sequenceFrame = 0; // L: 7664 - var15.sequenceFrameCycle = 0; // L: 7665 - var15.sequenceDelay = var7; // L: 7666 - var15.field973 = 0; // L: 7667 - } - - if (var8 == 2) { // L: 7669 - var15.field973 = 0; // L: 7670 - } - } else if (var6 == -1 || var15.sequence == -1 || InterfaceParent.SequenceDefinition_get(var6).field3560 >= InterfaceParent.SequenceDefinition_get(var15.sequence).field3560) { // L: 7673 - var15.sequence = var6; // L: 7674 - var15.sequenceFrame = 0; // L: 7675 - var15.sequenceFrameCycle = 0; // L: 7676 - var15.sequenceDelay = var7; // L: 7677 - var15.field973 = 0; // L: 7678 - var15.field1012 = var15.pathLength; // L: 7679 - } - } - - if ((var5 & 128) != 0) { // L: 7683 - var6 = var1.readUnsignedByte(); // L: 7684 - int var12; - if (var6 > 0) { // L: 7685 - for (var7 = 0; var7 < var6; ++var7) { // L: 7686 - var9 = -1; // L: 7688 - var10 = -1; // L: 7689 - var11 = -1; // L: 7690 - var8 = var1.readUShortSmart(); // L: 7691 - if (var8 == 32767) { // L: 7692 - var8 = var1.readUShortSmart(); // L: 7693 - var10 = var1.readUShortSmart(); // L: 7694 - var9 = var1.readUShortSmart(); // L: 7695 - var11 = var1.readUShortSmart(); // L: 7696 - } else if (var8 != 32766) { // L: 7698 - var10 = var1.readUShortSmart(); // L: 7699 - } else { - var8 = -1; // L: 7701 - } - - var12 = var1.readUShortSmart(); // L: 7702 - var15.addHitSplat(var8, var10, var9, var11, Client.cycle, var12); // L: 7703 - } - } - - var7 = var1.method5717(); // L: 7706 - if (var7 > 0) { // L: 7707 - for (var8 = 0; var8 < var7; ++var8) { // L: 7708 - var9 = var1.readUShortSmart(); // L: 7709 - var10 = var1.readUShortSmart(); // L: 7710 - if (var10 != 32767) { // L: 7711 - var11 = var1.readUShortSmart(); // L: 7712 - var12 = var1.method5776(); // L: 7713 - int var13 = var10 > 0 ? var1.method5717() : var12; // L: 7714 - var15.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); // L: 7715 - } else { - var15.removeHealthBar(var9); // L: 7717 - } - } - } - } - - if ((var5 & 32) != 0) { // L: 7721 - var6 = var1.method5727(); // L: 7722 - var7 = var1.readUnsignedShort(); // L: 7723 - var8 = var15.x - (var6 - GrandExchangeOfferNameComparator.baseX - GrandExchangeOfferNameComparator.baseX) * 64; // L: 7724 - var9 = var15.y - (var7 - NetCache.baseY - NetCache.baseY) * 64; // L: 7725 - if (var8 != 0 || var9 != 0) { // L: 7726 - var15.field981 = (int)(Math.atan2((double)var8, (double)var9) * 325.949D) & 2047; - } - } - - if ((var5 & 64) != 0) { // L: 7728 - var15.targetIndex = var1.method5727(); // L: 7729 - if (var15.targetIndex == 65535) { // L: 7730 - var15.targetIndex = -1; - } - } - - if ((var5 & 8) != 0) { // L: 7732 - var15.overheadText = var1.readStringCp1252NullTerminated(); // L: 7733 - var15.overheadTextCyclesRemaining = 100; // L: 7734 - } - } - - for (var14 = 0; var14 < Client.field851; ++var14) { // L: 7738 - var3 = Client.field845[var14]; // L: 7739 - if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7740 - Client.npcs[var3].definition = null; // L: 7741 - Client.npcs[var3] = null; // L: 7742 - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7745 - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var14 = 0; var14 < Client.npcCount; ++var14) { // L: 7746 - if (Client.npcs[Client.npcIndices[var14]] == null) { // L: 7747 - throw new RuntimeException(var14 + "," + Client.npcCount); // L: 7748 - } - } - - } - } - } // L: 7751 - - @ObfuscatedName("ia") - @ObfuscatedSignature( - descriptor = "([Lhz;Lhz;ZI)V", - garbageValue = "-379515741" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1633062311 * 262059497 : var1.width * 150294487 * -1593306137; // L: 9940 - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1576927071 * 2058362015 : var1.height * -937018705 * -1510777777; // L: 9941 - ObjectSound.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9942 - if (var1.children != null) { // L: 9943 - ObjectSound.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9944 - if (var5 != null) { // L: 9945 - int var6 = var5.group; // L: 9946 - if (WorldMapCacheName.loadInterface(var6)) { // L: 9948 - ObjectSound.resizeInterface(DefaultsGroup.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 9949 - } - } - - if (var1.contentType == 1337) { // L: 9952 - } - - } // L: 9953 -} diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java new file mode 100644 index 0000000000..2ba899ea80 --- /dev/null +++ b/runescape-client/src/main/java/class19.java @@ -0,0 +1,522 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("x") +public class class19 { + @ObfuscatedName("qg") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("sceneMinimapSprite") + static SpritePixels sceneMinimapSprite; + @ObfuscatedName("sz") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lm;" + ) + static class11 field154; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = 1889962401 + ) + public static int field146; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = -5318855028300081739L + ) + long field153; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 5401092564904583073L + ) + long field147; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljc;" + ) + IterableNodeDeque field152; + + @ObfuscatedSignature( + descriptor = "(Lnu;)V" + ) + public class19(Buffer var1) { + this.field147 = -1L; // L: 9 + this.field152 = new IterableNodeDeque(); // L: 10 + this.method291(var1); // L: 18 + } // L: 19 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;B)V", + garbageValue = "-82" + ) + void method291(Buffer var1) { + this.field153 = var1.readLong(); // L: 22 + this.field147 = var1.readLong(); // L: 23 + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 24 25 35 + Object var3; + if (var2 == 1) { // L: 27 + var3 = new class12(this); + } else if (var2 == 4) { + var3 = new class7(this); // L: 28 + } else if (var2 == 3) { // L: 29 + var3 = new class5(this); + } else if (var2 == 2) { // L: 30 + var3 = new class20(this); + } else { + if (var2 != 5) { // L: 31 + throw new RuntimeException(""); // L: 32 + } + + var3 = new class25(this); + } + + ((class16)var3).vmethod356(var1); // L: 33 + this.field152.addFirst((Node)var3); // L: 34 + } + + } // L: 37 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1921642195" + ) + public void method286(class3 var1) { + if (var1.key == this.field153 && var1.field29 == this.field147) { // L: 40 + for (class16 var2 = (class16)this.field152.last(); var2 != null; var2 = (class16)this.field152.previous()) { // L: 41 + var2.vmethod352(var1); // L: 42 + } + + ++var1.field29; // L: 44 + } else { + throw new RuntimeException(""); + } + } // L: 45 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lkj;", + garbageValue = "1093888475" + ) + @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(); // L: 76 + 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("f") + @ObfuscatedSignature( + descriptor = "(Lcj;I)V", + garbageValue = "1133701143" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + FaceNormal.runScript(var0, 500000, 475000); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(JLjava/lang/String;I)I", + garbageValue = "2001653528" + ) + static final int method297(long var0, String var2) { + Random var3 = new Random(); // L: 65 + Buffer var4 = new Buffer(128); // L: 66 + Buffer var5 = new Buffer(128); // L: 67 + int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0}; // L: 68 69 70 71 72 + var4.writeByte(10); + + int var7; + for (var7 = 0; var7 < 4; ++var7) { // L: 74 + var4.writeInt(var3.nextInt()); // L: 75 + } + + var4.writeInt(var6[0]); // L: 77 + var4.writeInt(var6[1]); // L: 78 + var4.writeLong(var0); // L: 79 + var4.writeLong(0L); // L: 80 + + for (var7 = 0; var7 < 4; ++var7) { // L: 81 + var4.writeInt(var3.nextInt()); // L: 82 + } + + var4.encryptRsa(class80.field965, class80.field964); // 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 { + byte[] var18 = Tile.method3356(); // L: 96 + var5.writeBytes(var18, 0, var18.length); // L: 97 + } + + var5.writeLong(var3.nextLong()); // L: 99 + var5.encryptRsa(class80.field965, class80.field964); // L: 100 + var7 = Friend.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(var8.offset + var5.offset + var4.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 + byte[] var11 = var9.array; // L: 116 + String var10 = VarcInt.method4940(var11, 0, var11.length); // L: 118 + String var12 = var10; // L: 120 + + try { + URL var13 = new URL(FontName.method6285("services", false) + "m=accountappeal/login.ws"); // L: 122 + URLConnection var14 = var13.openConnection(); // L: 123 + var14.setDoInput(true); // L: 124 + var14.setDoOutput(true); // L: 125 + var14.setConnectTimeout(5000); // L: 126 + OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); // L: 127 + var15.write("data2=" + class239.method4384(var12) + "&dest=" + class239.method4384("passwordchoice.ws")); // L: 128 + var15.flush(); // L: 129 + InputStream var16 = var14.getInputStream(); // L: 130 + var9 = new Buffer(new byte[1000]); // L: 131 + + do { + int var17 = var16.read(var9.array, var9.offset, 1000 - var9.offset); // L: 133 + if (var17 == -1) { // L: 134 + var15.close(); // L: 140 + var16.close(); // L: 141 + String var19 = new String(var9.array); // L: 142 + if (var19.startsWith("OFFLINE")) { // L: 143 + return 4; // L: 144 + } else if (var19.startsWith("WRONG")) { // L: 146 + return 7; // L: 147 + } else if (var19.startsWith("RELOAD")) { // L: 149 + return 3; // L: 150 + } else if (var19.startsWith("Not permitted for social network accounts.")) { // L: 152 + return 6; // L: 153 + } else { + var9.xteaDecryptAll(var6); // L: 155 + + while (var9.offset > 0 && var9.array[var9.offset - 1] == 0) { // L: 156 + --var9.offset; // L: 157 + } + + var19 = new String(var9.array, 0, var9.offset); // L: 159 + if (MusicPatchPcmStream.method4150(var19)) { // L: 160 + class302.openURL(var19, true, false); // L: 161 + return 2; // L: 162 + } else { + return 5; // L: 164 + } + } + } + + var9.offset += var17; // L: 135 + } while(var9.offset < 1000); // L: 136 + + return 5; // L: 137 + } catch (Throwable var20) { // L: 166 + var20.printStackTrace(); // L: 167 + return 5; // L: 168 + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-210463060" + ) + public static void method284() { + try { + JagexCache.JagexCache_dat2File.close(); // L: 293 + + for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { // L: 294 + PendingSpawn.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 295 + JagexCache.JagexCache_randomDat.close(); // L: 296 + } catch (Exception var2) { // L: 298 + } + + } // L: 299 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "0" + ) + public static int method295(int var0) { + return WorldMapSection1.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 73 + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-631164779" + ) + static int method285(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3156 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3157 + return 1; // L: 3158 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3160 + class16.Interpreter_intStackSize -= 3; // L: 3161 + Client.publicChatMode = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3162 + Canvas.privateChatMode = MidiPcmStream.method3952(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3163 + if (Canvas.privateChatMode == null) { // L: 3164 + Canvas.privateChatMode = PrivateChatMode.field3891; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 3165 + PacketBufferNode var13 = ObjectComposition.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); // L: 3167 + var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3168 + var13.packetBuffer.writeByte(Canvas.privateChatMode.field3890); // L: 3169 + var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3170 + Client.packetWriter.addNode(var13); // L: 3171 + return 1; // L: 3172 + } else { + PacketBufferNode var6; + int var7; + String var8; + int var9; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3174 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3175 + class16.Interpreter_intStackSize -= 2; // L: 3176 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3177 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3178 + var6 = ObjectComposition.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); // L: 3180 + var6.packetBuffer.writeByte(Friend.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3181 + var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3182 + var6.packetBuffer.writeByte(var7 - 1); // L: 3183 + var6.packetBuffer.writeByte(var9); // L: 3184 + Client.packetWriter.addNode(var6); // L: 3185 + return 1; // L: 3186 + } else { + int var3; + Message var5; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3188 + class16.Interpreter_intStackSize -= 2; // L: 3189 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3190 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3191 + var5 = UserComparator5.Messages_getByChannelAndID(var3, var7); // L: 3192 + if (var5 != null) { // L: 3193 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.count; // L: 3194 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.cycle; // L: 3195 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3196 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3197 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3198 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3199 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3202 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3203 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3204 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3205 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3206 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3207 + } + + return 1; // L: 3209 + } else { + Message var4; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3211 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3212 + var4 = class301.Messages_getMessage(var3); // L: 3213 + if (var4 != null) { // L: 3214 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.type; // L: 3215 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.cycle; // L: 3216 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3217 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3218 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3219 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3220 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3223 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3224 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3225 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3226 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3227 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3228 + } + + return 1; // L: 3230 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3232 + if (Canvas.privateChatMode == null) { // L: 3233 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Canvas.privateChatMode.field3890; // L: 3234 + } + + return 1; // L: 3235 + } else { + PacketBufferNode var12; + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3237 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3238 + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3239 + var12 = class7.method100(var7, var8, class35.clientLanguage, -1); // L: 3240 + Client.packetWriter.addNode(var12); // L: 3241 + return 1; // L: 3242 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3244 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3245 + var8 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3246 + String var11 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3247 + var12 = ObjectComposition.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); // L: 3249 + var12.packetBuffer.writeShort(0); // L: 3250 + int var10 = var12.packetBuffer.offset; // L: 3251 + var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3252 + class2.method34(var12.packetBuffer, var11); // L: 3253 + var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3254 + Client.packetWriter.addNode(var12); // L: 3255 + return 1; // L: 3256 + } else if (var0 == 5010) { // L: 3258 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3259 + class16.Interpreter_intStackSize -= 2; // L: 3260 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3261 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3262 + var6 = class7.method100(var7, var8, class35.clientLanguage, var9); // L: 3263 + Client.packetWriter.addNode(var6); // L: 3264 + return 1; // L: 3265 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3267 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3274 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3275 + return 1; // L: 3276 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3278 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3279 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = DirectByteArrayCopier.Messages_getHistorySize(var3); // L: 3280 + return 1; // L: 3281 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3283 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3284 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ChatChannel.Messages_getLastChatID(var3); // L: 3285 + return 1; // L: 3286 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3288 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3289 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class44.method520(var3); // L: 3290 + return 1; // L: 3291 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3293 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3294 + Messages.doCheat(var8); // L: 3295 + return 1; // L: 3296 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3298 + Client.field824 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3299 + return 1; // L: 3300 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3302 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field824; // L: 3303 + return 1; // L: 3304 + } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3306 + var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3307 + System.out.println(var8); // L: 3308 + return 1; // L: 3309 + } else if (var0 == 5024) { // L: 3311 + --class16.Interpreter_intStackSize; // L: 3312 + return 1; // L: 3313 + } else if (var0 == 5025) { // L: 3315 + ++class16.Interpreter_intStackSize; // L: 3316 + return 1; // L: 3317 + } else if (var0 == 5030) { // L: 3319 + class16.Interpreter_intStackSize -= 2; // L: 3320 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3321 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3322 + var5 = UserComparator5.Messages_getByChannelAndID(var3, var7); // L: 3323 + if (var5 != null) { // L: 3324 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.count; // L: 3325 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.cycle; // L: 3326 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3327 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3328 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3329 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3330 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3331 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3332 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3335 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3336 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3337 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3338 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3339 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3340 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3341 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3342 + } + + return 1; // L: 3344 + } else if (var0 == 5031) { // L: 3346 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3347 + var4 = class301.Messages_getMessage(var3); // L: 3348 + if (var4 != null) { // L: 3349 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.type; // L: 3350 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.cycle; // L: 3351 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3352 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3353 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3354 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3355 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3356 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3357 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3360 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3361 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3362 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3363 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3364 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3365 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3366 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3367 + } + + return 1; // L: 3369 + } else { + return 2; // L: 3371 + } + } else { + if (Varcs.localPlayer != null && Varcs.localPlayer.username != null) { // L: 3269 + var8 = Varcs.localPlayer.username.getName(); + } else { + var8 = ""; // L: 3270 + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8; // L: 3271 + return 1; // L: 3272 + } + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java deleted file mode 100644 index 01e0954276..0000000000 --- a/runescape-client/src/main/java/class190.java +++ /dev/null @@ -1,5 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("gu") -public interface class190 { -} diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java new file mode 100644 index 0000000000..2d7486d555 --- /dev/null +++ b/runescape-client/src/main/java/class191.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("gi") +public interface class191 extends class193 { +} diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java new file mode 100644 index 0000000000..6a73af0785 --- /dev/null +++ b/runescape-client/src/main/java/class192.java @@ -0,0 +1,21 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gd") +public abstract class class192 implements class194 { + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1232944215 + ) + protected int field2198; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Lgy;", + garbageValue = "-371233609" + ) + static PacketBufferNode method3812() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 + } +} diff --git a/runescape-client/src/main/java/class193.java b/runescape-client/src/main/java/class193.java new file mode 100644 index 0000000000..c6594b68b6 --- /dev/null +++ b/runescape-client/src/main/java/class193.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("gq") +public interface class193 { +} diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 07f30b502f..6bc433881f 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,102 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") -public class class194 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2348; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2354; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2347; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2356; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2350; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2351; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2352; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2353; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2346; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgs;" - ) - public static final class194 field2355; - - static { - field2348 = new class194(3); // L: 5 - field2354 = new class194(4); // L: 6 - field2347 = new class194(6); // L: 7 - field2356 = new class194(5); // L: 8 - field2350 = new class194(14); // L: 9 - field2351 = new class194(7); // L: 10 - field2352 = new class194(15); // L: 11 - field2353 = new class194(4); // L: 12 - field2346 = new class194(5); // L: 13 - field2355 = new class194(2); // L: 14 - } - - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "3" - ) - class194(int var1) { - } // L: 20 - - @ObfuscatedName("jc") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-921891961" - ) - static final void method3820(int var0) { - var0 = Math.min(Math.max(var0, 0), 255); // L: 11092 - if (var0 != WorldMapSectionType.clientPreferences.musicVolume) { // L: 11093 - if (WorldMapSectionType.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11094 - ReflectionCheck.method2450(UrlRequester.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11095 - Client.field899 = false; // L: 11096 - } else if (var0 == 0) { // L: 11098 - ScriptEvent.method1272(); // L: 11099 - Client.field899 = false; // L: 11100 - } else if (class206.musicPlayerStatus != 0) { // L: 11103 - DevicePcmPlayerProvider.musicTrackVolume = var0; - } else { - VertexNormal.midiPcmStream.setPcmStreamVolume(var0); // L: 11104 - } - - WorldMapSectionType.clientPreferences.musicVolume = var0; // L: 11106 - class23.savePreferences(); // L: 11107 - } - - } // L: 11109 +@ObfuscatedName("gp") +public interface class194 extends Iterable { } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index d943807940..e3ed638b2e 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,378 +1,7 @@ -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("gn") -public class class195 { - @ObfuscatedName("lm") - @ObfuscatedSignature( - descriptor = "Lce;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("mn") - @ObfuscatedGetter( - intValue = -1672788449 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - - @ObfuscatedName("aj") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1282000590" - ) - static int method3821(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { // L: 3554 - var3 = class90.Client_plane; // L: 3555 - int var15 = (UserComparator9.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX; // L: 3556 - int var8 = (UserComparator9.localPlayer.y >> 7) + NetCache.baseY; // L: 3557 - WorldMapSection0.getWorldMap().method6530(var3, var15, var8, true); // L: 3558 - return 1; // L: 3559 - } else { - WorldMapArea var9; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3561 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3562 - String var16 = ""; // L: 3563 - var9 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3564 - if (var9 != null) { // L: 3565 - var16 = var9.getExternalName(); // L: 3566 - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; // L: 3568 - return 1; // L: 3569 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3571 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3572 - WorldMapSection0.getWorldMap().setCurrentMapAreaId(var3); // L: 3573 - return 1; // L: 3574 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3576 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getZoomLevel(); // L: 3577 - return 1; // L: 3578 - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3580 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3581 - WorldMapSection0.getWorldMap().setZoomPercentage(var3); // L: 3582 - return 1; // L: 3583 - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3585 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3586 - return 1; // L: 3587 - } else { - Coord var14; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3589 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3590 - WorldMapSection0.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3591 - return 1; // L: 3592 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3594 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3595 - WorldMapSection0.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3596 - return 1; // L: 3597 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3599 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3600 - WorldMapSection0.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3601 - return 1; // L: 3602 - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3604 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3605 - WorldMapSection0.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3606 - return 1; // L: 3607 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3609 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayX(); // L: 3610 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayY(); // L: 3611 - return 1; // L: 3612 - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3614 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3615 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3616 - if (var11 == null) { // L: 3617 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3618 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3621 - } - - return 1; // L: 3623 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3625 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3626 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3627 - if (var11 == null) { // L: 3628 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3629 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3630 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3633 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3634 - } - - return 1; // L: 3636 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3638 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3639 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3640 - if (var11 == null) { // L: 3641 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3642 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3643 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3644 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3645 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3648 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3649 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3650 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3651 - } - - return 1; // L: 3653 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3655 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3656 - var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3657 - if (var11 == null) { // L: 3658 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3659 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3662 - } - - return 1; // L: 3664 - } else if (var0 == 6615) { // L: 3666 - var14 = WorldMapSection0.getWorldMap().getDisplayCoord(); // L: 3667 - if (var14 == null) { // L: 3668 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3669 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3670 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; // L: 3673 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; // L: 3674 - } - - return 1; // L: 3676 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3678 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().currentMapAreaId(); // L: 3679 - return 1; // L: 3680 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3682 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3683 - var11 = WorldMapSection0.getWorldMap().getCurrentMapArea(); // L: 3684 - if (var11 == null) { // L: 3685 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3686 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3687 - return 1; // L: 3688 - } else { - int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3690 - if (var12 == null) { // L: 3691 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3692 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3693 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; // L: 3696 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; // L: 3697 - } - - return 1; // L: 3699 - } - } else { - Coord var5; - if (var0 == 6618) { // L: 3701 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3702 - var11 = WorldMapSection0.getWorldMap().getCurrentMapArea(); // L: 3703 - if (var11 == null) { // L: 3704 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3705 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3706 - return 1; // L: 3707 - } else { - var5 = var11.coord(var14.x, var14.y); // L: 3709 - if (var5 == null) { // L: 3710 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3711 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 3714 - } - - return 1; // L: 3716 - } - } else { - Coord var10; - if (var0 == 6619) { // L: 3718 - Interpreter.Interpreter_intStackSize -= 2; // L: 3719 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3720 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3721 - GraphicsObject.method2154(var3, var10, false); // L: 3722 - return 1; // L: 3723 - } else if (var0 == 6620) { // L: 3725 - Interpreter.Interpreter_intStackSize -= 2; // L: 3726 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3727 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3728 - GraphicsObject.method2154(var3, var10, true); // L: 3729 - return 1; // L: 3730 - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3732 - Interpreter.Interpreter_intStackSize -= 2; // L: 3733 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3734 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3735 - var9 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3736 - if (var9 == null) { // L: 3737 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3738 - return 1; // L: 3739 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3741 - return 1; // L: 3742 - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3744 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayWith(); // L: 3745 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayHeight(); // L: 3746 - return 1; // L: 3747 - } else if (var0 == 6623) { // L: 3749 - var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3750 - var11 = WorldMapSection0.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3751 - if (var11 == null) { // L: 3752 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3753 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); // L: 3756 - } - - return 1; // L: 3758 - } else if (var0 == 6624) { // L: 3760 - WorldMapSection0.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3761 - return 1; // L: 3762 - } else if (var0 == 6625) { // L: 3764 - WorldMapSection0.getWorldMap().resetMaxFlashCount(); // L: 3765 - return 1; // L: 3766 - } else if (var0 == 6626) { // L: 3768 - WorldMapSection0.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3769 - return 1; // L: 3770 - } else if (var0 == 6627) { // L: 3772 - WorldMapSection0.getWorldMap().resetCyclesPerFlash(); // L: 3773 - return 1; // L: 3774 - } else { - boolean var13; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 3776 - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3777 - WorldMapSection0.getWorldMap().setPerpetualFlash(var13); // L: 3778 - return 1; // L: 3779 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 3781 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3782 - WorldMapSection0.getWorldMap().flashElement(var3); // L: 3783 - return 1; // L: 3784 - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 3786 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3787 - WorldMapSection0.getWorldMap().flashCategory(var3); // L: 3788 - return 1; // L: 3789 - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 3791 - WorldMapSection0.getWorldMap().stopCurrentFlashes(); // L: 3792 - return 1; // L: 3793 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 3795 - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3796 - WorldMapSection0.getWorldMap().setElementsDisabled(var13); // L: 3797 - return 1; // L: 3798 - } else { - boolean var7; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 3800 - Interpreter.Interpreter_intStackSize -= 2; // L: 3801 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3802 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3803 - WorldMapSection0.getWorldMap().disableElement(var3, var7); // L: 3804 - return 1; // L: 3805 - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 3807 - Interpreter.Interpreter_intStackSize -= 2; // L: 3808 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3809 - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3810 - WorldMapSection0.getWorldMap().setCategoryDisabled(var3, var7); // L: 3811 - return 1; // L: 3812 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 3814 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 3815 - return 1; // L: 3816 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 3818 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3819 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 3820 - return 1; // L: 3821 - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 3823 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3824 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 3825 - return 1; // L: 3826 - } else if (var0 == 6638) { // L: 3828 - Interpreter.Interpreter_intStackSize -= 2; // L: 3829 - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3830 - var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3831 - var5 = WorldMapSection0.getWorldMap().method6643(var3, var10); // L: 3832 - if (var5 == null) { // L: 3833 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3834 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 3837 - } - - return 1; // L: 3839 - } else { - AbstractWorldMapIcon var6; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 3841 - var6 = WorldMapSection0.getWorldMap().iconStart(); // L: 3842 - if (var6 == null) { // L: 3843 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3844 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3845 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3848 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3849 - } - - return 1; // L: 3851 - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 3853 - var6 = WorldMapSection0.getWorldMap().iconNext(); // L: 3854 - if (var6 == null) { // L: 3855 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3856 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3857 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3860 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3861 - } - - return 1; // L: 3863 - } else { - WorldMapElement var4; - if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 3865 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3866 - var4 = InvDefinition.WorldMapElement_get(var3); // L: 3867 - if (var4.name == null) { // L: 3868 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3869 - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; // L: 3872 - } - - return 1; // L: 3874 - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 3876 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3877 - var4 = InvDefinition.WorldMapElement_get(var3); // L: 3878 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; // L: 3879 - return 1; // L: 3880 - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 3882 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3883 - var4 = InvDefinition.WorldMapElement_get(var3); // L: 3884 - if (var4 == null) { // L: 3885 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3886 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; // L: 3889 - } - - return 1; // L: 3891 - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 3893 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3894 - var4 = InvDefinition.WorldMapElement_get(var3); // L: 3895 - if (var4 == null) { // L: 3896 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3897 - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; // L: 3900 - } - - return 1; // L: 3902 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 3904 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.worldMapEvent.mapElement; // L: 3905 - return 1; // L: 3906 - } else if (var0 == 6698) { // L: 3908 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.worldMapEvent.coord1.packed(); // L: 3909 - return 1; // L: 3910 - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 3912 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.worldMapEvent.coord2.packed(); // L: 3913 - return 1; // L: 3914 - } else { - return 2; // L: 3916 - } - } - } - } - } - } - } - } - } - } - } +@ObfuscatedName("gu") +public interface class195 { + @ObfuscatedName("f") + void method3814(Object var1); } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java deleted file mode 100644 index cc5571d569..0000000000 --- a/runescape-client/src/main/java/class197.java +++ /dev/null @@ -1,96 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("gr") -public class class197 { - @ObfuscatedName("qv") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("n") - static int[] field2375; - - static { - new Object(); - field2375 = new int[33]; // L: 8 - field2375[0] = 0; // L: 11 - int var0 = 2; // L: 12 - - for (int var1 = 1; var1 < 33; ++var1) { // L: 13 - field2375[var1] = var0 - 1; // L: 14 - var0 += var0; // L: 15 - } - - } // L: 17 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;B)V", - garbageValue = "52" - ) - public static void method3828(AbstractArchive var0) { - ParamComposition.ParamDefinition_archive = var0; // L: 21 - } // L: 22 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "1647502" - ) - static int method3844(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { // L: 735 - var0 -= 1000; // L: 736 - var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 737 - } else { - var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 739 - } - - IsaacCipher.invalidateWidget(var3); // L: 740 - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 741 - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 761 - var3.modelType = 2; // L: 762 - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 763 - return 1; // L: 764 - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 766 - var3.modelType = 3; // L: 767 - var3.modelId = UserComparator9.localPlayer.appearance.getChatHeadId(); // L: 768 - return 1; // L: 769 - } else { - return 2; // L: 771 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 742 - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 743 - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 744 - var3.itemId = var4; // L: 745 - var3.itemQuantity = var5; // L: 746 - ItemComposition var6 = class281.ItemDefinition_get(var4); // L: 747 - var3.modelAngleX = var6.xan2d; // L: 748 - var3.modelAngleY = var6.yan2d; // L: 749 - var3.modelAngleZ = var6.zan2d; // L: 750 - var3.modelOffsetX = var6.offsetX2d; // L: 751 - var3.modelOffsetY = var6.offsetY2d; // L: 752 - var3.modelZoom = var6.zoom2d; // L: 753 - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 754 - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 755 - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; // L: 756 - } - - if (var3.field2648 > 0) { // L: 757 - var3.modelZoom = var3.modelZoom * 32 / var3.field2648; - } else if (var3.rawWidth > 0) { // L: 758 - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; // L: 759 - } - } -} diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java deleted file mode 100644 index 3ea7ba53a2..0000000000 --- a/runescape-client/src/main/java/class198.java +++ /dev/null @@ -1,26 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gi") -public class class198 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkd;I)I", - garbageValue = "832734688" - ) - static int method3851(PacketBuffer var0) { - int var1 = var0.readBits(2); // L: 181 - int var2; - if (var1 == 0) { // L: 183 - var2 = 0; - } else if (var1 == 1) { // L: 184 - var2 = var0.readBits(5); - } else if (var1 == 2) { // L: 185 - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); // L: 186 - } - - return var2; // L: 187 - } -} diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index e7872b7851..7de837bbe9 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,87 +1,1052 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") -final class class2 implements class0 { - @ObfuscatedName("q") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Ldk;" +@ObfuscatedName("u") +public class class2 { + @ObfuscatedName("rt") + @ObfuscatedGetter( + intValue = -2123526983 ) - @Export("pcmPlayerProvider") - public static PlayerProvider pcmPlayerProvider; - @ObfuscatedName("k") - static int[][][] field12; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lly;" + static int field15; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = -96545822097112055L ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("gn") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + long field24; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -480209285 + ) + int field17; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljc;" + ) + IterableNodeDeque field22; + + @ObfuscatedSignature( + descriptor = "(Lnu;)V" + ) + public class2(Buffer var1) { + this.field17 = -1; // L: 9 + this.field22 = new IterableNodeDeque(); // L: 10 + this.method28(var1); + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1544288881" + ) + void method28(Buffer var1) { + this.field24 = var1.readLong(); + this.field17 = var1.readInt(); + + for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 55 + Object var3; + if (var2 == 3) { + var3 = new class13(this); + } else if (var2 == 1) { + var3 = new class8(this); + } else if (var2 == 13) { + var3 = new class26(this); + } else if (var2 == 4) { + var3 = new class17(this); + } else if (var2 == 6) { + var3 = new class10(this); + } else if (var2 == 5) { + var3 = new class22(this); + } else if (var2 == 2) { + var3 = new class23(this); + } else if (var2 == 7) { + var3 = new class21(this); + } else if (var2 == 14) { + var3 = new class18(this); + } else if (var2 == 8) { + var3 = new class6(this); + } else if (var2 == 9) { + var3 = new class0(this); + } else if (var2 == 10) { + var3 = new class4(this); + } else if (var2 == 11) { + var3 = new class1(this); + } else if (var2 == 12) { + var3 = new class15(this); + } else { + if (var2 != 15) { + throw new RuntimeException(""); + } + + var3 = new class27(this); + } + + ((class14)var3).vmethod371(var1); + this.field22.addFirst((Node)var3); // L: 54 + } + + } // L: 57 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "248854957" + ) + public void method29(class11 var1) { + if (var1.field79 == this.field24 && this.field17 == var1.field80) { + for (class14 var2 = (class14)this.field22.last(); var2 != null; var2 = (class14)this.field22.previous()) { // L: 61 + var2.vmethod376(var1); // L: 62 + } + + ++var1.field80; // L: 64 + } else { + throw new RuntimeException(""); + } + } // L: 65 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "1" + ) + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); + VarbitComposition var1; + if (var2 != null) { + var1 = var2; + } else { + byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); + var2 = new VarbitComposition(); + if (var3 != null) { + var2.decode(new Buffer(var3)); + } + + VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0); + var1 = var2; + } + + int var7 = var1.baseVar; + int var4 = var1.startBit; + int var5 = var1.endBit; + int var6 = Varps.Varps_masks[var5 - var4]; + return Varps.Varps_main[var7] >> var4 & var6; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnu;Ljava/lang/String;I)I", + garbageValue = "1745041839" + ) + public static int method34(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) { + var5[var6] = -124; + } else if (var7 == 8230) { // L: 30 + var5[var6] = -123; + } else if (var7 == 8224) { // L: 31 + var5[var6] = -122; + } else if (var7 == 8225) { // L: 32 + var5[var6] = -121; + } else if (var7 == 710) { // L: 33 + var5[var6] = -120; + } else if (var7 == 8240) { // L: 34 + var5[var6] = -119; + } else if (var7 == 352) { // L: 35 + var5[var6] = -118; + } else if (var7 == 8249) { // L: 36 + var5[var6] = -117; + } else if (var7 == 338) { // L: 37 + var5[var6] = -116; + } else if (var7 == 381) { // L: 38 + var5[var6] = -114; + } else if (var7 == 8216) { // L: 39 + var5[var6] = -111; + } else if (var7 == 8217) { // L: 40 + var5[var6] = -110; + } else if (var7 == 8220) { // L: 41 + var5[var6] = -109; + } else if (var7 == 8221) { // L: 42 + var5[var6] = -108; + } else if (var7 == 8226) { // L: 43 + var5[var6] = -107; + } else if (var7 == 8211) { + var5[var6] = -106; // L: 44 + } else if (var7 == 8212) { // L: 45 + var5[var6] = -105; + } else if (var7 == 732) { // L: 46 + var5[var6] = -104; + } else if (var7 == 8482) { // L: 47 + var5[var6] = -103; + } else if (var7 == 353) { // L: 48 + var5[var6] = -102; + } else if (var7 == 8250) { // L: 49 + var5[var6] = -101; + } else if (var7 == 339) { // L: 50 + var5[var6] = -100; + } else if (var7 == 382) { // L: 51 + var5[var6] = -98; + } else if (var7 == 376) { // L: 52 + var5[var6] = -97; + } else { + var5[var6] = 63; // L: 53 + } + } + + var0.writeSmartByteShort(var5.length); // L: 58 + var0.offset += class227.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59 + return var0.offset - var2; // L: 60 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-878871415" + ) + public static boolean method39(int var0) { + return (var0 >> 28 & 1) != 0; // L: 29 + } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkx;B)V", - garbageValue = "-41" + descriptor = "(Lhu;IIII)V", + garbageValue = "835982981" ) - public void vmethod48(Object var1, Buffer var2) { - this.method20((Long)var1, var2); // L: 33 - } // L: 34 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Lkx;I)Ljava/lang/Object;", - garbageValue = "1678106953" - ) - public Object vmethod45(Buffer var1) { - return var1.readLong(); // L: 29 - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lkx;I)V", - garbageValue = "444192974" - ) - void method20(Long var1, Buffer var2) { - var2.writeLong(var1); // L: 25 - } // L: 26 - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILcl;ZS)I", - garbageValue = "-27165" - ) - static int method25(int var0, Script var1, boolean var2) { - if (var0 != 3700 && var0 != 3701) { // L: 2328 - if (var0 == 3702) { // L: 2333 - ++Interpreter.Interpreter_intStackSize; // L: 2334 - return 1; // L: 2335 - } else { - return 2; // L: 2337 - } + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2701 == null) { // L: 987 + throw new RuntimeException(); // L: 988 } else { - --Interpreter.Interpreter_intStackSize; // L: 2329 - --Interpreter.Interpreter_stringStackSize; // L: 2330 - return 1; // L: 2331 + var0.field2701[var1] = var2; // L: 990 + var0.field2692[var1] = var3; // L: 991 + } + } // L: 992 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(ILhk;ZI)V", + garbageValue = "-2112750284" + ) + static void method37(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = Actor.getWorldMap().getMapArea(var0); // L: 4286 + int var4 = Varcs.localPlayer.plane; // L: 4287 + int var5 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 4288 + int var6 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 4289 + Coord var7 = new Coord(var4, var5, var6); // L: 4290 + Actor.getWorldMap().method6264(var3, var7, var1, var2); // L: 4291 + } // L: 4292 + + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "1663877987" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 3682 + byte var2 = 4; // L: 3683 + int var3 = var2 + 6; // L: 3684 + int var4 = var2 + 6; // L: 3685 + int var5 = class14.fontPlain12.lineWidth(var0, 250); // L: 3686 + int var6 = class14.fontPlain12.lineCount(var0, 250) * 13; // L: 3687 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 0); // L: 3688 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215); // L: 3689 + class14.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 3690 + int var7 = var3 - var2; // L: 3691 + int var8 = var4 - var2; // L: 3692 + int var9 = var2 + var5 + var2; // L: 3693 + int var10 = var6 + var2 + var2; // L: 3694 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 3696 + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetYs[var11] + Client.rootWidgetHeights[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 3697 + Client.field811[var11] = true; + } + } + + if (var1) { // L: 3700 + GameEngine.rasterProvider.drawFull(0, 0); // L: 3701 + } else { + LoginScreenAnimation.method2198(var3, var4, var5, var6); // L: 3704 + } + + } + } // L: 3706 + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-841281323" + ) + static final int method36() { + if (Login.clientPreferences.roofsHidden) { // L: 3988 + return class26.Client_plane; + } else { + int var0 = 3; // L: 3989 + if (WorldMapArea.cameraPitch < 310) { // L: 3990 + label168: { + int var1; + int var2; + if (Client.oculusOrbState == 1) { // L: 3993 + var1 = class6.oculusOrbFocalPointX >> 7; // L: 3994 + var2 = Players.oculusOrbFocalPointY >> 7; // L: 3995 + } else { + var1 = Varcs.localPlayer.x >> 7; // L: 3998 + var2 = Varcs.localPlayer.y >> 7; // L: 3999 + } + + int var3 = ModeWhere.cameraX >> 7; // L: 4001 + int var4 = ReflectionCheck.cameraZ >> 7; // L: 4002 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4003 + if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4004 + if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4005 + var0 = class26.Client_plane; + } + + int var5; + if (var1 > var3) { // L: 4007 + var5 = var1 - var3; + } else { + var5 = var3 - var1; // L: 4008 + } + + int var6; + if (var2 > var4) { // L: 4010 + var6 = var2 - var4; + } else { + var6 = var4 - var2; // L: 4011 + } + + int var7; + int var8; + if (var5 > var6) { // L: 4012 + var7 = var6 * 65536 / var5; // L: 4013 + var8 = 32768; // L: 4014 + + while (true) { + if (var1 == var3) { // L: 4015 + break label168; + } + + if (var3 < var1) { // L: 4016 + ++var3; + } else if (var3 > var1) { // L: 4017 + --var3; + } + + if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4018 + var0 = class26.Client_plane; + } + + var8 += var7; // L: 4019 + if (var8 >= 65536) { // L: 4020 + var8 -= 65536; // L: 4021 + if (var4 < var2) { // L: 4022 + ++var4; + } else if (var4 > var2) { // L: 4023 + --var4; + } + + if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4024 + var0 = class26.Client_plane; + } + } + } + } else { + if (var6 > 0) { // L: 4028 + var7 = var5 * 65536 / var6; // L: 4029 + var8 = 32768; // L: 4030 + + while (var2 != var4) { // L: 4031 + if (var4 < var2) { // L: 4032 + ++var4; + } else if (var4 > var2) { // L: 4033 + --var4; + } + + if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4034 + var0 = class26.Client_plane; + } + + var8 += var7; // L: 4035 + if (var8 >= 65536) { // L: 4036 + var8 -= 65536; // L: 4037 + if (var3 < var1) { // L: 4038 + ++var3; + } else if (var3 > var1) { // L: 4039 + --var3; + } + + if ((Tiles.Tiles_renderFlags[class26.Client_plane][var3][var4] & 4) != 0) { // L: 4040 + var0 = class26.Client_plane; + } + } + } + } + break label168; + } + } + + return class26.Client_plane; + } + + return class26.Client_plane; + } + } + + if (Varcs.localPlayer.x >= 0 && Varcs.localPlayer.y >= 0 && Varcs.localPlayer.x < 13312 && Varcs.localPlayer.y < 13312) { // L: 4045 + if ((Tiles.Tiles_renderFlags[class26.Client_plane][Varcs.localPlayer.x >> 7][Varcs.localPlayer.y >> 7] & 4) != 0) { // L: 4046 + var0 = class26.Client_plane; + } + + return var0; // L: 4047 + } else { + return class26.Client_plane; + } } } - @ObfuscatedName("gl") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1857096968" + descriptor = "([Lhu;IIIIIIIII)V", + garbageValue = "1743057501" ) - static void method27() { - if (SoundSystem.worldMap != null) { // L: 3777 - SoundSystem.worldMap.method6530(class90.Client_plane, (UserComparator9.localPlayer.x >> 7) + GrandExchangeOfferNameComparator.baseX, (UserComparator9.localPlayer.y >> 7) + NetCache.baseY, false); // L: 3778 - SoundSystem.worldMap.loadCache(); // L: 3779 + @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: 9424 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9425 + + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9426 + Widget var10 = var0[var9]; // L: 9427 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9428 9429 + int var11; + if (var8 == -1) { // L: 9431 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9432 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9433 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9434 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9435 + var11 = ++Client.rootWidgetCount - 1; // L: 9436 + } else { + var11 = var8; // L: 9438 + } + + var10.rootIndex = var11; // L: 9439 + var10.cycle = Client.cycle; // L: 9440 + if (!var10.isIf3 || !WorldMapArea.isComponentHidden(var10)) { // L: 9441 + if (var10.contentType > 0) { // L: 9442 + ChatChannel.method2017(var10); + } + + int var12 = var10.x + var6; // L: 9443 + int var13 = var7 + var10.y; // L: 9444 + int var14 = var10.transparencyTop; // L: 9445 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 9446 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9447 + WallDecoration.field2179 = var0; // L: 9448 + class11.field106 = var6; // L: 9449 + class235.field2843 = var7; // L: 9450 + continue; // L: 9451 + } + + if (Client.isDraggingWidget && Client.field780) { // L: 9453 + var15 = MouseHandler.MouseHandler_x; // L: 9454 + var16 = MouseHandler.MouseHandler_y; // L: 9455 + var15 -= Client.widgetClickX; // L: 9456 + var16 -= Client.widgetClickY; // L: 9457 + if (var15 < Client.field727) { // L: 9458 + var15 = Client.field727; + } + + if (var15 + var10.width > Client.field727 + Client.clickedWidgetParent.width) { // L: 9459 + var15 = Client.field727 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field782) { // L: 9460 + var16 = Client.field782; + } + + if (var16 + var10.height > Client.field782 + Client.clickedWidgetParent.height) { // L: 9461 + var16 = Client.field782 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 9462 + var13 = var16; // L: 9463 + } + + if (!var10.isScrollBar) { // L: 9465 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 9471 + var15 = var2; // L: 9472 + var16 = var3; // L: 9473 + var17 = var4; // L: 9474 + var18 = var5; // L: 9475 + } else if (var10.type == 9) { // L: 9477 + var19 = var12; // L: 9478 + var20 = var13; // L: 9479 + var21 = var12 + var10.width; // L: 9480 + var22 = var13 + var10.height; // L: 9481 + if (var21 < var12) { // L: 9482 + var19 = var21; // L: 9484 + var21 = var12; // L: 9485 + } + + if (var22 < var13) { // L: 9487 + var20 = var22; // L: 9489 + var22 = var13; // L: 9490 + } + + ++var21; // L: 9492 + ++var22; // L: 9493 + var15 = var19 > var2 ? var19 : var2; // L: 9494 + var16 = var20 > var3 ? var20 : var3; // L: 9495 + var17 = var21 < var4 ? var21 : var4; // L: 9496 + var18 = var22 < var5 ? var22 : var5; // L: 9497 + } else { + var19 = var12 + var10.width; // L: 9500 + var20 = var13 + var10.height; // L: 9501 + var15 = var12 > var2 ? var12 : var2; // L: 9502 + var16 = var13 > var3 ? var13 : var3; // L: 9503 + var17 = var19 < var4 ? var19 : var4; // L: 9504 + var18 = var20 < var5 ? var20 : var5; // L: 9505 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9507 + if (var10.contentType != 0) { // L: 9508 + if (var10.contentType == 1336) { // L: 9509 + if (Client.displayFps) { // L: 9510 + var13 += 15; // L: 9511 + class14.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9512 + var13 += 15; // L: 9513 + Runtime var42 = Runtime.getRuntime(); // L: 9514 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9515 + var21 = 16776960; // L: 9516 + if (var20 > 327680 && !Client.isLowDetail) { // L: 9517 + var21 = 16711680; + } + + class14.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9518 + var13 += 15; // L: 9519 + } + continue; + } + + if (var10.contentType == 1337) { // L: 9523 + Client.viewportX = var12; // L: 9524 + Client.viewportY = var13; // L: 9525 + class24.drawEntities(var12, var13, var10.width, var10.height); // L: 9526 + Client.field811[var10.rootIndex] = true; // L: 9527 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9528 + continue; // L: 9529 + } + + if (var10.contentType == 1338) { // L: 9531 + class21.drawMinimap(var10, var12, var13, var11); // L: 9532 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9533 + continue; // L: 9534 + } + + if (var10.contentType == 1339) { // L: 9536 + class373.drawCompass(var10, var12, var13, var11); // L: 9537 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9538 + continue; // L: 9539 + } + + if (var10.contentType == 1400) { // L: 9541 + UserComparator4.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9542 + } + + if (var10.contentType == 1401) { // L: 9544 + UserComparator4.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9545 + } + + if (var10.contentType == 1402) { // L: 9547 + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9548 + } + } + + if (var10.type == 0) { // L: 9551 + if (!var10.isIf3 && WorldMapArea.isComponentHidden(var10) && var10 != Varps.mousedOverWidgetIf1) { // L: 9552 + continue; + } + + if (!var10.isIf3) { // L: 9553 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9554 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 9555 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9557 + if (var10.children != null) { // L: 9558 + 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: 9559 + if (var30 != null) { // L: 9560 + Skeleton.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9561 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9563 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9564 + } + + if (Client.isResizable || Client.field704[var11] || Client.gameDrawingMode > 1) { // L: 9566 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9567 9568 + class303.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 9570 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 9573 + var19 = 0; // L: 9574 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9575 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9576 + var22 = var21 * (var10.paddingX + 32) + var12; // L: 9577 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 9578 + if (var19 < 20) { // L: 9579 + var22 += var10.inventoryXOffsets[var19]; // L: 9580 + var23 += var10.inventoryYOffsets[var19]; // L: 9581 + } + + if (var10.itemIds[var19] <= 0) { // L: 9583 + if (var10.inventorySprites != null && var19 < 20) { // L: 9628 + SpritePixels var46 = var10.getInventorySprite(var19); // L: 9629 + if (var46 != null) { // L: 9630 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2622) { // L: 9631 + class29.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 9584 + boolean var38 = false; // L: 9585 + var26 = var10.itemIds[var19] - 1; // L: 9586 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == ClientPacket.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9587 + SpritePixels var35; + if (Client.isItemSelected == 1 && var19 == class208.selectedItemSlot && var10.id == UserComparator6.selectedItemWidget) { // L: 9589 + var35 = WorldMapManager.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = WorldMapManager.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9590 + } + + if (var35 != null) { // L: 9591 + if (var10 == ClientPacket.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9592 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9593 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9594 + if (var24 < 5 && var24 > -5) { // L: 9595 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 9596 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 9597 + var24 = 0; // L: 9598 + var25 = 0; // L: 9599 + } + + var35.drawTransAt(var22 + var24, var25 + var23, 128); // L: 9601 + if (var1 != -1) { // L: 9602 + Widget var28 = var0[var1 & 65535]; // L: 9603 + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9604 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field799 / 3; // L: 9605 + if (var29 > Client.field799 * 10) { // L: 9606 + var29 = Client.field799 * 10; + } + + if (var29 > var28.scrollY) { // L: 9607 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 9608 + Client.draggedWidgetY += var29; // L: 9609 + class29.invalidateWidget(var28); // L: 9610 + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9612 + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field799 / 3; // L: 9613 + if (var29 > Client.field799 * 10) { // L: 9614 + var29 = Client.field799 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9615 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 9616 + Client.draggedWidgetY -= var29; // L: 9617 + class29.invalidateWidget(var28); // L: 9618 + } + } + } else if (var10 == PacketWriter.field1394 && var19 == Client.field709) { // L: 9622 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 9623 + } + } else { + class29.invalidateWidget(var10); // L: 9625 + } + } + } + + ++var19; // L: 9633 + } + } + } else if (var10.type == 3) { // L: 9638 + if (class159.runCs1(var10)) { // L: 9640 + var19 = var10.color2; // L: 9641 + if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9642 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 9645 + if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9646 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 9648 + switch(var10.fillMode.field4232) { // L: 9649 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9655 + break; // L: 9656 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9658 + break; // L: 9659 + default: + if (var14 == 0) { // L: 9651 + 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: 9652 + } + } + } else if (var14 == 0) { // L: 9663 + 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: 9664 + } + } else { + Font var39; + if (var10.type == 4) { // L: 9668 + var39 = var10.getFont(); // L: 9669 + if (var39 == null) { // L: 9670 + if (Widget.field2622) { // L: 9671 + class29.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 9675 + if (class159.runCs1(var10)) { // L: 9676 + var20 = var10.color2; // L: 9677 + if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9678 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 9679 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 9682 + if (var10 == Varps.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9683 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 9685 + ItemComposition var45 = class23.ItemDefinition_get(var10.itemId); // L: 9686 + var44 = var45.name; // L: 9687 + if (var44 == null) { // L: 9688 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9689 + var44 = DefaultsGroup.colorStartTag(16748608) + var44 + "" + " " + 'x' + UserComparator5.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 9691 + var44 = "Please wait..."; // L: 9692 + var20 = var10.color; // L: 9693 + } + + if (!var10.isIf3) { // L: 9695 + var44 = class232.method4363(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9696 + } + } else if (var10.type == 5) { // L: 9699 + SpritePixels var40; + if (!var10.isIf3) { // L: 9700 + var40 = var10.getSprite(class159.runCs1(var10)); // L: 9701 + if (var40 != null) { // L: 9702 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2622) { // L: 9703 + class29.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 9707 + var40 = WorldMapManager.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 9708 + } + + if (var40 == null) { // L: 9709 + if (Widget.field2622) { // L: 9733 + class29.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 9710 + var21 = var40.height; // L: 9711 + if (!var10.spriteTiling) { // L: 9712 + var22 = var10.width * 4096 / var20; // L: 9726 + if (var10.spriteAngle != 0) { // L: 9727 + var40.method7000(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 9728 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 9729 + var40.drawTransBgAt(var12, var13); // L: 9730 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9713 + var22 = (var20 - 1 + var10.width) / var20; // L: 9714 + var23 = (var21 - 1 + var10.height) / var21; // L: 9715 + + for (var24 = 0; var24 < var22; ++var24) { // L: 9716 + for (var25 = 0; var25 < var23; ++var25) { // L: 9717 + if (var10.spriteAngle != 0) { // L: 9718 + var40.method7000(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 9719 + var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); // L: 9720 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9723 + } + } + } + } else { + ItemComposition var33; + if (var10.type == 6) { // L: 9737 + boolean var36 = class159.runCs1(var10); // L: 9738 + if (var36) { // L: 9740 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 9741 + } + + Model var41 = null; // L: 9742 + var22 = 0; // L: 9743 + if (var10.itemId != -1) { // L: 9744 + var33 = class23.ItemDefinition_get(var10.itemId); // L: 9745 + if (var33 != null) { // L: 9746 + var33 = var33.getCountObj(var10.itemQuantity); // L: 9747 + var41 = var33.getModel(1); // L: 9748 + if (var41 != null) { // L: 9749 + var41.calculateBoundsCylinder(); // L: 9750 + var22 = var41.height / 2; // L: 9751 + } else { + class29.invalidateWidget(var10); // L: 9753 + } + } + } else if (var10.modelType == 5) { // L: 9756 + if (var10.modelId == 0) { // L: 9757 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = Varcs.localPlayer.getModel(); // L: 9758 + } + } else if (var20 == -1) { // L: 9760 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, Varcs.localPlayer.appearance); // L: 9761 + if (var41 == null && Widget.field2622) { // L: 9762 + class29.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = class225.SequenceDefinition_get(var20); // L: 9765 + var41 = var10.getModel(var47, var10.modelFrame, var36, Varcs.localPlayer.appearance); // L: 9766 + if (var41 == null && Widget.field2622) { // L: 9767 + class29.invalidateWidget(var10); + } + } + + Rasterizer3D.method3411(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9769 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9770 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9771 + if (var41 != null) { // L: 9772 + if (!var10.isIf3) { // L: 9773 + var41.method3692(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 9775 + if (var10.modelOrthog) { // L: 9776 + var41.method3693(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method3692(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9777 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 9780 + } else { + if (var10.type == 7) { // L: 9783 + var39 = var10.getFont(); // L: 9784 + if (var39 == null) { // L: 9785 + if (Widget.field2622) { // L: 9786 + class29.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 9789 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9790 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9791 + if (var10.itemIds[var20] > 0) { // L: 9792 + var33 = class23.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9793 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9795 + var34 = DefaultsGroup.colorStartTag(16748608) + var33.name + ""; + } else { + var34 = DefaultsGroup.colorStartTag(16748608) + var33.name + "" + " " + 'x' + UserComparator5.formatItemStacks(var10.itemQuantities[var20]); // L: 9796 + } + + var25 = var12 + var22 * (var10.paddingX + 115); // L: 9797 + var26 = var21 * (var10.paddingY + 12) + var13; // L: 9798 + if (var10.textXAlignment == 0) { // L: 9799 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 9800 + 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: 9801 + } + } + + ++var20; // L: 9803 + } + } + } + + if (var10.type == 8 && var10 == Player.field1192 && Client.field753 == Client.field696) { // L: 9807 9808 + var19 = 0; // L: 9809 + var20 = 0; // L: 9810 + Font var31 = class14.fontPlain12; // L: 9811 + String var32 = var10.text; // L: 9812 + + String var43; + for (var32 = class232.method4363(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9814 9815 9827 + var24 = var32.indexOf("
"); // L: 9816 + if (var24 != -1) { // L: 9817 + var43 = var32.substring(0, var24); // L: 9818 + var32 = var32.substring(var24 + 4); // L: 9819 + } else { + var43 = var32; // L: 9822 + var32 = ""; // L: 9823 + } + + var25 = var31.stringWidth(var43); // L: 9825 + if (var25 > var19) { // L: 9826 + var19 = var25; + } + } + + var19 += 6; // L: 9829 + var20 += 7; // L: 9830 + var24 = var12 + var10.width - 5 - var19; // L: 9831 + var25 = var13 + var10.height + 5; // L: 9832 + if (var24 < var12 + 5) { // L: 9833 + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { // L: 9834 + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { // L: 9835 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9836 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9837 + var32 = var10.text; // L: 9838 + var26 = var25 + var31.ascent + 2; // L: 9839 + + for (var32 = class232.method4363(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9840 9841 9852 + int var27 = var32.indexOf("
"); // L: 9842 + if (var27 != -1) { // L: 9843 + var43 = var32.substring(0, var27); // L: 9844 + var32 = var32.substring(var27 + 4); // L: 9845 + } else { + var43 = var32; // L: 9848 + var32 = ""; // L: 9849 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9851 + } + } + + if (var10.type == 9) { // L: 9856 + if (var10.field2727) { // L: 9861 + var19 = var12; // L: 9862 + var20 = var13 + var10.height; // L: 9863 + var21 = var12 + var10.width; // L: 9864 + var22 = var13; // L: 9865 + } else { + var19 = var12; // L: 9868 + var20 = var13; // L: 9869 + var21 = var12 + var10.width; // L: 9870 + var22 = var13 + var10.height; // L: 9871 + } + + if (var10.lineWid == 1) { // L: 9873 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9874 + } else { + ByteArrayPool.method5575(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9877 + } + } + } + } + } + } + } + } + } + } } - } // L: 3781 + } // L: 9882 } diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java new file mode 100644 index 0000000000..626277c31a --- /dev/null +++ b/runescape-client/src/main/java/class20.java @@ -0,0 +1,159 @@ +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("z") +public class class20 extends class16 { + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1884586225 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1810186183 + ) + int field158; + @ObfuscatedName("o") + byte field164; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -950803681 + ) + int field163; + @ObfuscatedName("p") + String field160; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lx;" + ) + final class19 this$0; + + @ObfuscatedSignature( + descriptor = "(Lx;)V" + ) + class20(class19 var1) { + this.this$0 = var1; + this.field158 = -1; // L: 100 + } // L: 105 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1239860939" + ) + void vmethod356(Buffer var1) { + this.field158 = var1.readUnsignedShort(); // L: 108 + this.field164 = var1.readByte(); // L: 109 + this.field163 = var1.readUnsignedShort(); // L: 110 + var1.readLong(); // L: 111 + this.field160 = var1.readStringCp1252NullTerminated(); // L: 112 + } // L: 113 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1583378087" + ) + void vmethod352(class3 var1) { + class9 var2 = (class9)var1.field27.get(this.field158); // L: 116 + var2.field66 = this.field164; // L: 117 + var2.field64 = this.field163; // L: 118 + var2.field65 = this.field160; // L: 119 + } // L: 120 + + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1867749847" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1040 + if (Client.gameState == 0) { // L: 1041 + class10.client.method594(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1042 + Client.loginState = 0; // L: 1043 + Client.field633 = 0; // L: 1044 + Client.field634 = 0; // L: 1045 + Client.timer.method5579(var0); // L: 1046 + if (var0 != 20) { // L: 1047 + TriBool.method5818(false); + } + } + + if (var0 != 20 && var0 != 40 && Client.field686 != null) { // L: 1049 1050 + Client.field686.close(); // L: 1051 + Client.field686 = null; // L: 1052 + } + + if (Client.gameState == 25) { // L: 1055 + Client.field659 = 0; // L: 1056 + Client.field655 = 0; // L: 1057 + Client.field656 = 1; // L: 1058 + Client.field657 = 0; // L: 1059 + Client.field752 = 1; // L: 1060 + } + + if (var0 != 5 && var0 != 10) { // L: 1062 + if (var0 == 20) { // L: 1065 + ObjectSound.method1796(class373.archive10, SoundSystem.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1066 + } else if (var0 == 11) { // L: 1068 + ObjectSound.method1796(class373.archive10, SoundSystem.archive8, false, 4); // L: 1069 + } else if (class5.clearLoginScreen) { // L: 1072 + TileItem.titleboxSprite = null; // L: 1073 + Interpreter.titlebuttonSprite = null; // L: 1074 + Login.runesSprite = null; // L: 1075 + Client.leftTitleSprite = null; // L: 1076 + ArchiveDiskActionHandler.rightTitleSprite = null; // L: 1077 + class125.logoSprite = null; // L: 1078 + class373.title_muteSprite = null; // L: 1079 + TileItem.options_buttons_0Sprite = null; // L: 1080 + Skeleton.options_buttons_2Sprite = null; // L: 1081 + Tile.worldSelectBackSprites = null; // L: 1082 + ByteArrayPool.worldSelectFlagSprites = null; // L: 1083 + class6.worldSelectArrows = null; // L: 1084 + class13.worldSelectStars = null; // L: 1085 + class242.field2900 = null; // L: 1086 + Login.loginScreenRunesAnimation.method2192(); // L: 1087 + PacketWriter.method2368(2); // L: 1088 + class246.method4409(true); // L: 1089 + class5.clearLoginScreen = false; // L: 1090 + } + } else { + ObjectSound.method1796(class373.archive10, SoundSystem.archive8, true, 0); // L: 1063 + } + + Client.gameState = var0; // L: 1092 + } + } // L: 1093 + + @ObfuscatedName("gw") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-431696930" + ) + static final void method304(boolean var0) { + BoundaryObject.playPcmPlayers(); // L: 4871 + ++Client.packetWriter.pendingWrites; // L: 4872 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 4873 + Client.packetWriter.pendingWrites = 0; // L: 4874 + if (!Client.field737 && Client.packetWriter.getSocket() != null) { // L: 4875 + PacketBufferNode var1 = ObjectComposition.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); // L: 4877 + Client.packetWriter.addNode(var1); // L: 4878 + + try { + Client.packetWriter.flush(); // L: 4880 + } catch (IOException var3) { // L: 4882 + Client.field737 = true; // L: 4883 + } + } + + } + } // L: 4886 +} diff --git a/runescape-client/src/main/java/class200.java b/runescape-client/src/main/java/class200.java deleted file mode 100644 index 3e42ebb57f..0000000000 --- a/runescape-client/src/main/java/class200.java +++ /dev/null @@ -1,41 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("gx") -public class class200 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final class200 field2401; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final class200 field2398; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgx;" - ) - static final class200 field2397; - @ObfuscatedName("y") - static byte[][][] field2399; - - static { - field2401 = new class200(); // L: 4 - field2398 = new class200(); // L: 5 - field2397 = new class200(); // L: 6 - } - - class200() { - } // L: 8 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1474141491" - ) - public static int method3865(int var0) { - return ReflectionCheck.method2451(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 56 - } -} diff --git a/runescape-client/src/main/java/class201.java b/runescape-client/src/main/java/class201.java new file mode 100644 index 0000000000..3405655ed7 --- /dev/null +++ b/runescape-client/src/main/java/class201.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("gt") +public interface class201 { +} diff --git a/runescape-client/src/main/java/class203.java b/runescape-client/src/main/java/class203.java new file mode 100644 index 0000000000..14db21960e --- /dev/null +++ b/runescape-client/src/main/java/class203.java @@ -0,0 +1,84 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("gl") +public class class203 { + @ObfuscatedName("su") + @ObfuscatedGetter( + intValue = 626043995 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2335; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2327; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2333; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2329; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2330; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2331; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2332; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2339; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2334; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + public static final class203 field2328; + + static { + field2335 = new class203(2); // L: 5 + field2327 = new class203(14); // L: 6 + field2333 = new class203(7); // L: 7 + field2329 = new class203(4); // L: 8 + field2330 = new class203(4); // L: 9 + field2331 = new class203(3); // L: 10 + field2332 = new class203(15); // L: 11 + field2339 = new class203(6); // L: 12 + field2334 = new class203(5); // L: 13 + field2328 = new class203(5); // L: 14 + } + + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2" + ) + class203(int var1) { + } // L: 20 +} diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java deleted file mode 100644 index 7464f80852..0000000000 --- a/runescape-client/src/main/java/class204.java +++ /dev/null @@ -1,260 +0,0 @@ -import java.applet.Applet; -import java.net.URL; -import java.util.HashMap; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("gc") -public class class204 { - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lhr;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; - - static { - new HashMap(); - } // L: 9 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Lil;", - garbageValue = "236947839" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 18 - if (var1 != null) { // L: 19 - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 20 - var1 = new VarpDefinition(); // L: 21 - if (var2 != null) { // L: 22 - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 23 - return var1; // L: 24 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "10" - ) - static boolean method3888(String var0, int var1, String var2) { - if (var1 == 0) { // L: 59 - try { - if (!class60.field454.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 = class56.method923(class60.applet, var2, new Object[]{(new URL(class60.applet.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 { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.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 = class60.applet; // L: 94 - JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 97 - } catch (Throwable var9) { // L: 100 - } - - try { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.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("jx") - @ObfuscatedSignature( - descriptor = "(Lhz;Ljj;IIZI)V", - garbageValue = "-151071260" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) { - String[] var5 = var1.inventoryActions; // L: 10160 - byte var6 = -1; // L: 10161 - String var7 = null; // L: 10162 - if (var5 != null && var5[var3] != null) { // L: 10163 - if (var3 == 0) { // L: 10164 - var6 = 33; - } else if (var3 == 1) { // L: 10165 - var6 = 34; - } else if (var3 == 2) { - var6 = 35; // L: 10166 - } else if (var3 == 3) { // L: 10167 - var6 = 36; - } else { - var6 = 37; // L: 10168 - } - - var7 = var5[var3]; // L: 10169 - } else if (var3 == 4) { // L: 10172 - var6 = 37; // L: 10173 - var7 = "Drop"; // L: 10174 - } - - if (var6 != -1 && var7 != null) { // L: 10177 - WorldMapEvent.insertMenuItem(var7, FileSystem.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10178 - } - - } // L: 10180 - - @ObfuscatedName("ky") - @ObfuscatedSignature( - descriptor = "(Lhz;IIII)V", - garbageValue = "-1768391401" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - UserComparator5.playPcmPlayers(); // L: 11303 - SpriteMask var4 = var0.getSpriteMask(false); // L: 11304 - if (var4 != null) { // L: 11305 - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11306 - if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11307 - int var5 = Client.camAngleY & 2047; // L: 11308 - int var6 = UserComparator9.localPlayer.x / 32 + 48; // L: 11309 - int var7 = 464 - UserComparator9.localPlayer.y / 32; // L: 11310 - GrandExchangeOfferAgeComparator.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11311 - - int var8; - int var10; - int var17; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11312 - var17 = Client.mapIconXs[var8] * 4 + 2 - UserComparator9.localPlayer.x / 32; // L: 11313 - var10 = Client.mapIconYs[var8] * 4 + 2 - UserComparator9.localPlayer.y / 32; // L: 11314 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 11315 - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { // L: 11317 - for (var17 = 0; var17 < 104; ++var17) { // L: 11318 - NodeDeque var15 = Client.groundItems[class90.Client_plane][var8][var17]; // L: 11319 - if (var15 != null) { // L: 11320 - var11 = var8 * 4 + 2 - UserComparator9.localPlayer.x / 32; // L: 11321 - var12 = var17 * 4 + 2 - UserComparator9.localPlayer.y / 32; // L: 11322 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var11, var12, ChatChannel.mapDotSprites[0], var4); // L: 11323 - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11327 - NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11328 - if (var9 != null && var9.isVisible()) { // L: 11329 - NPCComposition var19 = var9.definition; // L: 11330 - if (var19 != null && var19.transforms != null) { // L: 11331 - var19 = var19.transform(); - } - - if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 11332 - var11 = var9.x / 32 - UserComparator9.localPlayer.x / 32; // L: 11333 - var12 = var9.y / 32 - UserComparator9.localPlayer.y / 32; // L: 11334 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var11, var12, ChatChannel.mapDotSprites[1], var4); // L: 11335 - } - } - } - - var8 = Players.Players_count; // L: 11339 - int[] var18 = Players.Players_indices; // L: 11340 - - for (var10 = 0; var10 < var8; ++var10) { // L: 11341 - Player var16 = Client.players[var18[var10]]; // L: 11342 - if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != UserComparator9.localPlayer) { // L: 11343 - var12 = var16.x / 32 - UserComparator9.localPlayer.x / 32; // L: 11344 - int var13 = var16.y / 32 - UserComparator9.localPlayer.y / 32; // L: 11345 - boolean var14 = false; // L: 11346 - if (UserComparator9.localPlayer.team != 0 && var16.team != 0 && var16.team == UserComparator9.localPlayer.team) { // L: 11347 - var14 = true; - } - - if (var16.isFriend()) { // L: 11348 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var12, var13, ChatChannel.mapDotSprites[3], var4); - } else if (var14) { // L: 11349 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var12, var13, ChatChannel.mapDotSprites[4], var4); - } else if (var16.isClanMember()) { // L: 11350 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var12, var13, ChatChannel.mapDotSprites[5], var4); - } else { - AbstractArchive.drawSpriteOnMinimap(var1, var2, var12, var13, ChatChannel.mapDotSprites[2], var4); // L: 11351 - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11354 - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11355 - NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11356 - if (var20 != null) { // L: 11357 - var11 = var20.x / 32 - UserComparator9.localPlayer.x / 32; // L: 11358 - var12 = var20.y / 32 - UserComparator9.localPlayer.y / 32; // L: 11359 - WorldMapDecoration.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferWorldComparator.mapMarkerSprites[1], var4); // L: 11360 - } - } - - if (Client.hintArrowType == 2) { // L: 11363 - var10 = Client.hintArrowX * 4 - GrandExchangeOfferNameComparator.baseX * 4 + 2 - UserComparator9.localPlayer.x / 32; // L: 11364 - var11 = Client.hintArrowY * 4 - NetCache.baseY * 4 + 2 - UserComparator9.localPlayer.y / 32; // L: 11365 - WorldMapDecoration.worldToMinimap(var1, var2, var10, var11, GrandExchangeOfferWorldComparator.mapMarkerSprites[1], var4); // L: 11366 - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11368 - Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 11369 - if (var21 != null) { // L: 11370 - var11 = var21.x / 32 - UserComparator9.localPlayer.x / 32; // L: 11371 - var12 = var21.y / 32 - UserComparator9.localPlayer.y / 32; // L: 11372 - WorldMapDecoration.worldToMinimap(var1, var2, var11, var12, GrandExchangeOfferWorldComparator.mapMarkerSprites[1], var4); // L: 11373 - } - } - } - - if (Client.destinationX != 0) { // L: 11377 - var10 = Client.destinationX * 4 + 2 - UserComparator9.localPlayer.x / 32; // L: 11378 - var11 = Client.destinationY * 4 + 2 - UserComparator9.localPlayer.y / 32; // L: 11379 - AbstractArchive.drawSpriteOnMinimap(var1, var2, var10, var11, GrandExchangeOfferWorldComparator.mapMarkerSprites[0], var4); // L: 11380 - } - - if (!UserComparator9.localPlayer.isHidden) { // L: 11382 - 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: 11384 - } - - Client.field827[var3] = true; // L: 11385 - } - } // L: 11386 -} diff --git a/runescape-client/src/main/java/class207.java b/runescape-client/src/main/java/class207.java new file mode 100644 index 0000000000..0e5b2ac87a --- /dev/null +++ b/runescape-client/src/main/java/class207.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ga") +public class class207 { + @ObfuscatedName("jn") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-2039947103" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 10392 + } // L: 10393 +} diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class208.java similarity index 50% rename from runescape-client/src/main/java/class206.java rename to runescape-client/src/main/java/class208.java index 04809d74f3..53a7b1c336 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class208.java @@ -3,56 +3,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") -public class class206 { - @ObfuscatedName("n") +@ObfuscatedName("hr") +public class class208 { + @ObfuscatedName("f") + static int[] field2466; + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lic;" ) - @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("y") + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("md") @ObfuscatedGetter( - intValue = 194923833 + intValue = -1061330445 ) - @Export("musicPlayerStatus") - public static int musicPlayerStatus; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1305337215 - ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("s") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; + @Export("selectedItemSlot") + static int selectedItemSlot; static { - musicPlayerStatus = 0; // L: 11 - } + new Object(); + field2466 = new int[33]; // L: 8 + field2466[0] = 0; // L: 11 + int var0 = 2; // L: 12 - @ObfuscatedName("d") + for (int var1 = 1; var1 < 33; ++var1) { // L: 13 + field2466[var1] = var0 - 1; // L: 14 + var0 += var0; // L: 15 + } + + } // L: 17 + + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "([Lcq;II[I[IB)V", - garbageValue = "-51" + descriptor = "([Lbu;II[I[II)V", + garbageValue = "1470133569" ) @Export("sortWorlds") static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { @@ -95,7 +79,7 @@ public class class206 { var12 = var8.id; // L: 111 } - if (var11 != var12) { // L: 113 + if (var12 != var11) { // L: 113 if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 var9 = false; // L: 119 } @@ -160,4 +144,71 @@ public class class206 { } } // L: 168 + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "([Lhu;II)V", + garbageValue = "1720951571" + ) + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11101 + Widget var3 = var0[var2]; // L: 11102 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !WorldMapArea.isComponentHidden(var3))) { // L: 11103 11104 11105 + if (var3.type == 0) { // L: 11106 + if (!var3.isIf3 && WorldMapArea.isComponentHidden(var3) && var3 != Varps.mousedOverWidgetIf1) { // L: 11107 + continue; + } + + drawModelComponents(var0, var3.id); // L: 11108 + if (var3.children != null) { // L: 11109 + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11110 + if (var4 != null) { // L: 11111 + Archive.method4471(var4.group); + } + } + + if (var3.type == 6) { // L: 11113 + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11114 + boolean var7 = class159.runCs1(var3); // L: 11115 + if (var7) { // L: 11117 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 11118 + } + + if (var5 != -1) { // L: 11119 + SequenceDefinition var6 = class225.SequenceDefinition_get(var5); // L: 11120 + + for (var3.modelFrameCycle += Client.field799; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class29.invalidateWidget(var3)) { // L: 11121 11122 11129 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11123 + ++var3.modelFrame; // L: 11124 + if (var3.modelFrame >= var6.frameIds.length) { // L: 11125 + var3.modelFrame -= var6.frameCount; // L: 11126 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11127 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field2680 != 0 && !var3.isIf3) { // L: 11133 + int var8 = var3.field2680 >> 16; // L: 11134 + var5 = var3.field2680 << 16 >> 16; // L: 11135 + var8 *= Client.field799; // L: 11136 + var5 *= Client.field799; // L: 11137 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11138 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11139 + class29.invalidateWidget(var3); // L: 11140 + } + } + } + } + + } // L: 11144 } diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java new file mode 100644 index 0000000000..dcf27c6368 --- /dev/null +++ b/runescape-client/src/main/java/class21.java @@ -0,0 +1,253 @@ +import java.lang.management.GarbageCollectorMXBean; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("i") +public class class21 extends class14 { + @ObfuscatedName("g") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("al") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1121111403 + ) + int field168; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1047872621 + ) + int field166; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -52117445 + ) + int field167; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1660368165 + ) + int field165; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class21(class2 var1) { + this.this$0 = var1; + this.field168 = -1; // L: 158 + } // L: 163 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field168 = var1.readUnsignedShort(); // L: 166 + this.field166 = var1.readInt(); // L: 167 + this.field167 = var1.readUnsignedByte(); // L: 168 + this.field165 = var1.readUnsignedByte(); // L: 169 + } // L: 170 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method154(this.field168, this.field166, this.field167, this.field165); // L: 173 + } // L: 174 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;IZB)Z", + garbageValue = "18" + ) + static boolean method316(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 38 + boolean var3 = false; // L: 39 + boolean var4 = false; // L: 40 + int var5 = 0; // L: 41 + int var6 = var0.length(); // L: 42 + + for (int var7 = 0; var7 < var6; ++var7) { // L: 43 + char var8 = var0.charAt(var7); // L: 44 + if (var7 == 0) { // L: 45 + if (var8 == '-') { // L: 46 + var3 = true; // L: 47 + continue; + } + + if (var8 == '+') { // L: 50 + continue; + } + } + + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 52 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; // L: 53 + } else { + if (var8 < 'a' || var8 > 'z') { // L: 54 + return false; // L: 55 + } + + var10 = var8 - 'W'; + } + + if (var10 >= var1) { // L: 56 + return false; + } + + if (var3) { // L: 57 + var10 = -var10; + } + + int var9 = var10 + var5 * var1; // L: 58 + if (var9 / var1 != var5) { // L: 59 + return false; + } + + var5 = var9; // L: 60 + var4 = true; // L: 61 + } + + return var4; // L: 63 + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + descriptor = "(Lhu;IIIB)V", + garbageValue = "-25" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + BoundaryObject.playPcmPlayers(); // L: 11360 + SpriteMask var4 = var0.getSpriteMask(false); // L: 11361 + if (var4 != null) { // L: 11362 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11363 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11364 + int var5 = Client.camAngleY & 2047; // L: 11365 + int var6 = Varcs.localPlayer.x / 32 + 48; // L: 11366 + int var7 = 464 - Varcs.localPlayer.y / 32; // L: 11367 + class19.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11368 + + int var8; + int var10; + int var17; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11369 + var17 = Client.mapIconXs[var8] * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11370 + var10 = Client.mapIconYs[var8] * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11371 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 11372 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 11374 + for (var17 = 0; var17 < 104; ++var17) { // L: 11375 + NodeDeque var15 = Client.groundItems[class26.Client_plane][var8][var17]; // L: 11376 + if (var15 != null) { // L: 11377 + var11 = var8 * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11378 + var12 = var17 * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11379 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var11, var12, class244.mapDotSprites[0], var4); // L: 11380 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11384 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11385 + if (var9 != null && var9.isVisible()) { // L: 11386 + NPCComposition var19 = var9.definition; // L: 11387 + if (var19 != null && var19.transforms != null) { // L: 11388 + var19 = var19.transform(); + } + + if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 11389 + var11 = var9.x / 32 - Varcs.localPlayer.x / 32; // L: 11390 + var12 = var9.y / 32 - Varcs.localPlayer.y / 32; // L: 11391 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var11, var12, class244.mapDotSprites[1], var4); // L: 11392 + } + } + } + + var8 = Players.Players_count; // L: 11396 + int[] var18 = Players.Players_indices; // L: 11397 + + for (var10 = 0; var10 < var8; ++var10) { // L: 11398 + Player var16 = Client.players[var18[var10]]; // L: 11399 + if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != Varcs.localPlayer) { // L: 11400 + var12 = var16.x / 32 - Varcs.localPlayer.x / 32; // L: 11401 + int var13 = var16.y / 32 - Varcs.localPlayer.y / 32; // L: 11402 + boolean var14 = false; // L: 11403 + if (Varcs.localPlayer.team != 0 && var16.team != 0 && var16.team == Varcs.localPlayer.team) { // L: 11404 + var14 = true; + } + + if (var16.isFriend()) { // L: 11405 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[3], var4); + } else if (var14) { // L: 11406 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[4], var4); + } else if (var16.isClanMember()) { // L: 11407 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[5], var4); + } else { + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var12, var13, class244.mapDotSprites[2], var4); // L: 11408 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11411 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11412 + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11413 + if (var20 != null) { // L: 11414 + var11 = var20.x / 32 - Varcs.localPlayer.x / 32; // L: 11415 + var12 = var20.y / 32 - Varcs.localPlayer.y / 32; // L: 11416 + class371.worldToMinimap(var1, var2, var11, var12, class14.mapMarkerSprites[1], var4); // L: 11417 + } + } + + if (Client.hintArrowType == 2) { // L: 11420 + var10 = Client.hintArrowX * 4 - ItemLayer.baseX * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11421 + var11 = Client.hintArrowY * 4 - Tile.baseY * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11422 + class371.worldToMinimap(var1, var2, var10, var11, class14.mapMarkerSprites[1], var4); // L: 11423 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11425 + Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 11426 + if (var21 != null) { // L: 11427 + var11 = var21.x / 32 - Varcs.localPlayer.x / 32; // L: 11428 + var12 = var21.y / 32 - Varcs.localPlayer.y / 32; // L: 11429 + class371.worldToMinimap(var1, var2, var11, var12, class14.mapMarkerSprites[1], var4); // L: 11430 + } + } + } + + if (Client.destinationX != 0) { // L: 11434 + var10 = Client.destinationX * 4 + 2 - Varcs.localPlayer.x / 32; // L: 11435 + var11 = Client.destinationY * 4 + 2 - Varcs.localPlayer.y / 32; // L: 11436 + WorldMapCacheName.drawSpriteOnMinimap(var1, var2, var10, var11, class14.mapMarkerSprites[0], var4); // L: 11437 + } + + if (!Varcs.localPlayer.isHidden) { // L: 11439 + 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: 11441 + } + + Client.field812[var3] = true; // L: 11442 + } + } // L: 11443 +} diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java new file mode 100644 index 0000000000..3a88c07839 --- /dev/null +++ b/runescape-client/src/main/java/class210.java @@ -0,0 +1,51 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("he") +public class class210 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("soundEffectsArchive") + public static AbstractArchive soundEffectsArchive; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhn;" + ) + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1536562355 + ) + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("l") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lbi;" + ) + @Export("soundCache") + public static SoundCache soundCache; + + static { + musicPlayerStatus = 0; // L: 11 + } +} diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java deleted file mode 100644 index 32bd6690a5..0000000000 --- a/runescape-client/src/main/java/class217.java +++ /dev/null @@ -1,44 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hg") -public class class217 { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 338729147 - ) - @Export("clientType") - public static int clientType; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;B)V", - garbageValue = "0" - ) - public static void method4154(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; // L: 17 - } // L: 18 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-2092030193" - ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return LoginScreenAnimation.parseIntCustomRadix(var0, 10, true); // L: 76 - } - - @ObfuscatedName("ex") - @ObfuscatedSignature( - descriptor = "(Liy;Ljava/lang/String;I)V", - garbageValue = "2062536839" - ) - static void method4155(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1383 - Client.archiveLoaders.add(var2); // L: 1384 - Client.field934 += var2.groupCount; // L: 1385 - } // L: 1386 -} diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java deleted file mode 100644 index 9231b9e81c..0000000000 --- a/runescape-client/src/main/java/class219.java +++ /dev/null @@ -1,220 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; - -@ObfuscatedName("hh") -public class class219 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - @Export("huffman") - public static Huffman huffman; - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-1015901506" - ) - static int method4173(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2341 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2342 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2343 - return 1; // L: 2344 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2346 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2347 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2348 - return 1; // L: 2349 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2351 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2352 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2353 - return 1; // L: 2354 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2356 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2357 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2358 - return 1; // L: 2359 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2361 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2362 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2363 - return 1; // L: 2364 - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2366 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2367 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2368 - return 1; // L: 2369 - } else { - int var13; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2371 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2372 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2373 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2374 - return 1; // L: 2375 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2377 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2378 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2379 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2380 - return 1; // L: 2381 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2383 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2384 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2385 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2386 - return 1; // L: 2387 - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2389 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2390 - var13 = Client.grandExchangeOffers[var3].status(); // L: 2391 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2392 - return 1; // L: 2393 - } else { - boolean var12; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2395 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2396 - if (WorldMapSectionType.grandExchangeEvents != null) { // L: 2397 - WorldMapSectionType.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2398 - } - - return 1; // L: 2400 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2402 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2403 - if (WorldMapSectionType.grandExchangeEvents != null) { // L: 2404 - WorldMapSectionType.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2405 - } - - return 1; // L: 2407 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2409 - Interpreter.Interpreter_intStackSize -= 2; // L: 2410 - var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; // L: 2411 - boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2412 - if (WorldMapSectionType.grandExchangeEvents != null) { // L: 2413 - Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2414 - WorldMapSectionType.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2415 - } - - return 1; // L: 2417 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2419 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2420 - if (WorldMapSectionType.grandExchangeEvents != null) { // L: 2421 - WorldMapSectionType.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2422 - } - - return 1; // L: 2424 - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2426 - var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2427 - if (WorldMapSectionType.grandExchangeEvents != null) { // L: 2428 - WorldMapSectionType.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2429 - } - - return 1; // L: 2431 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2433 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSectionType.grandExchangeEvents == null ? 0 : WorldMapSectionType.grandExchangeEvents.events.size(); // L: 2434 - return 1; // L: 2435 - } else { - GrandExchangeEvent var4; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2437 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2438 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2439 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; // L: 2440 - return 1; // L: 2441 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2443 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2444 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2445 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2446 - return 1; // L: 2447 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2449 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2450 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2451 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2452 - return 1; // L: 2453 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2455 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2456 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2457 - long var5 = Tiles.currentTimeMillis() - class9.field57 - var4.age; // L: 2458 - int var7 = (int)(var5 / 3600000L); // L: 2459 - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2460 - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2461 - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2462 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; // L: 2463 - return 1; // L: 2464 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2466 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2467 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2468 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2469 - return 1; // L: 2470 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2472 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2473 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2474 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2475 - return 1; // L: 2476 - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2478 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2479 - var4 = (GrandExchangeEvent)WorldMapSectionType.grandExchangeEvents.events.get(var3); // L: 2480 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2481 - return 1; // L: 2482 - } else { - return 2; // L: 2484 - } - } - } - } - } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "74818443" - ) - static void method4171() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11000 - int var1 = var0.group; // L: 11001 - if (WorldMapCacheName.loadInterface(var1)) { // L: 11002 - boolean var2 = true; // L: 11003 - Widget[] var3 = DefaultsGroup.Widget_interfaceComponents[var1]; // L: 11004 - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { // L: 11005 - if (var3[var4] != null) { // L: 11006 - var2 = var3[var4].isIf3; // L: 11007 - break; - } - } - - if (!var2) { // L: 11011 - var4 = (int)var0.key; // L: 11012 - Widget var5 = class237.getWidget(var4); // L: 11013 - if (var5 != null) { // L: 11014 - IsaacCipher.invalidateWidget(var5); - } - } - } - } - - } // L: 11018 - - @ObfuscatedName("kp") - @ObfuscatedSignature( - descriptor = "(IIII)Lbs;", - garbageValue = "-1314120201" - ) - static final InterfaceParent method4172(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); // L: 11230 - var3.group = var1; // L: 11231 - var3.type = var2; // L: 11232 - Client.interfaceParents.put(var3, (long)var0); // L: 11233 - GrandExchangeEvent.Widget_resetModelFrames(var1); // L: 11234 - Widget var4 = class237.getWidget(var0); // L: 11235 - IsaacCipher.invalidateWidget(var4); // L: 11236 - if (Client.meslayerContinueWidget != null) { // L: 11237 - IsaacCipher.invalidateWidget(Client.meslayerContinueWidget); // L: 11238 - Client.meslayerContinueWidget = null; // L: 11239 - } - - AbstractWorldMapData.method352(); // L: 11241 - class182.revalidateWidgetScroll(DefaultsGroup.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11242 - SoundSystem.runWidgetOnLoadListener(var1); // L: 11243 - if (Client.rootInterface != -1) { // L: 11244 - class228.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; // L: 11245 - } -} diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 3c01dd6ea4..074c4b3da4 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -1,44 +1,284 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") -public class class22 { - @ObfuscatedName("n") +@ObfuscatedName("a") +public class class22 extends class14 { + @ObfuscatedName("gy") @ObfuscatedSignature( - descriptor = "(Lig;I)V", - garbageValue = "-782235051" + descriptor = "Loh;" ) - public static void method227(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; // L: 15 - } // L: 16 + @Export("compass") + static SpritePixels compass; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -406476963 + ) + int field173; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Lcq;Lcq;IZIZI)I", - garbageValue = "-385760353" + descriptor = "(Lu;)V" ) - static int method226(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = class41.compareWorlds(var0, var1, var2, var3); // L: 199 - if (var6 != 0) { // L: 200 - return var3 ? -var6 : var6; // L: 201 - } else if (var4 == -1) { // L: 204 - return 0; - } else { - int var7 = class41.compareWorlds(var0, var1, var4, var5); // L: 205 - return var5 ? -var7 : var7; // L: 206 - } + class22(class2 var1) { + this.this$0 = var1; + this.field173 = -1; // L: 114 + } // L: 116 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field173 = var1.readUnsignedShort(); // L: 119 + } // L: 120 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method147(this.field173); // L: 123 + } // L: 124 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-500170582" + ) + static int method328(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 258 + return class208.NetCache_currentResponse != null && class208.NetCache_currentResponse.key == var2 ? InterfaceParent.NetCache_responseArchiveBuffer.offset * 99 / (InterfaceParent.NetCache_responseArchiveBuffer.array.length - class208.NetCache_currentResponse.padding) + 1 : 0; // L: 259 260 } - @ObfuscatedName("jy") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-500865093" + descriptor = "(B)V", + garbageValue = "34" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (WorldMapCacheName.loadInterface(var0)) { // L: 10373 - class169.updateInterface(DefaultsGroup.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10374 + public static void method320() { + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 189 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 190 + } // L: 191 + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(Lcd;I)V", + garbageValue = "543264748" + ) + static final void method330(Actor var0) { + var0.movementSequence = var0.idleSequence; // L: 3477 + if (var0.pathLength == 0) { // L: 3478 + var0.field1267 = 0; // L: 3479 + } else { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3482 + SequenceDefinition var1 = class225.SequenceDefinition_get(var0.sequence); // L: 3483 + if (var0.field1224 > 0 && var1.field3722 == 0) { // L: 3484 + ++var0.field1267; // L: 3485 + return; // L: 3486 + } + + if (var0.field1224 <= 0 && var1.field3723 == 0) { // L: 3488 + ++var0.field1267; // L: 3489 + return; // L: 3490 + } + } + + int var10 = var0.x; // L: 3493 + int var2 = var0.y; // L: 3494 + int var3 = var0.field1258 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3495 + int var4 = var0.field1258 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3496 + if (var10 < var3) { // L: 3497 + if (var2 < var4) { // L: 3498 + var0.orientation = 1280; + } else if (var2 > var4) { // L: 3499 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 3500 + } + } else if (var10 > var3) { // L: 3502 + if (var2 < var4) { // L: 3503 + var0.orientation = 768; + } else if (var2 > var4) { // L: 3504 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3505 + } + } else if (var2 < var4) { // L: 3507 + var0.orientation = 1024; + } else if (var2 > var4) { // L: 3508 + var0.orientation = 0; + } + + byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 3509 + if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 3510 + int var6 = var0.orientation - var0.rotation & 2047; // L: 3517 + if (var6 > 1024) { // L: 3518 + var6 -= 2048; + } + + int var7 = var0.walkBackSequence; // L: 3519 + if (var6 >= -256 && var6 <= 256) { // L: 3520 + var7 = var0.walkSequence; + } else if (var6 >= 256 && var6 < 768) { // L: 3521 + var7 = var0.walkRightSequence; + } else if (var6 >= -768 && var6 <= -256) { // L: 3522 + var7 = var0.walkLeftSequence; + } + + if (var7 == -1) { // L: 3523 + var7 = var0.walkSequence; + } + + var0.movementSequence = var7; // L: 3524 + int var8 = 4; // L: 3525 + boolean var9 = true; // L: 3526 + if (var0 instanceof NPC) { // L: 3527 + var9 = ((NPC)var0).definition.isClickable; + } + + if (var9) { // L: 3528 + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1262 != 0) { // L: 3529 + var8 = 2; + } + + if (var0.pathLength > 2) { // L: 3530 + var8 = 6; + } + + if (var0.pathLength > 3) { // L: 3531 + var8 = 8; + } + + if (var0.field1267 > 0 && var0.pathLength > 1) { // L: 3532 + var8 = 8; // L: 3533 + --var0.field1267; // L: 3534 + } + } else { + if (var0.pathLength > 1) { // L: 3538 + var8 = 6; + } + + if (var0.pathLength > 2) { // L: 3539 + var8 = 8; + } + + if (var0.field1267 > 0 && var0.pathLength > 1) { // L: 3540 + var8 = 8; // L: 3541 + --var0.field1267; // L: 3542 + } + } + + if (var5 == 2) { // L: 3545 + var8 <<= 1; + } + + if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3546 + var0.movementSequence = var0.runSequence; + } + + if (var10 != var3 || var4 != var2) { // L: 3547 + if (var10 < var3) { // L: 3548 + var0.x += var8; // L: 3549 + if (var0.x > var3) { // L: 3550 + var0.x = var3; + } + } else if (var10 > var3) { // L: 3552 + var0.x -= var8; // L: 3553 + if (var0.x < var3) { // L: 3554 + var0.x = var3; + } + } + + if (var2 < var4) { // L: 3556 + var0.y += var8; // L: 3557 + if (var0.y > var4) { // L: 3558 + var0.y = var4; + } + } else if (var2 > var4) { // L: 3560 + var0.y -= var8; // L: 3561 + if (var0.y < var4) { // L: 3562 + var0.y = var4; + } + } + } + + if (var3 == var0.x && var4 == var0.y) { // L: 3565 + --var0.pathLength; // L: 3566 + if (var0.field1224 > 0) { // L: 3567 + --var0.field1224; + } + } + + } else { + var0.x = var3; // L: 3511 + var0.y = var4; // L: 3512 + --var0.pathLength; // L: 3513 + if (var0.field1224 > 0) { + --var0.field1224; // L: 3514 + } + + } } - } // L: 10375 + } // L: 3480 3515 3569 + + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "40" + ) + static final void method329(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var8 = var6 - 334; // L: 4653 + if (var8 < 0) { // L: 4654 + var8 = 0; + } else if (var8 > 100) { // L: 4655 + var8 = 100; + } + + int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 4656 + int var7 = var5 * var9 / 256; // L: 4657 + var8 = 2048 - var3 & 2047; // L: 4660 + var9 = 2048 - var4 & 2047; // L: 4661 + int var10 = 0; // L: 4662 + int var11 = 0; // L: 4663 + int var12 = var7; // L: 4664 + int var13; + int var14; + int var15; + if (var8 != 0) { // L: 4665 + var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 4666 + var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 4667 + var15 = var14 * var11 - var13 * var7 >> 16; // L: 4668 + var12 = var13 * var11 + var14 * var7 >> 16; // L: 4669 + var11 = var15; // L: 4670 + } + + if (var9 != 0) { // L: 4672 + var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 4673 + var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 4674 + var15 = var13 * var12 + var10 * var14 >> 16; // L: 4675 + var12 = var14 * var12 - var10 * var13 >> 16; // L: 4676 + var10 = var15; // L: 4677 + } + + ModeWhere.cameraX = var0 - var10; // L: 4679 + WorldMapRectangle.cameraY = var1 - var11; // L: 4680 + ReflectionCheck.cameraZ = var2 - var12; // L: 4681 + WorldMapArea.cameraPitch = var3; // L: 4682 + class69.cameraYaw = var4; // L: 4683 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class6.oculusOrbFocalPointX >> 7 != Varcs.localPlayer.x >> 7 || Players.oculusOrbFocalPointY >> 7 != Varcs.localPlayer.y >> 7)) { // L: 4684 4685 + var13 = Varcs.localPlayer.plane; // L: 4686 + var14 = (class6.oculusOrbFocalPointX >> 7) + ItemLayer.baseX; // L: 4687 + var15 = (Players.oculusOrbFocalPointY >> 7) + Tile.baseY; // L: 4688 + class9.method123(var14, var15, var13, true); // L: 4689 + } + + } // L: 4692 } diff --git a/runescape-client/src/main/java/class221.java b/runescape-client/src/main/java/class221.java new file mode 100644 index 0000000000..01da72103a --- /dev/null +++ b/runescape-client/src/main/java/class221.java @@ -0,0 +1,54 @@ +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; + +@ObfuscatedName("hp") +public class class221 { + @ObfuscatedName("g") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", + garbageValue = "-1930935119" + ) + static void method4198(String var0, boolean var1, String var2, boolean var3) { + if (var1) { // L: 26 + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 27 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 29 + return; // L: 30 + } catch (Exception var5) { // L: 32 + } + } + + if (class44.field294.startsWith("win") && !var3) { // L: 34 35 + class311.method5605(var0, 0, "openjs"); + return; // L: 39 + } + + if (class44.field294.startsWith("mac")) { // L: 42 + class311.method5605(var0, 1, var2); // L: 43 + return; // L: 44 + } + + class311.method5605(var0, 2, "openjs"); // L: 47 + } else { + class311.method5605(var0, 3, "openjs"); // L: 52 + } + + } // L: 55 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1932340849" + ) + public static boolean method4200(int var0) { + return (var0 >> 30 & 1) != 0; // L: 37 + } +} diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java new file mode 100644 index 0000000000..2c02834c37 --- /dev/null +++ b/runescape-client/src/main/java/class223.java @@ -0,0 +1,306 @@ +import java.io.DataInputStream; +import java.net.URL; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hi") +public class class223 { + @ObfuscatedName("f") + public static final short[] field2609; + @ObfuscatedName("o") + public static final short[][] field2608; + @ObfuscatedName("u") + public static final short[] field2611; + @ObfuscatedName("p") + public static final short[][] field2610; + @ObfuscatedName("h") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; + + static { + field2609 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field2608 = 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 + field2611 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field2610 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-1982407025" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; // L: 33 + if (var1 != null) { // L: 34 + var2 = class7.method107(var1); + } + + if (var0 != null) { // L: 35 + if (var1 != null) { // L: 36 + var2 = var2 + " | "; + } + + var2 = var2 + var0; // L: 37 + } + + System.out.println("Error: " + var2); // L: 39 + var2 = var2.replace(':', '.'); // L: 40 + var2 = var2.replace('@', '_'); // L: 41 + var2 = var2.replace('&', '_'); // L: 42 + var2 = var2.replace('#', '_'); // L: 43 + if (SecureRandomCallable.RunException_applet == null) { // L: 44 + return; + } + + URL var3 = new URL(SecureRandomCallable.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 45 + DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46 + var4.read(); // L: 47 + var4.close(); // L: 48 + } catch (Exception var5) { // L: 50 + } + + } + } // L: 51 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "2" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 13 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "962825784" + ) + static int method4236(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 422 + return class32.method394(var0, var1, var2); + } else if (var0 < 1100) { // L: 423 + return UserComparator7.method2431(var0, var1, var2); + } else if (var0 < 1200) { // L: 424 + return AttackOption.method2260(var0, var1, var2); + } else if (var0 < 1300) { // L: 425 + return class24.method349(var0, var1, var2); + } else if (var0 < 1400) { // L: 426 + return ModeWhere.method4705(var0, var1, var2); + } else if (var0 < 1500) { // L: 427 + return InterfaceParent.method2095(var0, var1, var2); + } else if (var0 < 1600) { // L: 428 + return WorldMapArea.method2740(var0, var1, var2); + } else if (var0 < 1700) { // L: 429 + return GameEngine.method547(var0, var1, var2); + } else if (var0 < 1800) { // L: 430 + return SoundCache.method883(var0, var1, var2); + } else if (var0 < 1900) { // L: 431 + return Player.method2140(var0, var1, var2); + } else if (var0 < 2000) { // L: 432 + return MouseHandler.method726(var0, var1, var2); + } else if (var0 < 2100) { // L: 433 + return UserComparator7.method2431(var0, var1, var2); + } else if (var0 < 2200) { // L: 434 + return AttackOption.method2260(var0, var1, var2); + } else if (var0 < 2300) { // L: 435 + return class24.method349(var0, var1, var2); + } else if (var0 < 2400) { // L: 436 + return ModeWhere.method4705(var0, var1, var2); + } else if (var0 < 2500) { + return InterfaceParent.method2095(var0, var1, var2); // L: 437 + } else if (var0 < 2600) { // L: 438 + return class69.method1169(var0, var1, var2); + } else if (var0 < 2700) { // L: 439 + return ReflectionCheck.method1171(var0, var1, var2); + } else if (var0 < 2800) { // L: 440 + return Buddy.method5815(var0, var1, var2); + } else if (var0 < 2900) { // L: 441 + return AbstractUserComparator.method5710(var0, var1, var2); + } else if (var0 < 3000) { // L: 442 + return MouseHandler.method726(var0, var1, var2); + } else if (var0 < 3200) { // L: 443 + return FaceNormal.method3630(var0, var1, var2); + } else if (var0 < 3300) { // L: 444 + return Tile.method3358(var0, var1, var2); + } else if (var0 < 3400) { // L: 445 + return SpriteMask.method4173(var0, var1, var2); + } else if (var0 < 3500) { // L: 446 + return class0.method10(var0, var1, var2); + } else if (var0 < 3700) { // L: 447 + return class263.method4666(var0, var1, var2); + } else if (var0 < 3800) { // L: 448 + return method4235(var0, var1, var2); + } else if (var0 < 3900) { // L: 449 + return Script.method1998(var0, var1, var2); + } else if (var0 < 4000) { // L: 450 + return PacketBuffer.method6559(var0, var1, var2); + } else if (var0 < 4100) { // L: 451 + return class82.method1922(var0, var1, var2); + } else if (var0 < 4200) { // L: 452 + return class9.method120(var0, var1, var2); + } else if (var0 < 4300) { + return class239.method4385(var0, var1, var2); // L: 453 + } else if (var0 < 5100) { // L: 454 + return class19.method285(var0, var1, var2); + } else if (var0 < 5400) { // L: 455 + return GrandExchangeOfferOwnWorldComparator.method1217(var0, var1, var2); + } else if (var0 < 5600) { // L: 456 + return class25.method350(var0, var1, var2); + } else if (var0 < 5700) { // L: 457 + return class6.method96(var0, var1, var2); + } else if (var0 < 6300) { // L: 458 + return PcmPlayer.method837(var0, var1, var2); + } else if (var0 < 6600) { // L: 459 + return class9.method122(var0, var1, var2); + } else if (var0 < 6700) { // L: 460 + return class227.method4327(var0, var1, var2); + } else if (var0 < 6800) { // L: 461 + return GrandExchangeOfferOwnWorldComparator.method1216(var0, var1, var2); + } else if (var0 < 6900) { // L: 462 + return class9.method121(var0, var1, var2); + } else if (var0 < 7000) { // L: 463 + return VarcInt.method4941(var0, var1, var2); + } else if (var0 < 7100) { // L: 464 + return class12.method209(var0, var1, var2); + } else if (var0 < 7200) { // L: 465 + return VarpDefinition.method4898(var0, var1, var2); + } else { + return var0 < 7300 ? SpotAnimationDefinition.method5048(var0, var1, var2) : 2; // L: 466 467 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "272018600" + ) + public static boolean method4239(int var0) { + return (var0 >> 21 & 1) != 0; // L: 25 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lal;B)V", + garbageValue = "0" + ) + static void method4238(GameEngine var0) { + while (class231.isKeyDown()) { // L: 1262 + if (class19.field146 == 13) { // L: 1263 + Login.worldSelectOpen = false; // L: 1265 + Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1266 + ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1267 + class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 1268 + return; // L: 1270 + } + + if (class19.field146 == 96) { // L: 1272 + if (Login.worldSelectPage > 0 && World.worldSelectLeftSprite != null) { // L: 1273 + --Login.worldSelectPage; // L: 1274 + } + } else if (class19.field146 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && Interpreter.worldSelectRightSprite != null) { // L: 1277 1278 + ++Login.worldSelectPage; // L: 1279 + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !MouseHandler.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1283 + int var1 = Login.xPadding + 280; // L: 1284 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1285 + UserComparator4.changeWorldSelectSorting(0, 0); // L: 1286 + return; // L: 1287 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1289 + UserComparator4.changeWorldSelectSorting(0, 1); // L: 1290 + return; // L: 1291 + } + + int var2 = Login.xPadding + 390; // L: 1293 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1294 + UserComparator4.changeWorldSelectSorting(1, 0); // L: 1295 + return; // L: 1296 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1298 + UserComparator4.changeWorldSelectSorting(1, 1); // L: 1299 + return; // L: 1300 + } + + int var3 = Login.xPadding + 500; // L: 1302 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1303 + UserComparator4.changeWorldSelectSorting(2, 0); // L: 1304 + return; // L: 1305 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1307 + UserComparator4.changeWorldSelectSorting(2, 1); // L: 1308 + return; // L: 1309 + } + + int var4 = Login.xPadding + 610; // L: 1311 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1312 + UserComparator4.changeWorldSelectSorting(3, 0); // L: 1313 + return; // L: 1314 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1316 + UserComparator4.changeWorldSelectSorting(3, 1); // L: 1317 + return; // L: 1318 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1320 + Login.worldSelectOpen = false; // L: 1322 + Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1323 + ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1324 + class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 1325 + return; // L: 1327 + } + + if (Login.hoveredWorldIndex != -1) { // L: 1329 + World var5 = class9.World_worlds[Login.hoveredWorldIndex]; // L: 1330 + class148.changeWorld(var5); // L: 1331 + Login.worldSelectOpen = false; // L: 1333 + Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1334 + ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1335 + class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 1336 + return; // L: 1338 + } + + if (Login.worldSelectPage > 0 && World.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= World.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameEngine.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameEngine.canvasHeight / 2 + 50) { // L: 1340 + --Login.worldSelectPage; // L: 1341 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && Interpreter.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= InterfaceParent.canvasWidth - Interpreter.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= InterfaceParent.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameEngine.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameEngine.canvasHeight / 2 + 50) { // L: 1343 + ++Login.worldSelectPage; // L: 1344 + } + } + + } // L: 1347 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-1972284946" + ) + static int method4235(int var0, Script var1, boolean var2) { + if (var0 != 3700 && var0 != 3701) { // L: 2408 + if (var0 == 3702) { // L: 2413 + ++class16.Interpreter_intStackSize; // L: 2414 + return 1; // L: 2415 + } else { + return 2; // L: 2417 + } + } else { + --class16.Interpreter_intStackSize; // L: 2409 + --Interpreter.Interpreter_stringStackSize; // L: 2410 + return 1; // L: 2411 + } + } +} diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java deleted file mode 100644 index fbaf3b5c4b..0000000000 --- a/runescape-client/src/main/java/class224.java +++ /dev/null @@ -1,97 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("hn") -public class class224 { - @ObfuscatedName("n") - public static final short[] field2577; - @ObfuscatedName("v") - public static final short[][] field2573; - @ObfuscatedName("d") - public static final short[] field2575; - @ObfuscatedName("c") - public static final short[][] field2574; - @ObfuscatedName("x") - @Export("cacheParentPaths") - static String[] cacheParentPaths; - - static { - field2577 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 - field2573 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5 - field2575 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 - field2574 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13 - } - - @ObfuscatedName("hr") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2091444199" - ) - @Export("createMinimapSprite") - static final void createMinimapSprite(int plane) { - int[] var1 = GrandExchangeOfferAgeComparator.sceneMinimapSprite.pixels; // L: 5775 - int var2 = var1.length; // L: 5776 - - int var3; - for (var3 = 0; var3 < var2; ++var3) { // L: 5777 - var1[var3] = 0; - } - - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { // L: 5778 - var4 = (103 - var3) * 2048 + 24628; // L: 5779 - - for (var5 = 1; var5 < 103; ++var5) { // L: 5780 - if ((Tiles.Tiles_renderFlags[plane][var5][var3] & 24) == 0) { // L: 5781 - MilliClock.scene.drawTileMinimap(var1, var4, 512, plane, var5, var3); - } - - if (plane < 3 && (Tiles.Tiles_renderFlags[plane + 1][var5][var3] & 8) != 0) { // L: 5782 - MilliClock.scene.drawTileMinimap(var1, var4, 512, plane + 1, var5, var3); - } - - var4 += 4; // L: 5783 - } - } - - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5786 - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5787 - GrandExchangeOfferAgeComparator.sceneMinimapSprite.setRaster(); // L: 5788 - - int var6; - for (var5 = 1; var5 < 103; ++var5) { // L: 5789 - for (var6 = 1; var6 < 103; ++var6) { // L: 5790 - if ((Tiles.Tiles_renderFlags[plane][var6][var5] & 24) == 0) { // L: 5791 - Username.drawObject(plane, var6, var5, var3, var4); - } - - if (plane < 3 && (Tiles.Tiles_renderFlags[plane + 1][var6][var5] & 8) != 0) { // L: 5792 - Username.drawObject(plane + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; // L: 5795 - - for (var5 = 0; var5 < 104; ++var5) { // L: 5796 - for (var6 = 0; var6 < 104; ++var6) { // L: 5797 - long var7 = MilliClock.scene.getFloorDecorationTag(class90.Client_plane, var5, var6); // L: 5798 - if (var7 != 0L) { // L: 5799 - int var9 = class25.Entity_unpackID(var7); // L: 5800 - int var10 = WorldMapAreaData.getObjectDefinition(var9).mapIconId; // L: 5801 - if (var10 >= 0 && InvDefinition.WorldMapElement_get(var10).field3255) { // L: 5802 5803 - Client.mapIcons[Client.mapIconCount] = InvDefinition.WorldMapElement_get(var10).getSpriteBool(false); // L: 5806 - Client.mapIconXs[Client.mapIconCount] = var5; // L: 5807 - Client.mapIconYs[Client.mapIconCount] = var6; // L: 5808 - ++Client.mapIconCount; // L: 5809 - } - } - } - } - - FileSystem.rasterProvider.apply(); // L: 5814 - } // L: 5815 -} \ No newline at end of file diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index b06f2ed5ec..f20fc30a83 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,45 +1,89 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hg") public class class225 { - @ObfuscatedName("z") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("e") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "-47" + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 896523557 ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); // L: 140 - int var2 = 0; // L: 141 + static int field2777; - for (int var3 = 0; var3 < var1; ++var3) { // L: 142 - var2 = (var2 << 5) - var2 + LoginPacket.charToByteCp1252(var0.charAt(var3)); + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lkw;", + garbageValue = "57239353" + ) + @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 } - - return var2; // L: 143 } - @ObfuscatedName("q") + @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "16" + descriptor = "(III)V", + garbageValue = "2045310244" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 155 - } + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[class26.Client_plane][var0][var1]; // L: 7104 + if (var2 == null) { // L: 7105 + WorldMapArea.scene.removeGroundItemPile(class26.Client_plane, var0, var1); // L: 7106 + } else { + long var3 = -99999999L; // L: 7109 + TileItem var5 = null; // L: 7110 - @ObfuscatedName("q") - static boolean method4239(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; // L: 76 - } + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7111 7112 7120 + ItemComposition var7 = class23.ItemDefinition_get(var6.id); // L: 7113 + long var11 = (long)var7.price; // L: 7114 + if (var7.isStackable == 1) { // L: 7115 + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { // L: 7116 + var3 = var11; // L: 7117 + var5 = var6; // L: 7118 + } + } + + if (var5 == null) { // L: 7122 + WorldMapArea.scene.removeGroundItemPile(class26.Client_plane, var0, var1); // L: 7123 + } else { + var2.addLast(var5); // L: 7126 + TileItem var13 = null; // L: 7127 + TileItem var8 = null; // L: 7128 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7129 7130 7135 + if (var6.id != var5.id) { // L: 7131 + if (var13 == null) { // L: 7132 + var13 = var6; + } + + if (var13.id != var6.id && var8 == null) { // L: 7133 + var8 = var6; + } + } + } + + long var9 = AttackOption.calculateTag(var0, var1, 3, false, 0); // L: 7137 + WorldMapArea.scene.newGroundItemPile(class26.Client_plane, var0, var1, UserComparator7.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class26.Client_plane), var5, var9, var13, var8); // L: 7138 + } + } + } // L: 7107 7124 7139 } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java new file mode 100644 index 0000000000..ec871aab9f --- /dev/null +++ b/runescape-client/src/main/java/class227.java @@ -0,0 +1,371 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("hz") +public class class227 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhx;" + ) + @Export("huffman") + static Huffman huffman; + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILcc;ZB)I", + garbageValue = "0" + ) + static int method4327(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3742 + var3 = class26.Client_plane; // L: 3743 + int var15 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 3744 + int var8 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 3745 + Actor.getWorldMap().method6116(var3, var15, var8, true); // L: 3746 + return 1; // L: 3747 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3749 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3750 + String var16 = ""; // L: 3751 + var9 = Actor.getWorldMap().getMapArea(var3); // L: 3752 + if (var9 != null) { // L: 3753 + var16 = var9.getExternalName(); // L: 3754 + } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; // L: 3756 + return 1; // L: 3757 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3759 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3760 + Actor.getWorldMap().setCurrentMapAreaId(var3); // L: 3761 + return 1; // L: 3762 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3764 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getZoomLevel(); // L: 3765 + return 1; // L: 3766 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3768 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3769 + Actor.getWorldMap().setZoomPercentage(var3); // L: 3770 + return 1; // L: 3771 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3773 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3774 + return 1; // L: 3775 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3777 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3778 + Actor.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3779 + return 1; // L: 3780 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3782 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3783 + Actor.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3784 + return 1; // L: 3785 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3787 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3788 + Actor.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3789 + return 1; // L: 3790 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3792 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3793 + Actor.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3794 + return 1; // L: 3795 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3797 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayX(); // L: 3798 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayY(); // L: 3799 + return 1; // L: 3800 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3802 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3803 + var11 = Actor.getWorldMap().getMapArea(var3); // L: 3804 + if (var11 == null) { // L: 3805 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3806 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3809 + } + + return 1; // L: 3811 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3813 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3814 + var11 = Actor.getWorldMap().getMapArea(var3); // L: 3815 + if (var11 == null) { // L: 3816 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3817 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3818 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3821 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3822 + } + + return 1; // L: 3824 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3826 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3827 + var11 = Actor.getWorldMap().getMapArea(var3); // L: 3828 + if (var11 == null) { // L: 3829 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3830 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3831 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3832 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3833 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3836 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3837 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3838 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3839 + } + + return 1; // L: 3841 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3843 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3844 + var11 = Actor.getWorldMap().getMapArea(var3); // L: 3845 + if (var11 == null) { // L: 3846 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3847 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3850 + } + + return 1; // L: 3852 + } else if (var0 == 6615) { // L: 3854 + var14 = Actor.getWorldMap().getDisplayCoord(); // L: 3855 + if (var14 == null) { // L: 3856 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3857 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3858 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var14.x; // L: 3861 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var14.y; // L: 3862 + } + + return 1; // L: 3864 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3866 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().currentMapAreaId(); // L: 3867 + return 1; // L: 3868 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3870 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3871 + var11 = Actor.getWorldMap().getCurrentMapArea(); // L: 3872 + if (var11 == null) { // L: 3873 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3874 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3875 + return 1; // L: 3876 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3878 + if (var12 == null) { // L: 3879 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3880 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3881 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12[0]; // L: 3884 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12[1]; // L: 3885 + } + + return 1; // L: 3887 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 3889 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3890 + var11 = Actor.getWorldMap().getCurrentMapArea(); // L: 3891 + if (var11 == null) { // L: 3892 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3893 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3894 + return 1; // L: 3895 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 3897 + if (var5 == null) { // L: 3898 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3899 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.packed(); // L: 3902 + } + + return 1; // L: 3904 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 3906 + class16.Interpreter_intStackSize -= 2; // L: 3907 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3908 + var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3909 + class2.method37(var3, var10, false); // L: 3910 + return 1; // L: 3911 + } else if (var0 == 6620) { // L: 3913 + class16.Interpreter_intStackSize -= 2; // L: 3914 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3915 + var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3916 + class2.method37(var3, var10, true); // L: 3917 + return 1; // L: 3918 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3920 + class16.Interpreter_intStackSize -= 2; // L: 3921 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3922 + var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 3923 + var9 = Actor.getWorldMap().getMapArea(var3); // L: 3924 + if (var9 == null) { // L: 3925 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3926 + return 1; // L: 3927 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3929 + return 1; // L: 3930 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3932 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayWith(); // L: 3933 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getDisplayHeight(); // L: 3934 + return 1; // L: 3935 + } else if (var0 == 6623) { // L: 3937 + var14 = new Coord(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3938 + var11 = Actor.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3939 + if (var11 == null) { // L: 3940 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3941 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var11.getId(); // L: 3944 + } + + return 1; // L: 3946 + } else if (var0 == 6624) { // L: 3948 + Actor.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3949 + return 1; // L: 3950 + } else if (var0 == 6625) { // L: 3952 + Actor.getWorldMap().resetMaxFlashCount(); // L: 3953 + return 1; // L: 3954 + } else if (var0 == 6626) { // L: 3956 + Actor.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 3957 + return 1; // L: 3958 + } else if (var0 == 6627) { // L: 3960 + Actor.getWorldMap().resetCyclesPerFlash(); // L: 3961 + return 1; // L: 3962 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 3964 + var13 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 3965 + Actor.getWorldMap().setPerpetualFlash(var13); // L: 3966 + return 1; // L: 3967 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 3969 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3970 + Actor.getWorldMap().flashElement(var3); // L: 3971 + return 1; // L: 3972 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 3974 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3975 + Actor.getWorldMap().flashCategory(var3); // L: 3976 + return 1; // L: 3977 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 3979 + Actor.getWorldMap().stopCurrentFlashes(); // L: 3980 + return 1; // L: 3981 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 3983 + var13 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 3984 + Actor.getWorldMap().setElementsDisabled(var13); // L: 3985 + return 1; // L: 3986 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 3988 + class16.Interpreter_intStackSize -= 2; // L: 3989 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3990 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 3991 + Actor.getWorldMap().disableElement(var3, var7); // L: 3992 + return 1; // L: 3993 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 3995 + class16.Interpreter_intStackSize -= 2; // L: 3996 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3997 + var7 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 3998 + Actor.getWorldMap().setCategoryDisabled(var3, var7); // L: 3999 + return 1; // L: 4000 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4002 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4003 + return 1; // L: 4004 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4006 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4007 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4008 + return 1; // L: 4009 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4011 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4012 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Actor.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4013 + return 1; // L: 4014 + } else if (var0 == 6638) { // L: 4016 + class16.Interpreter_intStackSize -= 2; // L: 4017 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 4018 + var10 = new Coord(Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]); // L: 4019 + var5 = Actor.getWorldMap().method6130(var3, var10); // L: 4020 + if (var5 == null) { // L: 4021 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4022 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var5.packed(); // L: 4025 + } + + return 1; // L: 4027 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4029 + var6 = Actor.getWorldMap().iconStart(); // L: 4030 + if (var6 == null) { // L: 4031 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4032 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4033 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4036 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4037 + } + + return 1; // L: 4039 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4041 + var6 = Actor.getWorldMap().iconNext(); // L: 4042 + if (var6 == null) { // L: 4043 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4044 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4045 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4048 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4049 + } + + return 1; // L: 4051 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4053 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4054 + var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4055 + if (var4.name == null) { // L: 4056 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4057 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; // L: 4060 + } + + return 1; // L: 4062 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4064 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4065 + var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4066 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.textSize; // L: 4067 + return 1; // L: 4068 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4070 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4071 + var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4072 + if (var4 == null) { // L: 4073 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4074 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.category; // L: 4077 + } + + return 1; // L: 4079 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4081 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 4082 + var4 = ByteArrayPool.WorldMapElement_get(var3); // L: 4083 + if (var4 == null) { // L: 4084 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 4085 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4088 + } + + return 1; // L: 4090 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4092 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UrlRequest.worldMapEvent.mapElement; // L: 4093 + return 1; // L: 4094 + } else if (var0 == 6698) { // L: 4096 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UrlRequest.worldMapEvent.coord1.packed(); // L: 4097 + return 1; // L: 4098 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4100 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UrlRequest.worldMapEvent.coord2.packed(); // L: 4101 + return 1; // L: 4102 + } else { + return 2; // L: 4104 + } + } + } + } + } + } + } + } + } + } + } +} diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java deleted file mode 100644 index 4e8ba50308..0000000000 --- a/runescape-client/src/main/java/class228.java +++ /dev/null @@ -1,146 +0,0 @@ -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("hx") -public class class228 { - @ObfuscatedName("ri") - @ObfuscatedGetter( - intValue = 335336935 - ) - static int field2740; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;B)V", - garbageValue = "-43" - ) - public static void method4310(AbstractArchive var0) { - FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; // L: 26 - } // L: 27 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-1439463638" - ) - static int method4309(int var0, Script var1, boolean var2) { - int var4; - int var9; - if (var0 == ScriptOpcodes.CC_CREATE) { // L: 433 - Interpreter.Interpreter_intStackSize -= 3; // L: 434 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 435 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 436 - int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 437 - if (var4 == 0) { // L: 438 - throw new RuntimeException(); // L: 439 - } else { - Widget var6 = class237.getWidget(var9); // L: 441 - if (var6.children == null) { // L: 442 - var6.children = new Widget[var11 + 1]; - } - - if (var6.children.length <= var11) { // L: 443 - Widget[] var7 = new Widget[var11 + 1]; // L: 444 - - for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 445 - var7[var8] = var6.children[var8]; - } - - var6.children = var7; // L: 446 - } - - if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 448 - throw new RuntimeException("" + (var11 - 1)); - } else { - Widget var12 = new Widget(); // L: 449 - var12.type = var4; // L: 450 - var12.parentId = var12.id = var6.id; // L: 451 - var12.childIndex = var11; // L: 452 - var12.isIf3 = true; // L: 453 - var6.children[var11] = var12; // L: 454 - if (var2) { // L: 455 - class277.scriptDotWidget = var12; - } else { - Interpreter.scriptActiveWidget = var12; // L: 456 - } - - IsaacCipher.invalidateWidget(var6); // L: 457 - return 1; // L: 458 - } - } - } else { - Widget var3; - if (var0 == ScriptOpcodes.CC_DELETE) { // L: 460 - var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 461 - Widget var10 = class237.getWidget(var3.id); // L: 462 - var10.children[var3.childIndex] = null; // L: 463 - IsaacCipher.invalidateWidget(var10); // L: 464 - return 1; // L: 465 - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 467 - var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 468 - var3.children = null; // L: 469 - IsaacCipher.invalidateWidget(var3); // L: 470 - return 1; // L: 471 - } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 473 - if (var0 == ScriptOpcodes.IF_FIND) { // L: 486 - var3 = class237.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 487 - if (var3 != null) { // L: 488 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 489 - if (var2) { // L: 490 - class277.scriptDotWidget = var3; - } else { - Interpreter.scriptActiveWidget = var3; // L: 491 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 493 - } - - return 1; // L: 494 - } else { - return 2; // L: 496 - } - } else { - Interpreter.Interpreter_intStackSize -= 2; // L: 474 - var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 475 - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 476 - Widget var5 = ArchiveLoader.getWidgetChild(var9, var4); // L: 477 - if (var5 != null && var4 != -1) { // L: 478 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 479 - if (var2) { // L: 480 - class277.scriptDotWidget = var5; - } else { - Interpreter.scriptActiveWidget = var5; // L: 481 - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 483 - } - - return 1; // L: 484 - } - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2112037440" - ) - public static void method4311() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 98 - } // L: 99 - - @ObfuscatedName("jd") - @ObfuscatedSignature( - descriptor = "(IIS)V", - garbageValue = "585" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (WorldMapCacheName.loadInterface(var0)) { // L: 10840 - WorldMapData_1.runComponentCloseListeners(DefaultsGroup.Widget_interfaceComponents[var0], var1); // L: 10841 - } - } // L: 10842 -} diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index 53d0bc055c..d13eee177c 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,140 +1,217 @@ -import java.io.File; -import java.io.RandomAccessFile; -import java.util.LinkedHashMap; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("r") -public class class23 { - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZI)Z", - garbageValue = "-1646838359" +@ObfuscatedName("w") +public class class23 extends class14 { + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1984998217 ) - @Export("isWriteable") - static boolean isWriteable(File var0, boolean deleteAfterWrite) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 206 - int var3 = var2.read(); // L: 207 - var2.seek(0L); // L: 208 - var2.write(var3); // L: 209 - var2.seek(0L); // L: 210 - var2.close(); // L: 211 - if (deleteAfterWrite) { // L: 212 - var0.delete(); - } + int field181; + @ObfuscatedName("o") + byte field177; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; - return true; // L: 213 - } catch (Exception var4) { // L: 215 - return false; // L: 216 - } + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class23(class2 var1) { + this.this$0 = var1; + this.field181 = -1; // L: 128 + } // L: 131 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field181 = var1.readUnsignedShort(); // L: 134 + this.field177 = var1.readByte(); // L: 135 + } // L: 136 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method151(this.field181, this.field177); // L: 139 + } // L: 140 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(S)[Lim;", + garbageValue = "128" + ) + static GameBuild[] method344() { + return new GameBuild[]{GameBuild.RC, GameBuild.WIP, GameBuild.LIVE, GameBuild.BUILDLIVE}; } - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-981908924" + descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "-1702727810" ) - static void method232() { - Tiles.field517 = null; // L: 64 - class200.field2399 = null; // L: 65 - Tiles.field530 = null; // L: 66 - class1.field1 = null; // L: 67 - class2.field12 = null; // L: 68 - TaskHandler.field2045 = null; // L: 69 - WorldMapSprite.field257 = null; // L: 70 - GrandExchangeOfferAgeComparator.Tiles_hue = null; // L: 71 - Tiles.Tiles_saturation = null; - WorldMapLabel.Tiles_lightness = null; // L: 73 - TaskHandler.Tiles_hueMultiplier = null; // L: 74 - WorldMapID.field292 = null; // L: 75 - } // L: 76 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-1513413924" - ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1738423224" - ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; // L: 95 - - try { - var0 = WorldMapRectangle.getPreferencesFile("", FontName.field3699.name, true); // L: 97 - Buffer var1 = WorldMapSectionType.clientPreferences.toBuffer(); // L: 98 - var0.write(var1.array, 0, var1.offset); // L: 99 - } catch (Exception var3) { // L: 101 - } - - try { - if (var0 != null) { // L: 103 - var0.closeSync(true); // L: 104 - } - } catch (Exception var2) { // L: 107 - } - - } // L: 108 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "1098573147" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { // L: 222 - return Byte.TYPE; - } else if (var0.equals("I")) { // L: 223 - return Integer.TYPE; - } else if (var0.equals("S")) { // L: 224 - return Short.TYPE; - } else if (var0.equals("J")) { // L: 225 - return Long.TYPE; - } else if (var0.equals("Z")) { // L: 226 - return Boolean.TYPE; - } else if (var0.equals("F")) { // L: 227 - return Float.TYPE; - } else if (var0.equals("D")) { // L: 228 - return Double.TYPE; - } else if (var0.equals("C")) { // L: 229 - return Character.TYPE; + public static String method346(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 { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231 + 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("fg") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-354639322" + descriptor = "(II)Lko;", + garbageValue = "467891308" ) - static final void method234(boolean var0) { - if (var0) { // L: 2650 - Client.field661 = Login.field1217 ? class169.field2011 : class169.field2018; // L: 2651 + @Export("ItemDefinition_get") + public static ItemComposition ItemDefinition_get(int var0) { + ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 92 + if (var1 != null) { // L: 93 + return var1; } else { - LinkedHashMap var1 = WorldMapSectionType.clientPreferences.parameters; // L: 2654 - String var3 = Login.Login_username; // L: 2656 - int var4 = var3.length(); // L: 2658 - int var5 = 0; // L: 2659 - - for (int var6 = 0; var6 < var4; ++var6) { // L: 2660 - var5 = (var5 << 5) - var5 + var3.charAt(var6); + byte[] var2 = Widget.ItemDefinition_archive.takeFile(10, var0); // L: 94 + var1 = new ItemComposition(); // L: 95 + var1.id = var0; // L: 96 + if (var2 != null) { // L: 97 + var1.decode(new Buffer(var2)); } - Client.field661 = var1.containsKey(var5) ? class169.field2013 : class169.field2012; // L: 2663 + var1.post(); // L: 98 + if (var1.noteTemplate != -1) { // L: 99 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 100 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 101 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!class21.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 + var1.name = "Members object"; // L: 103 + var1.isTradable = false; // L: 104 + var1.groundActions = null; // L: 105 + var1.inventoryActions = null; // L: 106 + var1.shiftClickIndex = -1; // L: 107 + var1.team = 0; // L: 108 + if (var1.params != null) { // L: 109 + boolean var3 = false; // L: 110 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111 + ParamComposition var5 = UserComparator3.getParamDefinition((int)var4.key); // L: 112 + if (var5.autoDisable) { // L: 113 + var4.remove(); + } else { + var3 = true; // L: 114 + } + } + + if (!var3) { // L: 116 + var1.params = null; + } + } + } + + ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 119 + return var1; // L: 120 + } + } + + @ObfuscatedName("o") + static boolean method341(long var0) { + int var2 = (int)(var0 >>> 14 & 3L); // L: 50 + return var2 == 2; // L: 52 + } + + @ObfuscatedName("ev") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1393325468" + ) + static int method345() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1268 + int var0 = 0; // L: 1269 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1270 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1271 + } + + return var0 * 10000 / Client.field740; // L: 1273 + } else { + return 10000; + } + } + + @ObfuscatedName("ea") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "41" + ) + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2340 + class16.method259(); // L: 2341 + WorldMapArea.scene.clear(); // L: 2342 + + for (int var0 = 0; var0 < 4; ++var0) { // L: 2343 + Client.collisionMaps[var0].clear(); } - } // L: 2665 -} \ No newline at end of file + System.gc(); // L: 2344 + PacketWriter.method2368(2); // L: 2345 + Client.currentTrackGroupId = -1; // L: 2346 + Client.field842 = false; // L: 2347 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 2349 + if (var1.stream1 != null) { // L: 2350 + Huffman.pcmStreamMixer.removeSubStream(var1.stream1); // L: 2351 + var1.stream1 = null; // L: 2352 + } + + if (var1.stream2 != null) { // L: 2354 + Huffman.pcmStreamMixer.removeSubStream(var1.stream2); // L: 2355 + var1.stream2 = null; // L: 2356 + } + } + + ObjectSound.objectSounds.clear(); // L: 2359 + class20.updateGameState(10); // L: 2361 + } // L: 2362 +} diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index 17763b576f..f979574b61 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,66 +1,54 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hy") public class class231 { - @ObfuscatedName("n") - public static final int method4321(double var0, double var2, double var4) { - double var6 = var4; // L: 9 - double var8 = var4; // L: 10 - double var10 = var4; // L: 11 - if (var2 != 0.0D) { // L: 12 - double var12; - if (var4 < 0.5D) { // L: 14 - var12 = (var2 + 1.0D) * var4; + @ObfuscatedName("ej") + static int[] field2803; + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)Lhu;", + garbageValue = "-1677453172" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = class139.getWidget(var0); // L: 198 + if (var1 == -1) { // L: 199 + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 200 201 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1586720207" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 177 + if (KeyHandler.field264 == KeyHandler.field271) { // L: 178 + return false; } 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 (var16 * 6.0D < 1.0D) { // L: 22 - var6 = var16 * 6.0D * (var12 - var14) + var14; - } else if (var16 * 2.0D < 1.0D) { // L: 23 - var6 = var12; - } else if (3.0D * var16 < 2.0D) { // L: 24 - var6 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var16); - } else { - var6 = var14; // L: 25 - } - - if (6.0D * var0 < 1.0D) { // L: 26 - var8 = 6.0D * (var12 - var14) * var0 + var14; - } else if (var0 * 2.0D < 1.0D) { // L: 27 - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var0); // L: 28 - } else { - var8 = var14; // L: 29 - } - - if (6.0D * var20 < 1.0D) { // L: 30 - var10 = var14 + var20 * 6.0D * (var12 - var14); - } else if (2.0D * var20 < 1.0D) { // L: 31 - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { // L: 32 - var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D; - } else { - var10 = var14; // L: 33 + class19.field146 = KeyHandler.field256[KeyHandler.field264]; // L: 179 + Message.field591 = KeyHandler.field252[KeyHandler.field264]; // L: 180 + KeyHandler.field264 = KeyHandler.field264 + 1 & 127; // L: 181 + return true; // L: 182 } } - - int var22 = (int)(256.0D * var6); // L: 35 - int var13 = (int)(256.0D * var8); // L: 36 - int var23 = (int)(256.0D * var10); // L: 37 - int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 - return var15; // L: 39 } + + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "(Lig;Ljava/lang/String;I)V", + garbageValue = "1174652683" + ) + static void method4356(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1252 + Client.archiveLoaders.add(var2); // L: 1253 + Client.field740 += var2.groupCount; // L: 1254 + } // L: 1255 } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 04d0eda0b6..26f1a357e6 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,96 +1,118 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") -public class class232 { - static { - int var0 = 0; // L: 9 - int var1 = 0; // L: 10 - class238[] var2 = class51.method872(); // L: 12 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13 - class238 var4 = var2[var3]; // L: 14 - if (var4.field3124 > var0) { - var0 = var4.field3124; // L: 16 - } - - if (var4.field3122 > var1) { // L: 17 - var1 = var4.field3122; - } - } - - } // L: 21 - - @ObfuscatedName("d") +@ObfuscatedName("hm") +public enum class232 implements Enumerated { + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1954194850" + descriptor = "Lhm;" ) - static int method4322(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 + field2809(0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + field2805(1), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + field2807(2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + field2808(3), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lhm;" + ) + field2811(4); - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; // L: 33 - } - } + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1140153863 + ) + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1125471863 + ) + final int field2810; - return var3; // L: 35 - } + class232(int var3) { + this.field2810 = var3; // L: 14 + } // L: 15 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field2810; // L: 18 } - @ObfuscatedName("fb") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2044662786" + garbageValue = "-692759541" ) - static void method4323() { - Client.packetWriter.clearBuffer(); // L: 2422 - Client.packetWriter.packetBuffer.offset = 0; // L: 2423 - Client.packetWriter.serverPacket = null; // L: 2424 - Client.packetWriter.field1331 = null; // L: 2425 - Client.packetWriter.field1333 = null; // L: 2426 - Client.packetWriter.field1334 = null; // L: 2427 - Client.packetWriter.serverPacketLength = 0; // L: 2428 - Client.packetWriter.field1330 = 0; // L: 2429 - Client.rebootTimer = 0; // L: 2430 - Client.menuOptionsCount = 0; // L: 2432 - Client.isMenuOpen = false; // L: 2433 - Client.minimapState = 0; // L: 2435 - Client.destinationX = 0; // L: 2436 + public static void method4360() { + class210.midiPcmStream.clear(); // L: 36 + class210.musicPlayerStatus = 1; // L: 37 + class210.musicTrackArchive = null; // L: 38 + } // L: 39 - int var0; - for (var0 = 0; var0 < 2048; ++var0) { // L: 2437 - Client.players[var0] = null; + @ObfuscatedName("fl") + @ObfuscatedSignature( + descriptor = "(Lkw;IIII)V", + garbageValue = "393437031" + ) + static void method4364(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Login.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3064 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3065 + int var4 = var0.soundEffects[var1]; // L: 3066 + if (var4 != 0) { // L: 3067 + int var5 = var4 >> 8; // L: 3068 + int var6 = var4 >> 4 & 7; // L: 3069 + int var7 = var4 & 15; // L: 3070 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3071 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3072 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3073 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3074 + int var8 = (var2 - 64) / 128; // L: 3075 + int var9 = (var3 - 64) / 128; // L: 3076 + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3077 + ++Client.soundEffectCount; // L: 3078 + } + } } + } // L: 3079 - UserComparator9.localPlayer = null; // L: 2438 + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lhu;I)Ljava/lang/String;", + garbageValue = "-2066634190" + ) + static String method4363(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 9917 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 9918 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 9920 + if (var3 == -1) { // L: 9921 + break; + } - for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2439 - NPC var1 = Client.npcs[var0]; // L: 2440 - if (var1 != null) { // L: 2441 - var1.targetIndex = -1; // L: 2442 - var1.false0 = false; // L: 2443 + var0 = var0.substring(0, var3) + WorldMapSection2.method2726(WorldMapSection0.method3036(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 9922 + } } } - ItemContainer.itemContainers = new NodeHashTable(32); // L: 2447 - ItemContainer.updateGameState(30); // L: 2449 - - for (var0 = 0; var0 < 100; ++var0) { // L: 2450 - Client.field816[var0] = true; - } - - PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); // L: 2453 - var2.packetBuffer.writeByte(BoundaryObject.getWindowedMode()); // L: 2454 - var2.packetBuffer.writeShort(GrandExchangeOfferTotalQuantityComparator.canvasWidth); // L: 2455 - var2.packetBuffer.writeShort(class25.canvasHeight); // L: 2456 - Client.packetWriter.addNode(var2); // L: 2457 - } // L: 2459 + return var0; // L: 9926 + } } diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java deleted file mode 100644 index e29ac1a9e5..0000000000 --- a/runescape-client/src/main/java/class234.java +++ /dev/null @@ -1,52 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iq") -public class class234 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lkd;I)V", - garbageValue = "-756253803" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); // L: 37 - int var1 = Client.localPlayerIndex; // L: 38 - Player var2 = UserComparator9.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 - GrandExchangeOfferNameComparator.baseX; // L: 45 - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 - var2.pathY[0] = var6 - NetCache.baseY; // L: 47 - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 - class90.Client_plane = var2.plane = var4; // L: 49 - if (Players.field1269[var1] != null) { // L: 50 - var2.read(Players.field1269[var1]); - } - - Players.Players_count = 0; // L: 51 - Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 - Players.field1275[var1] = 0; // L: 53 - Players.Players_emptyIdxCount = 0; // L: 54 - - for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 - if (var1 != var7) { // L: 56 - int var8 = var0.readBits(18); // L: 57 - int var9 = var8 >> 16; // L: 58 - int var10 = var8 >> 8 & 597; // L: 59 - int var11 = var8 & 597; // L: 60 - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 - Players.Players_orientations[var7] = 0; // L: 62 - Players.Players_targetIndices[var7] = -1; // L: 63 - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 - Players.field1275[var7] = 0; // L: 65 - } - } - - var0.exportIndex(); // L: 67 - } // L: 68 -} diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java index d2519d9432..2e1c28cee3 100644 --- a/runescape-client/src/main/java/class235.java +++ b/runescape-client/src/main/java/class235.java @@ -1,16 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("iu") public class class235 { - @ObfuscatedName("n") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "(Lig;Lig;I)V", - garbageValue = "-1015609755" + descriptor = "Lig;" ) - public static void method4331(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; // L: 27 - KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29 - } // L: 30 + @Export("archive2") + static Archive archive2; + @ObfuscatedName("nu") + @ObfuscatedGetter( + intValue = -1032063109 + ) + static int field2843; } diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java index b931be8105..b75ebefc17 100644 --- a/runescape-client/src/main/java/class236.java +++ b/runescape-client/src/main/java/class236.java @@ -1,35 +1,37 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") -public final class class236 { - @ObfuscatedName("fv") - @ObfuscatedGetter( - longValue = -1285822729066684367L - ) - static long field3108; - @ObfuscatedName("gy") +@ObfuscatedName("ii") +public class class236 { + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "(Lir;Lir;III)Lkq;", + garbageValue = "-34187782" ) - @Export("redHintArrowSprite") - static SpritePixels redHintArrowSprite; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1107662204" - ) - public static int method4332(int var0, int var1, int var2) { - var2 &= 3; // L: 9 - if (var2 == 0) { // L: 10 - return var0; - } else if (var2 == 1) { // L: 11 - return var1; + public static Font method4378(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + byte[] var5 = var0.takeFile(var2, var3); // L: 122 + boolean var4; + if (var5 == null) { // L: 123 + var4 = false; // L: 124 } else { - return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 + class244.SpriteBuffer_decode(var5); // L: 127 + var4 = true; // L: 128 + } + + if (!var4) { // L: 130 + return null; + } else { + byte[] var6 = var1.takeFile(var2, var3); // L: 132 + Font var8; + if (var6 == null) { // L: 134 + var8 = null; // L: 135 + } else { + Font var7 = new Font(var6, class0.SpriteBuffer_xOffsets, Interpreter.SpriteBuffer_yOffsets, class395.SpriteBuffer_spriteWidths, class157.SpriteBuffer_spriteHeights, Varps.SpriteBuffer_spritePalette, class223.SpriteBuffer_pixels); // L: 138 + WorldMapDecorationType.method4370(); // L: 139 + var8 = var7; // L: 140 + } + + return var8; // L: 142 } } } diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java deleted file mode 100644 index c2cf5a25fe..0000000000 --- a/runescape-client/src/main/java/class237.java +++ /dev/null @@ -1,29 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iz") -public class class237 { - static { - Math.sqrt(8192.0D); // L: 9 - } // L: 10 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)Lhz;", - garbageValue = "361522526" - ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; // L: 195 - int var2 = var0 & 65535; // L: 196 - if (DefaultsGroup.Widget_interfaceComponents[var1] == null || DefaultsGroup.Widget_interfaceComponents[var1][var2] == null) { // L: 197 - boolean var3 = WorldMapCacheName.loadInterface(var1); // L: 198 - if (!var3) { // L: 199 - return null; - } - } - - return DefaultsGroup.Widget_interfaceComponents[var1][var2]; // L: 201 - } -} diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index ad569e9bae..a68668c811 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -1,99 +1,95 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; +import java.security.SecureRandom; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("il") public class class238 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lib;" - ) - static final class238 field3123; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lib;" - ) - static final class238 field3121; - @ObfuscatedName("gb") - @Export("regions") - static int[] regions; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1356540615 - ) - final int field3124; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = 787238397 - ) - final int field3122; - static { - field3123 = new class238(51, 27, 800, 0, 16, 16); // L: 29 - field3121 = new class238(25, 28, 800, 656, 40, 40); // L: 30 + Math.sqrt(8192.0D); // L: 9 + } // L: 10 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)Ljava/security/SecureRandom;", + garbageValue = "15" + ) + static SecureRandom method4380() { + SecureRandom var0 = new SecureRandom(); // L: 39 + var0.nextInt(); // L: 40 + return var0; // L: 41 } - class238(int var1, int var2, int var3, int var4, int var5, int var6) { - this.field3124 = var5; // L: 39 - this.field3122 = var6; // L: 40 - } // L: 41 - - @ObfuscatedName("d") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-1656057287" + descriptor = "(CB)Z", + garbageValue = "-111" ) - static String method4334(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { // L: 67 - RunException var2 = (RunException)var0; // L: 68 - var1 = var2.message + " | "; // L: 69 - var0 = var2.throwable; // L: 70 - } else { - var1 = ""; // L: 72 + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 176 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Lbt;I)V", + garbageValue = "128863813" + ) + @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; } - StringWriter var12 = new StringWriter(); // L: 73 - PrintWriter var3 = new PrintWriter(var12); // L: 74 - var0.printStackTrace(var3); // L: 75 - var3.close(); // L: 76 - String var4 = var12.toString(); // L: 77 - BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78 - String var6 = var5.readLine(); // L: 79 + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { + PcmStream_disable(var1); // L: 261 + } - while (true) { - while (true) { - String var7 = var5.readLine(); // L: 81 - if (var7 == null) { // L: 82 - var1 = var1 + "| " + var6; // L: 100 - return var1; // L: 101 + } // L: 262 + + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "([BI)[B", + garbageValue = "745123443" + ) + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 424 + int var2 = var1.readUnsignedByte(); // L: 425 + int var3 = var1.readInt(); // L: 426 + if (var3 < 0 || AbstractArchive.field3278 != 0 && var3 > AbstractArchive.field3278) { // L: 427 + throw new RuntimeException(); // L: 428 + } else if (var2 == 0) { // L: 430 + byte[] var6 = new byte[var3]; // L: 431 + var1.readBytes(var6, 0, var3); // L: 432 + return var6; // L: 433 + } else { + int var4 = var1.readInt(); // L: 436 + if (var4 >= 0 && (AbstractArchive.field3278 == 0 || var4 <= AbstractArchive.field3278)) { // L: 437 + byte[] var5 = new byte[var4]; // L: 440 + if (var2 == 1) { // L: 441 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 442 } - int var8 = var7.indexOf(40); // L: 83 - int var9 = var7.indexOf(41, var8 + 1); // L: 84 - if (var8 >= 0 && var9 >= 0) { // L: 85 - String var10 = var7.substring(var8 + 1, var9); // L: 86 - int var11 = var10.indexOf(".java:"); // L: 87 - if (var11 >= 0) { // L: 88 - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89 - var1 = var1 + var10 + ' '; // L: 90 - continue; // L: 91 - } - - var7 = var7.substring(0, var8); // L: 93 - } - - var7 = var7.trim(); // L: 95 - var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96 - var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 - var1 = var1 + var7 + ' '; // L: 98 + return var5; // L: 443 + } else { + throw new RuntimeException(); // L: 438 } } } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1399862547" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = ObjectComposition.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 11532 + var0.packetBuffer.writeByte(0); // L: 11533 + Client.packetWriter.addNode(var0); // L: 11534 + } // L: 11535 } diff --git a/runescape-client/src/main/java/class239.java b/runescape-client/src/main/java/class239.java new file mode 100644 index 0000000000..8659da5b98 --- /dev/null +++ b/runescape-client/src/main/java/class239.java @@ -0,0 +1,195 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("ip") +public class class239 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + static final class239 field2869; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lip;" + ) + static final class239 field2867; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -424452145 + ) + final int field2868; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -814810489 + ) + final int field2870; + + static { + field2869 = new class239(51, 27, 800, 0, 16, 16); // L: 33 + field2867 = new class239(25, 28, 800, 656, 40, 40); // L: 34 + } + + class239(int var1, int var2, int var3, int var4, int var5, int var6) { + this.field2868 = var5; // L: 39 + this.field2870 = var6; // L: 40 + } // L: 41 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "1990766165" + ) + public static String method4384(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); + } else { + byte var5 = Messages.charToByteCp1252(var4); // L: 18 + var2.append('%'); // L: 19 + int var6 = var5 >> 4 & 15; // L: 20 + if (var6 >= 10) { // L: 21 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 22 + } + + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); // L: 25 + } + } + } else { + var2.append(var4); + } + } + + return var2.toString(); // L: 28 + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-1329941723" + ) + static int method4385(int var0, Script var1, boolean var2) { + int var6; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 3070 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3071 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class23.ItemDefinition_get(var6).name; // L: 3072 + return 1; // L: 3073 + } else { + int var4; + ItemComposition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 3075 + class16.Interpreter_intStackSize -= 2; // L: 3076 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3077 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3078 + var5 = class23.ItemDefinition_get(var6); // L: 3079 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 3080 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3081 + } + + return 1; // L: 3082 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3084 + class16.Interpreter_intStackSize -= 2; // L: 3085 + var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3086 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3087 + var5 = class23.ItemDefinition_get(var6); // L: 3088 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3089 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3090 + } + + return 1; // L: 3091 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 3093 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3094 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var6).price; // L: 3095 + return 1; // L: 3096 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3098 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3099 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 3100 + return 1; // L: 3101 + } else { + ItemComposition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 3103 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3104 + var7 = class23.ItemDefinition_get(var6); // L: 3105 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3106 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3107 + } + + return 1; // L: 3108 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3110 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3111 + var7 = class23.ItemDefinition_get(var6); // L: 3112 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3113 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3114 + } + + return 1; // L: 3115 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3117 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3118 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 3119 + return 1; // L: 3120 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3122 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3123 + var7 = class23.ItemDefinition_get(var6); // L: 3124 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3125 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3126 + } + + return 1; // L: 3127 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3129 + var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3130 + var7 = class23.ItemDefinition_get(var6); // L: 3131 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3132 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var6; // L: 3133 + } + + return 1; // L: 3134 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3136 + String var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3137 + var4 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3138 + WorldMapAreaData.findItemDefinitions(var3, var4 == 1); // L: 3139 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ItemLayer.foundItemIdCount; // L: 3140 + return 1; // L: 3141 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3143 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3148 + class203.foundItemIndex = 0; // L: 3149 + return 1; // L: 3150 + } else { + return 2; // L: 3152 + } + } else { + if (class19.foundItemIds != null && class203.foundItemIndex < ItemLayer.foundItemIdCount) { // L: 3144 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.foundItemIds[++class203.foundItemIndex - 1] & '\uffff'; // L: 3145 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 3146 + } + } + } + } +} diff --git a/runescape-client/src/main/java/class24.java b/runescape-client/src/main/java/class24.java new file mode 100644 index 0000000000..713ee24bb0 --- /dev/null +++ b/runescape-client/src/main/java/class24.java @@ -0,0 +1,296 @@ +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") +public class class24 { + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -271696441 + ) + static int field189; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lcc;", + garbageValue = "1048576" + ) + @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 = BuddyRankComparator.archive12.takeFile(var0, 0); // L: 28 + if (var2 == null) { // L: 29 + return null; // L: 30 + } else { + var1 = WorldMapIcon_1.newScript(var2); // L: 32 + Script.Script_cached.put(var1, (long)var0); // L: 33 + return var1; // L: 34 + } + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILcc;ZB)I", + garbageValue = "1" + ) + static int method349(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 793 + var0 -= 1000; // L: 794 + var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 795 + } else { + var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 797 + } + + class29.invalidateWidget(var3); // L: 798 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 799 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 819 + var3.modelType = 2; // L: 820 + var3.modelId = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 821 + return 1; // L: 822 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 824 + var3.modelType = 3; // L: 825 + var3.modelId = Varcs.localPlayer.appearance.getChatHeadId(); // L: 826 + return 1; // L: 827 + } else { + return 2; // L: 829 + } + } else { + class16.Interpreter_intStackSize -= 2; // L: 800 + int var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 801 + int var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 802 + var3.itemId = var4; // L: 803 + var3.itemQuantity = var5; // L: 804 + ItemComposition var6 = class23.ItemDefinition_get(var4); // L: 805 + var3.modelAngleX = var6.xan2d; // L: 806 + var3.modelAngleY = var6.yan2d; // L: 807 + var3.modelAngleZ = var6.zan2d; // L: 808 + var3.modelOffsetX = var6.offsetX2d; // L: 809 + var3.modelOffsetY = var6.offsetY2d; // L: 810 + var3.modelZoom = var6.zoom2d; // L: 811 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 812 + var3.itemQuantityMode = 0; + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 813 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 814 + } + + if (var3.field2720 > 0) { // L: 815 + var3.modelZoom = var3.modelZoom * 32 / var3.field2720; + } else if (var3.rawWidth > 0) { // L: 816 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 817 + } + } + + @ObfuscatedName("fj") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1638618599" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 3709 + class283.method4987(); // L: 3710 + if (Client.renderSelf) { // L: 3712 + FriendSystem.addPlayerToScene(Varcs.localPlayer, false); // L: 3713 + } + + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 3717 + FriendSystem.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 3718 + } + + SoundSystem.addNpcsToScene(true); // L: 3721 + int var4 = Players.Players_count; // L: 3723 + int[] var5 = Players.Players_indices; // L: 3724 + + int var6; + for (var6 = 0; var6 < var4; ++var6) { // L: 3725 + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 3726 + FriendSystem.addPlayerToScene(Client.players[var5[var6]], true); // L: 3727 + } + } + + SoundSystem.addNpcsToScene(false); // L: 3730 + + for (Projectile var15 = (Projectile)Client.projectiles.last(); var15 != null; var15 = (Projectile)Client.projectiles.previous()) { // L: 3732 3733 3750 + if (var15.plane == class26.Client_plane && Client.cycle <= var15.cycleEnd) { // L: 3734 + if (Client.cycle >= var15.cycleStart) { // L: 3735 + if (var15.targetIndex > 0) { // L: 3736 + NPC var17 = Client.npcs[var15.targetIndex - 1]; // L: 3737 + if (var17 != null && var17.x >= 0 && var17.x < 13312 && var17.y >= 0 && var17.y < 13312) { // L: 3738 + var15.setDestination(var17.x, var17.y, UserComparator7.getTileHeight(var17.x, var17.y, var15.plane) - var15.endHeight, Client.cycle); + } + } + + if (var15.targetIndex < 0) { // L: 3740 + var6 = -var15.targetIndex - 1; // L: 3742 + Player var18; + if (var6 == Client.localPlayerIndex) { // L: 3743 + var18 = Varcs.localPlayer; + } else { + var18 = Client.players[var6]; // L: 3744 + } + + if (var18 != null && var18.x >= 0 && var18.x < 13312 && var18.y >= 0 && var18.y < 13312) { // L: 3745 + var15.setDestination(var18.x, var18.y, UserComparator7.getTileHeight(var18.x, var18.y, var15.plane) - var15.endHeight, Client.cycle); + } + } + + var15.advance(Client.field799); // L: 3747 + WorldMapArea.scene.drawEntity(class26.Client_plane, (int)var15.x, (int)var15.y, (int)var15.z, 60, var15, var15.yaw, -1L, false); // L: 3748 + } + } else { + var15.remove(); + } + } + + AccessFile.method6382(); // L: 3753 + Bounds.setViewportShape(var0, var1, var2, var3, true); // L: 3754 + var0 = Client.viewportOffsetX; // L: 3755 + var1 = Client.viewportOffsetY; // L: 3756 + var2 = Client.viewportWidth; // L: 3757 + var3 = Client.viewportHeight; // L: 3758 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 3759 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 3760 + int var16; + if (!Client.isCameraLocked) { // L: 3761 + var4 = Client.camAngleX; // L: 3762 + if (Client.field735 / 256 > var4) { // L: 3763 + var4 = Client.field735 / 256; + } + + if (Client.field850[4] && Client.field698[4] + 128 > var4) { // L: 3764 + var4 = Client.field698[4] + 128; + } + + var16 = Client.camAngleY & 2047; // L: 3765 + class22.method329(class6.oculusOrbFocalPointX, VarbitComposition.field3544, Players.oculusOrbFocalPointY, var4, var16, WorldMapID.method3116(var4), var3); // L: 3766 + } + + if (!Client.isCameraLocked) { // L: 3769 + var4 = class2.method36(); + } else { + var4 = class34.method420(); // L: 3770 + } + + var16 = ModeWhere.cameraX; // L: 3771 + var6 = WorldMapRectangle.cameraY; // L: 3772 + int var7 = ReflectionCheck.cameraZ; // L: 3773 + int var8 = WorldMapArea.cameraPitch; // L: 3774 + int var9 = class69.cameraYaw; // L: 3775 + + int var10; + int var11; + for (var10 = 0; var10 < 5; ++var10) { // L: 3776 + if (Client.field850[var10]) { // L: 3777 + var11 = (int)(Math.random() * (double)(Client.field601[var10] * 2 + 1) - (double)Client.field601[var10] + Math.sin((double)Client.field853[var10] / 100.0D * (double)Client.field854[var10]) * (double)Client.field698[var10]); // L: 3778 + if (var10 == 0) { // L: 3779 + ModeWhere.cameraX += var11; + } + + if (var10 == 1) { // L: 3780 + WorldMapRectangle.cameraY += var11; + } + + if (var10 == 2) { // L: 3781 + ReflectionCheck.cameraZ += var11; + } + + if (var10 == 3) { // L: 3782 + class69.cameraYaw = var11 + class69.cameraYaw & 2047; + } + + if (var10 == 4) { // L: 3783 + WorldMapArea.cameraPitch += var11; // L: 3784 + if (WorldMapArea.cameraPitch < 128) { // L: 3785 + WorldMapArea.cameraPitch = 128; + } + + if (WorldMapArea.cameraPitch > 383) { // L: 3786 + WorldMapArea.cameraPitch = 383; + } + } + } + } + + var10 = MouseHandler.MouseHandler_x; // L: 3790 + var11 = MouseHandler.MouseHandler_y; // L: 3791 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 3792 + var10 = MouseHandler.MouseHandler_lastPressedX; // L: 3793 + var11 = MouseHandler.MouseHandler_lastPressedY; // L: 3794 + } + + int var12; + int var13; + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 3796 + var12 = var10 - var0; // L: 3797 + var13 = var11 - var1; // L: 3798 + ViewportMouse.ViewportMouse_x = var12; // L: 3800 + ViewportMouse.ViewportMouse_y = var13; // L: 3801 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 3802 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 3803 + ViewportMouse.ViewportMouse_false0 = false; // L: 3804 + } else { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 3809 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 3810 + } + + BoundaryObject.playPcmPlayers(); // L: 3813 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 3814 + BoundaryObject.playPcmPlayers(); // L: 3815 + var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 3816 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 3817 + WorldMapArea.scene.draw(ModeWhere.cameraX, WorldMapRectangle.cameraY, ReflectionCheck.cameraZ, WorldMapArea.cameraPitch, class69.cameraYaw, var4); // L: 3818 + Rasterizer3D.Rasterizer3D_zoom = var12; // L: 3819 + BoundaryObject.playPcmPlayers(); // L: 3820 + WorldMapArea.scene.clearTempGameObjects(); // L: 3821 + ServerPacket.method3903(var0, var1, var2, var3); // L: 3822 + if (Client.hintArrowType == 2) { // L: 3824 + class14.worldToScreen((Client.hintArrowX - ItemLayer.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - Tile.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 3825 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 3826 + Script.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field799); // L: 3828 + Client.field716 = 0; // L: 3831 + var13 = (Varcs.localPlayer.x >> 7) + ItemLayer.baseX; // L: 3832 + int var14 = (Varcs.localPlayer.y >> 7) + Tile.baseY; // L: 3833 + if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { // L: 3834 + Client.field716 = 1; + } + + if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { // L: 3835 + Client.field716 = 1; + } + + if (Client.field716 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { // L: 3836 + Client.field716 = 0; + } + + ModeWhere.cameraX = var16; // L: 3839 + WorldMapRectangle.cameraY = var6; // L: 3840 + ReflectionCheck.cameraZ = var7; // L: 3841 + WorldMapArea.cameraPitch = var8; // L: 3842 + class69.cameraYaw = var9; // L: 3843 + if (Client.isLoading && PacketBufferNode.method3896(true, false) == 0) { // L: 3844 + Client.isLoading = false; + } + + if (Client.isLoading) { // L: 3845 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 3846 + class2.drawLoadingMessage("Loading - please wait.", false); // L: 3847 + } + + } // L: 3849 +} diff --git a/runescape-client/src/main/java/class242.java b/runescape-client/src/main/java/class242.java new file mode 100644 index 0000000000..72d8cb0b5e --- /dev/null +++ b/runescape-client/src/main/java/class242.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iz") +public class class242 { + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Low;" + ) + static IndexedSprite field2900; +} diff --git a/runescape-client/src/main/java/class243.java b/runescape-client/src/main/java/class243.java new file mode 100644 index 0000000000..b2c9187261 --- /dev/null +++ b/runescape-client/src/main/java/class243.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ik") +public class class243 { + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "Lmj;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "([BIILfu;[Lel;I)V", + garbageValue = "-237346608" + ) + static final void method4399(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 221 + int var6 = -1; // L: 222 + + while (true) { + int var7 = var5.method6595(); // L: 224 + if (var7 == 0) { // L: 225 + return; // L: 249 + } + + var6 += var7; // L: 226 + int var8 = 0; // L: 227 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 229 + if (var9 == 0) { // L: 230 + break; + } + + var8 += var9 - 1; // L: 231 + int var10 = var8 & 63; // L: 232 + int var11 = var8 >> 6 & 63; // L: 233 + int var12 = var8 >> 12; // L: 234 + int var13 = var5.readUnsignedByte(); // L: 235 + int var14 = var13 >> 2; // L: 236 + int var15 = var13 & 3; // L: 237 + int var16 = var11 + var1; // L: 238 + int var17 = var10 + var2; // L: 239 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 240 + int var18 = var12; // L: 241 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 242 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 243 + if (var18 >= 0) { // L: 244 + var19 = var4[var18]; + } + + class157.method3115(var12, var16, var17, var6, var15, var14, var3, var19); // L: 245 + } + } + } + } +} diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java new file mode 100644 index 0000000000..9d72d6a490 --- /dev/null +++ b/runescape-client/src/main/java/class244.java @@ -0,0 +1,133 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iq") +public class class244 { + @ObfuscatedName("bo") + static String field2909; + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "[Loh;" + ) + @Export("mapDotSprites") + static SpritePixels[] mapDotSprites; + + static { + int var0 = 0; // L: 9 + int var1 = 0; // L: 10 + class239[] var2 = new class239[]{class239.field2869, class239.field2867}; // L: 14 + class239[] var3 = var2; // L: 16 + + for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17 + class239 var5 = var3[var4]; // L: 18 + if (var5.field2868 > var0) { // L: 20 + var0 = var5.field2868; + } + + if (var5.field2870 > var1) { // L: 21 + var1 = var5.field2870; + } + } + + } // L: 25 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "1279711513" + ) + public static boolean method4402(int var0) { + return var0 == WorldMapDecorationType.field2837.id; // L: 46 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "-16" + ) + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 217 + var1.offset = var0.length - 2; // L: 218 + class124.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 219 + class0.SpriteBuffer_xOffsets = new int[class124.SpriteBuffer_spriteCount]; // L: 220 + Interpreter.SpriteBuffer_yOffsets = new int[class124.SpriteBuffer_spriteCount]; // L: 221 + class395.SpriteBuffer_spriteWidths = new int[class124.SpriteBuffer_spriteCount]; // L: 222 + class157.SpriteBuffer_spriteHeights = new int[class124.SpriteBuffer_spriteCount]; // L: 223 + class223.SpriteBuffer_pixels = new byte[class124.SpriteBuffer_spriteCount][]; // L: 224 + var1.offset = var0.length - 7 - class124.SpriteBuffer_spriteCount * 8; // L: 225 + class395.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 226 + class395.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 227 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 228 + + int var3; + for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 229 + class0.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 230 + Interpreter.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 231 + class395.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 232 + class157.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class124.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 233 + Varps.SpriteBuffer_spritePalette = new int[var2]; // L: 234 + + for (var3 = 1; var3 < var2; ++var3) { // L: 235 + Varps.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 236 + if (Varps.SpriteBuffer_spritePalette[var3] == 0) { // L: 237 + Varps.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 239 + + for (var3 = 0; var3 < class124.SpriteBuffer_spriteCount; ++var3) { // L: 240 + int var4 = class395.SpriteBuffer_spriteWidths[var3]; // L: 241 + int var5 = class157.SpriteBuffer_spriteHeights[var3]; // L: 242 + int var6 = var5 * var4; // L: 243 + byte[] var7 = new byte[var6]; // L: 244 + class223.SpriteBuffer_pixels[var3] = var7; // L: 245 + int var8 = var1.readUnsignedByte(); // L: 246 + int var9; + if (var8 == 0) { // L: 247 + for (var9 = 0; var9 < var6; ++var9) { // L: 248 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 250 + for (var9 = 0; var9 < var4; ++var9) { // L: 251 + for (int var10 = 0; var10 < var5; ++var10) { // L: 252 + var7[var9 + var10 * var4] = var1.readByte(); // L: 253 + } + } + } + } + + } // L: 258 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lhu;II)V", + garbageValue = "-1802681685" + ) + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2699 == null) { // L: 995 + throw new RuntimeException(); // L: 996 + } else { + if (var0.field2653 == null) { // L: 998 + var0.field2653 = new int[var0.field2699.length]; // L: 999 + } + + var0.field2653[var1] = Integer.MAX_VALUE; // L: 1001 + } + } // L: 1002 +} diff --git a/runescape-client/src/main/java/class246.java b/runescape-client/src/main/java/class246.java new file mode 100644 index 0000000000..6e9ac78265 --- /dev/null +++ b/runescape-client/src/main/java/class246.java @@ -0,0 +1,80 @@ +import java.io.IOException; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("iy") +public enum class246 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Liy;" + ) + field3215(-1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Liy;" + ) + field3214(0), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Liy;" + ) + field3216(1), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Liy;" + ) + field3217(2); + + @ObfuscatedName("ep") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1212234029 + ) + final int field3218; + + class246(int var3) { + this.field3218 = var3; // L: 15 + } // L: 16 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3218; // L: 19 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-34" + ) + public static void method4409(boolean var0) { + if (class303.NetCache_socket != null) { // L: 193 + try { + Buffer var1 = new Buffer(4); // L: 195 + var1.writeByte(var0 ? 2 : 3); // L: 196 + var1.writeMedium(0); // L: 197 + class303.NetCache_socket.write(var1.array, 0, 4); // L: 198 + } catch (IOException var4) { + try { + class303.NetCache_socket.close(); // L: 202 + } catch (Exception var3) { // L: 204 + } + + ++NetCache.NetCache_ioExceptions; // L: 205 + class303.NetCache_socket = null; // L: 206 + } + + } + } // L: 208 +} diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java deleted file mode 100644 index 14b126c093..0000000000 --- a/runescape-client/src/main/java/class248.java +++ /dev/null @@ -1,208 +0,0 @@ -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("io") -public class class248 { - @ObfuscatedName("n") - @Export("spriteMap") - final HashMap spriteMap; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lli;" - ) - @Export("bounds") - Bounds bounds; - @ObfuscatedName("d") - int[] field3224; - @ObfuscatedName("c") - int[] field3228; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1846736513 - ) - int field3226; - - public class248() { - this.spriteMap = new HashMap(); // L: 10 - this.bounds = new Bounds(0, 0); // L: 11 - this.field3224 = new int[2048]; // L: 12 - this.field3228 = new int[2048]; // L: 13 - this.field3226 = 0; // L: 14 - Strings.method4324(); // L: 21 - } // L: 22 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-381922948" - ) - void method4507(int var1) { - int var2 = var1 * 2 + 1; // L: 46 - double var4 = (double)((float)var1 / 3.0F); // L: 48 - int var6 = var1 * 2 + 1; // L: 50 - double[] var7 = new double[var6]; // L: 51 - int var8 = -var1; - - for (int var9 = 0; var8 <= var1; ++var9) { - var7[var9] = HealthBarDefinition.method4658((double)var8, 0.0D, var4); // L: 53 - ++var8; // L: 52 - } - - double[] var14 = var7; // L: 57 - double var15 = var7[var1] * var7[var1]; // L: 58 - int[] var17 = new int[var2 * var2]; // L: 59 - boolean var10 = false; // L: 60 - - for (int var11 = 0; var11 < var2; ++var11) { // L: 61 - for (int var12 = 0; var12 < var2; ++var12) { // L: 62 - int var13 = var17[var12 + var2 * var11] = (int)(var14[var11] * var14[var12] / var15 * 256.0D); // L: 63 - if (!var10 && var13 > 0) { // L: 64 - var10 = true; // L: 65 - } - } - } - - SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 69 - this.spriteMap.put(var1, var18); // L: 70 - } // L: 71 - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(II)Llm;", - garbageValue = "1559199090" - ) - SpritePixels method4527(int var1) { - if (!this.spriteMap.containsKey(var1)) { // L: 74 - this.method4507(var1); // L: 75 - } - - return (SpritePixels)this.spriteMap.get(var1); // L: 77 - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1110209387" - ) - public final void method4509(int var1, int var2) { - if (this.field3226 < this.field3224.length) { // L: 81 - this.field3224[this.field3226] = var1; // L: 82 - this.field3228[this.field3226] = var2; // L: 83 - ++this.field3226; // L: 84 - } - } // L: 85 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1700428858" - ) - public final void method4510() { - this.field3226 = 0; // L: 88 - } // L: 89 - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IILlm;FI)V", - garbageValue = "2039360324" - ) - public final void method4511(int var1, int var2, SpritePixels var3, float var4) { - int var5 = (int)(18.0F * var4); // L: 92 - SpritePixels var6 = this.method4527(var5); // L: 93 - int var7 = var5 * 2 + 1; // L: 94 - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 95 - Bounds var9 = new Bounds(0, 0); // L: 96 - this.bounds.setHigh(var7, var7); // L: 97 - System.nanoTime(); // L: 98 - - int var10; - int var11; - int var12; - for (var10 = 0; var10 < this.field3226; ++var10) { // L: 99 - var11 = this.field3224[var10]; // L: 100 - var12 = this.field3228[var10]; // L: 101 - int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 102 - int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 103 - this.bounds.setLow(var13, var14); // L: 104 - this.bounds.method6182(var8, var9); // L: 105 - this.method4506(var6, var3, var9); // L: 106 - } - - System.nanoTime(); // L: 108 - System.nanoTime(); // L: 109 - - for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 110 - if (var3.pixels[var10] == 0) { // L: 111 - var3.pixels[var10] = -16777216; // L: 112 - } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 115 - if (var11 <= 0) { // L: 116 - var3.pixels[var10] = -16777216; // L: 117 - } else { - if (var11 > Coord.field2560.length) { // L: 120 - var11 = Coord.field2560.length; - } - - var12 = Coord.field2560[var11 - 1]; // L: 121 - var3.pixels[var10] = -16777216 | var12; // L: 122 - } - } - } - - System.nanoTime(); // L: 124 - } // L: 125 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Llm;Llm;Lli;I)V", - garbageValue = "-524888104" - ) - void method4506(SpritePixels var1, SpritePixels var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { // L: 128 - int var4 = 0; // L: 129 - int var5 = 0; // L: 130 - if (var3.lowX == 0) { // L: 131 - var4 = var1.subWidth - var3.highX; - } - - if (var3.lowY == 0) { // L: 132 - var5 = var1.subHeight - var3.highY; - } - - int var6 = var4 + var5 * var1.subWidth; // L: 133 - int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 134 - - for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 135 - for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 136 - int[] var10000 = var2.pixels; // L: 137 - int var10001 = var7++; - var10000[var10001] += var1.pixels[var6++]; - } - - var6 += var1.subWidth - var3.highX; // L: 139 - var7 += var2.subWidth - var3.highX; // L: 140 - } - - } - } // L: 142 - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "15" - ) - static void method4514() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 206 - if (WorldMapSectionType.clientPreferences.rememberedUsername != null) { // L: 207 - Login.Login_username = WorldMapSectionType.clientPreferences.rememberedUsername; // L: 208 - Client.Login_isUsernameRemembered = true; // L: 209 - } else { - Client.Login_isUsernameRemembered = false; // L: 211 - } - - } - } // L: 212 -} diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 6a4276ee40..0e7c3d42cc 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -2,48 +2,139 @@ 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("j") -public class class25 { - @ObfuscatedName("rh") +@ObfuscatedName("y") +public class class25 extends class16 { + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -461063667 + intValue = 2008748649 ) - static int field138; - @ObfuscatedName("l") + static int field197; + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "Lcx;" + ) + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1122358131 + intValue = -2084790717 ) - static int field146; + int field199; @ObfuscatedName("o") + byte field193; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1646525393 + intValue = 181056935 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("ep") + int field192; + @ObfuscatedName("p") + String field195; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Liy;" + descriptor = "Lx;" ) - @Export("archive18") - static Archive archive18; + final class19 this$0; - @ObfuscatedName("s") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); // L: 84 + @ObfuscatedSignature( + descriptor = "(Lx;)V" + ) + class25(class19 var1) { + this.this$0 = var1; + this.field199 = -1; // L: 124 + } // L: 129 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1239860939" + ) + void vmethod356(Buffer var1) { + var1.readUnsignedByte(); // L: 132 + this.field199 = var1.readUnsignedShort(); // L: 133 + this.field193 = var1.readByte(); // L: 134 + this.field192 = var1.readUnsignedShort(); // L: 135 + var1.readLong(); // L: 136 + this.field195 = var1.readStringCp1252NullTerminated(); // L: 137 + var1.readUnsignedByte(); // L: 138 + } // L: 139 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1583378087" + ) + void vmethod352(class3 var1) { + class9 var2 = (class9)var1.field27.get(this.field199); // L: 142 + var2.field66 = this.field193; // L: 143 + var2.field64 = this.field192; // L: 144 + var2.field65 = this.field195; // L: 145 + } // L: 146 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-33" + ) + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 683 + Login.Login_response2 = "Enter your username/email & password."; // L: 684 + Login.Login_response3 = ""; // L: 685 + Login.loginIndex = 2; // L: 686 + if (var0) { // L: 687 + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 689 + if (Login.clientPreferences.rememberedUsername != null) { // L: 690 + Login.Login_username = Login.clientPreferences.rememberedUsername; // L: 691 + Client.Login_isUsernameRemembered = true; // L: 692 + } else { + Client.Login_isUsernameRemembered = false; // L: 694 + } + } + + Canvas.method481(); // L: 696 + } // L: 697 + + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1554369565" + ) + static int method350(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3413 + class16.Interpreter_intStackSize -= 2; // L: 3414 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3415 + int var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3416 + if (!Client.isCameraLocked) { // L: 3417 + Client.camAngleX = var3; // L: 3418 + Client.camAngleY = var4; // L: 3419 + } + + return 1; // L: 3421 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3423 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3424 + return 1; // L: 3425 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3427 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3428 + return 1; // L: 3429 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3431 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3432 + if (var3 < 0) { // L: 3433 + var3 = 0; + } + + Client.camFollowHeight = var3; // L: 3434 + return 1; // L: 3435 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3437 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3438 + return 1; // L: 3439 + } else { + return 2; // L: 3441 + } } - - @ObfuscatedName("id") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-52" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 8891 - var2.packetBuffer.method5781(var0); // L: 8892 - var2.packetBuffer.writeIntME(var1); // L: 8893 - Client.packetWriter.addNode(var2); // L: 8894 - } // L: 8895 } diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java index 9d7fa3713c..84b61feaa1 100644 --- a/runescape-client/src/main/java/class258.java +++ b/runescape-client/src/main/java/class258.java @@ -1,55 +1,83 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("io") public class class258 { - @ObfuscatedName("gg") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "1214767068" + descriptor = "(IIIII)V", + garbageValue = "862328928" ) - static final void method4685(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - var5 = SecureRandomCallable.method1233(var5, var6); // L: 4934 - int var7 = 2048 - var3 & 2047; // L: 4935 - int var8 = 2048 - var4 & 2047; // L: 4936 - int var9 = 0; // L: 4937 - int var10 = 0; // L: 4938 - int var11 = var5; // L: 4939 - int var12; - int var13; - int var14; - if (var7 != 0) { // L: 4940 - var12 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 4941 - var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 4942 - var14 = var13 * var10 - var5 * var12 >> 16; // L: 4943 - var11 = var13 * var5 + var12 * var10 >> 16; // L: 4944 - var10 = var14; // L: 4945 + static void method4608(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 53 + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 54 + int var5 = 0; // L: 55 + if (var1 > var4.field916) { // L: 56 + var5 += var1 - var4.field916; + } else if (var1 < var4.x) { // L: 57 + var5 += var4.x - var1; + } + + if (var2 > var4.field917) { // L: 58 + var5 += var2 - var4.field917; + } else if (var2 < var4.y) { // L: 59 + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field918 && Login.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 60 + var5 -= 64; // L: 71 + if (var5 < 0) { // L: 72 + var5 = 0; + } + + int var6 = (var4.field918 - var5) * Login.clientPreferences.areaSoundEffectsVolume / var4.field918; // L: 73 + if (var4.stream1 == null) { // L: 74 + if (var4.soundEffectId >= 0) { // L: 75 + SoundEffect var7 = SoundEffect.readSoundEffect(ItemContainer.archive4, var4.soundEffectId, 0); // L: 76 + if (var7 != null) { // L: 77 + RawSound var8 = var7.toRawSound().resample(class34.decimator); // L: 78 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79 + var9.setNumLoops(-1); // L: 80 + Huffman.pcmStreamMixer.addSubStream(var9); // L: 81 + var4.stream1 = var9; // L: 82 + } + } + } else { + var4.stream1.method901(var6); // L: 86 + } + + if (var4.stream2 == null) { // L: 87 + if (var4.soundEffectIds != null && (var4.field924 -= var3) <= 0) { // L: 88 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89 + SoundEffect var12 = SoundEffect.readSoundEffect(ItemContainer.archive4, var4.soundEffectIds[var11], 0); // L: 90 + if (var12 != null) { // L: 91 + RawSound var13 = var12.toRawSound().resample(class34.decimator); // L: 92 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93 + var10.setNumLoops(0); // L: 94 + Huffman.pcmStreamMixer.addSubStream(var10); // L: 95 + var4.stream2 = var10; // L: 96 + var4.field924 = var4.field921 + (int)(Math.random() * (double)(var4.field922 - var4.field921)); // L: 97 + } + } + } else { + var4.stream2.method901(var6); // L: 102 + if (!var4.stream2.hasNext()) { // L: 103 + var4.stream2 = null; // L: 104 + } + } + } else { + if (var4.stream1 != null) { // L: 61 + Huffman.pcmStreamMixer.removeSubStream(var4.stream1); // L: 62 + var4.stream1 = null; // L: 63 + } + + if (var4.stream2 != null) { // L: 65 + Huffman.pcmStreamMixer.removeSubStream(var4.stream2); // L: 66 + var4.stream2 = null; // L: 67 + } + } + } } - if (var8 != 0) { // L: 4947 - var12 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 4948 - var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 4949 - var14 = var13 * var9 + var11 * var12 >> 16; // L: 4950 - var11 = var13 * var11 - var12 * var9 >> 16; // L: 4951 - var9 = var14; // L: 4952 - } - - SecureRandomFuture.cameraX = var0 - var9; // L: 4954 - ArchiveLoader.cameraY = var1 - var10; // L: 4955 - ObjectSound.cameraZ = var2 - var11; // L: 4956 - KeyHandler.cameraPitch = var3; // L: 4957 - class39.cameraYaw = var4; // L: 4958 - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (HealthBarUpdate.oculusOrbFocalPointX >> 7 != UserComparator9.localPlayer.x >> 7 || ApproximateRouteStrategy.oculusOrbFocalPointY >> 7 != UserComparator9.localPlayer.y >> 7)) { // L: 4959 4960 - var12 = UserComparator9.localPlayer.plane; // L: 4961 - var13 = (HealthBarUpdate.oculusOrbFocalPointX >> 7) + GrandExchangeOfferNameComparator.baseX; // L: 4962 - var14 = (ApproximateRouteStrategy.oculusOrbFocalPointY >> 7) + NetCache.baseY; // L: 4963 - PacketBufferNode var15 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); // L: 4966 - var15.packetBuffer.writeShortLE(var14); // L: 4967 - var15.packetBuffer.method5883(var12); // L: 4968 - var15.packetBuffer.method5736(Client.field746); // L: 4969 - var15.packetBuffer.writeIntME(var13); // L: 4970 - Client.packetWriter.addNode(var15); // L: 4971 - } - - } // L: 4975 + } // L: 108 } diff --git a/runescape-client/src/main/java/class26.java b/runescape-client/src/main/java/class26.java new file mode 100644 index 0000000000..2f30e29ad5 --- /dev/null +++ b/runescape-client/src/main/java/class26.java @@ -0,0 +1,129 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ac") +public class class26 extends class14 { + @ObfuscatedName("ag") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("kb") + @ObfuscatedGetter( + intValue = 1665107069 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 1455958223078858959L + ) + long field201; + @ObfuscatedName("o") + String field206; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1831814193 + ) + int field205; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class26(class2 var1) { + this.this$0 = var1; + this.field201 = -1L; // L: 93 + this.field206 = null; // L: 94 + this.field205 = 0; // L: 95 + } // L: 97 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 100 + --var1.offset; // L: 101 + this.field201 = var1.readLong(); // L: 102 + } + + this.field206 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104 + this.field205 = var1.readUnsignedShort(); // L: 105 + } // L: 106 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method146(this.field201, this.field206, this.field205); // L: 109 + } // L: 110 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "2019211946" + ) + static final void method368(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 123 + for (int var4 = 0; var4 < 8; ++var4) { // L: 124 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 126 + for (var3 = 1; var3 < 8; ++var3) { // L: 127 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { // L: 129 + for (var3 = 1; var3 < 8; ++var3) { // L: 130 + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 132 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 133 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 134 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 135 + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(Lcd;I)V", + garbageValue = "-327078650" + ) + static final void method367(Actor var0) { + int var1 = Math.max(1, var0.field1255 - Client.cycle); // L: 3451 + int var2 = var0.field1258 * 64 + var0.field1240 * 128; // L: 3452 + int var3 = var0.field1258 * 64 + var0.field1253 * 128; // L: 3453 + var0.x += (var2 - var0.x) / var1; // L: 3454 + var0.y += (var3 - var0.y) / var1; // L: 3455 + var0.field1267 = 0; // L: 3456 + var0.orientation = var0.field1213; // L: 3457 + } // L: 3458 + + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1581962247" + ) + static void method357(int var0, int var1) { + MenuAction var2 = class25.tempMenuAction; // L: 11027 + UserComparator9.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1); // L: 11029 + class25.tempMenuAction = null; // L: 11031 + } // L: 11032 +} diff --git a/runescape-client/src/main/java/class263.java b/runescape-client/src/main/java/class263.java new file mode 100644 index 0000000000..0c8db0a9aa --- /dev/null +++ b/runescape-client/src/main/java/class263.java @@ -0,0 +1,543 @@ +import java.util.HashMap; +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("jf") +public class class263 { + @ObfuscatedName("f") + @Export("spriteMap") + final HashMap spriteMap; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llj;" + ) + @Export("bounds") + Bounds bounds; + @ObfuscatedName("u") + int[] field3334; + @ObfuscatedName("p") + int[] field3335; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1919452297 + ) + int field3336; + + public class263() { + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field3334 = new int[2048]; // L: 12 + this.field3335 = new int[2048]; // L: 13 + this.field3336 = 0; // L: 14 + Renderable.method3629(); // L: 21 + } // L: 22 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1364258777" + ) + void method4654(int var1) { + int var2 = var1 * 2 + 1; // L: 46 + double[] var3 = Frames.method3639(0.0D, (double)((float)var1 / 3.0F), var1); // L: 47 + double var4 = var3[var1] * var3[var1]; // L: 48 + int[] var6 = new int[var2 * var2]; // L: 49 + boolean var7 = false; // L: 50 + + for (int var8 = 0; var8 < var2; ++var8) { // L: 51 + for (int var9 = 0; var9 < var2; ++var9) { // L: 52 + int var10 = var6[var9 + var8 * var2] = (int)(var3[var9] * var3[var8] / var4 * 256.0D); // L: 53 + if (!var7 && var10 > 0) { // L: 54 + var7 = true; // L: 55 + } + } + } + + SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 59 + this.spriteMap.put(var1, var11); // L: 60 + } // L: 61 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)Loh;", + garbageValue = "264389909" + ) + SpritePixels method4665(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 64 + this.method4654(var1); // L: 65 + } + + return (SpritePixels)this.spriteMap.get(var1); // L: 67 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-176265199" + ) + public final void method4656(int var1, int var2) { + if (this.field3336 < this.field3334.length) { // L: 71 + this.field3334[this.field3336] = var1; // L: 72 + this.field3335[this.field3336] = var2; // L: 73 + ++this.field3336; // L: 74 + } + } // L: 75 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "50833165" + ) + public final void method4657() { + this.field3336 = 0; // L: 78 + } // L: 79 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(IILoh;FI)V", + garbageValue = "-1913528659" + ) + public final void method4658(int var1, int var2, SpritePixels var3, float var4) { + int var5 = (int)(var4 * 18.0F); // L: 82 + SpritePixels var6 = this.method4665(var5); // L: 83 + int var7 = var5 * 2 + 1; // L: 84 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 85 + Bounds var9 = new Bounds(0, 0); // L: 86 + this.bounds.setHigh(var7, var7); // L: 87 + System.nanoTime(); // L: 88 + + int var10; + int var11; + int var12; + for (var10 = 0; var10 < this.field3336; ++var10) { // L: 89 + var11 = this.field3334[var10]; // L: 90 + var12 = this.field3335[var10]; // L: 91 + int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 92 + int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 93 + this.bounds.setLow(var13, var14); // L: 94 + this.bounds.method5954(var8, var9); // L: 95 + this.method4659(var6, var3, var9); // L: 96 + } + + System.nanoTime(); // L: 98 + System.nanoTime(); // L: 99 + + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 100 + if (var3.pixels[var10] == 0) { // L: 101 + var3.pixels[var10] = -16777216; // L: 102 + } else { + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 105 + if (var11 <= 0) { // L: 106 + var3.pixels[var10] = -16777216; // L: 107 + } else { + if (var11 > HealthBar.field1311.length) { // L: 110 + var11 = HealthBar.field1311.length; + } + + var12 = HealthBar.field1311[var11 - 1]; // L: 111 + var3.pixels[var10] = -16777216 | var12; // L: 112 + } + } + } + + System.nanoTime(); // L: 114 + } // L: 115 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Loh;Loh;Llj;I)V", + garbageValue = "-1779062903" + ) + void method4659(SpritePixels var1, SpritePixels var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 118 + int var4 = 0; // L: 119 + int var5 = 0; // L: 120 + if (var3.lowX == 0) { // L: 121 + var4 = var1.subWidth - var3.highX; + } + + if (var3.lowY == 0) { // L: 122 + var5 = var1.subHeight - var3.highY; + } + + int var6 = var4 + var5 * var1.subWidth; // L: 123 + int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 124 + + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 125 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 126 + int[] var10000 = var2.pixels; // L: 127 + int var10001 = var7++; + var10000[var10001] += var1.pixels[var6++]; + } + + var6 += var1.subWidth - var3.highX; // L: 129 + var7 += var2.subWidth - var3.highX; // L: 130 + } + + } + } // L: 132 + + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "(ILcc;ZB)I", + garbageValue = "-9" + ) + static int method4666(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2052 + if (class13.friendSystem.field908 == 0) { // L: 2053 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -2; + } else if (class13.friendSystem.field908 == 1) { // L: 2054 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.friendsList.getSize(); // L: 2055 + } + + return 1; // L: 2056 + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2059 + if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.friendsList.getSize()) { // L: 2060 + Friend var8 = (Friend)class13.friendSystem.friendsList.get(var3); // L: 2061 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2062 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2063 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2066 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2067 + } + + return 1; // L: 2069 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2072 + if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.friendsList.getSize()) { // L: 2073 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)class13.friendSystem.friendsList.get(var3)).world; // L: 2074 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2076 + } + + return 1; // L: 2077 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2080 + if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.friendsList.getSize()) { // L: 2081 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)class13.friendSystem.friendsList.get(var3)).rank; // L: 2082 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2084 + } + + return 1; // L: 2085 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2088 + int var6 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2089 + KeyHandler.method462(var5, var6); // L: 2090 + return 1; // L: 2091 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2094 + class13.friendSystem.addFriend(var5); // L: 2095 + return 1; // L: 2096 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2099 + class13.friendSystem.removeFriend(var5); // L: 2100 + return 1; // L: 2101 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2104 + class13.friendSystem.addIgnore(var5); // L: 2105 + return 1; // L: 2106 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2109 + class13.friendSystem.removeIgnore(var5); // L: 2110 + return 1; // L: 2111 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2114 + var5 = class1.method24(var5); // L: 2115 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.isFriended(new Username(var5, AbstractUserComparator.loginType), false) ? 1 : 0; // L: 2116 + return 1; // L: 2117 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (InterfaceParent.clanChat != null) { // L: 2120 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.name; // L: 2121 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2123 + } + + return 1; // L: 2124 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (InterfaceParent.clanChat != null) { // L: 2127 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.clanChat.getSize(); // L: 2128 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2130 + } + + return 1; // L: 2131 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2134 + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { // L: 2135 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.get(var3).getUsername().getName(); // L: 2136 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2138 + } + + return 1; // L: 2139 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2142 + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { // L: 2143 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).getWorld(); // L: 2144 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2146 + } + + return 1; // L: 2147 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2150 + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { // L: 2151 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.clanChat.get(var3)).rank; // L: 2152 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2154 + } + + return 1; // L: 2155 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.minKick : 0; // L: 2158 + return 1; // L: 2159 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2162 + MenuAction.clanKickUser(var5); // L: 2163 + return 1; // L: 2164 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.rank * 1749202535 * -610532009 : 0; // L: 2167 + return 1; // L: 2168 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2171 + ArchiveLoader.Clan_joinChat(var5); // L: 2172 + return 1; // L: 2173 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class238.Clan_leaveChat(); // L: 2176 + return 1; // L: 2177 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class13.friendSystem.method1719()) { // L: 2180 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.ignoreList.getSize(); // L: 2181 + } + + return 1; // L: 2182 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2185 + if (class13.friendSystem.method1719() && var3 >= 0 && var3 < class13.friendSystem.ignoreList.getSize()) { // L: 2186 + Ignored var4 = (Ignored)class13.friendSystem.ignoreList.get(var3); // L: 2187 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2188 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2189 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2192 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2193 + } + + return 1; // L: 2195 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2198 + var5 = class1.method24(var5); // L: 2199 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class13.friendSystem.isIgnored(new Username(var5, AbstractUserComparator.loginType)) ? 1 : 0; // L: 2200 + return 1; // L: 2201 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2204 + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && InterfaceParent.clanChat.get(var3).getUsername().equals(Varcs.localPlayer.username)) { // L: 2205 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2206 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2208 + } + + return 1; // L: 2209 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (InterfaceParent.clanChat != null && InterfaceParent.clanChat.owner != null) { // L: 2212 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.owner; // L: 2213 + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2215 + } + + return 1; // L: 2216 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2219 + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isFriend()) { // L: 2220 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2221 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2223 + } + + return 1; // L: 2224 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class13.friendSystem.friendsList.removeComparator(); // L: 2235 + return 1; // L: 2236 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2239 + class13.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2240 + return 1; // L: 2241 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2244 + class13.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2245 + return 1; // L: 2246 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2249 + class13.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2250 + return 1; // L: 2251 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2254 + class13.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2255 + return 1; // L: 2256 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2259 + class13.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2260 + return 1; // L: 2261 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2264 + class13.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2265 + return 1; // L: 2266 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2269 + class13.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2270 + return 1; // L: 2271 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2274 + class13.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2275 + return 1; // L: 2276 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2279 + class13.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2280 + return 1; // L: 2281 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2284 + class13.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2285 + return 1; // L: 2286 + } else if (var0 == 3639) { + class13.friendSystem.friendsList.sort(); // L: 2289 + return 1; // L: 2290 + } else if (var0 == 3640) { + class13.friendSystem.ignoreList.removeComparator(); // L: 2293 + return 1; // L: 2294 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2297 + class13.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2298 + return 1; // L: 2299 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2302 + class13.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2303 + return 1; // L: 2304 + } else if (var0 == 3643) { + class13.friendSystem.ignoreList.sort(); // L: 2307 + return 1; // L: 2308 + } else if (var0 == 3644) { + if (InterfaceParent.clanChat != null) { // L: 2311 + InterfaceParent.clanChat.removeComparator(); // L: 2312 + } + + return 1; // L: 2314 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2317 + if (InterfaceParent.clanChat != null) { // L: 2318 + InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); // L: 2319 + } + + return 1; // L: 2321 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2324 + if (InterfaceParent.clanChat != null) { // L: 2325 + InterfaceParent.clanChat.addComparator(new UserComparator2(var7)); // L: 2326 + } + + return 1; // L: 2328 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2331 + if (InterfaceParent.clanChat != null) { // L: 2332 + InterfaceParent.clanChat.addComparator(new UserComparator3(var7)); // L: 2333 + } + + return 1; // L: 2335 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2338 + if (InterfaceParent.clanChat != null) { // L: 2339 + InterfaceParent.clanChat.addComparator(new UserComparator4(var7)); // L: 2340 + } + + return 1; // L: 2342 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2345 + if (InterfaceParent.clanChat != null) { // L: 2346 + InterfaceParent.clanChat.addComparator(new UserComparator5(var7)); // L: 2347 + } + + return 1; // L: 2349 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2352 + if (InterfaceParent.clanChat != null) { // L: 2353 + InterfaceParent.clanChat.addComparator(new UserComparator6(var7)); // L: 2354 + } + + return 1; // L: 2356 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2359 + if (InterfaceParent.clanChat != null) { // L: 2360 + InterfaceParent.clanChat.addComparator(new UserComparator7(var7)); // L: 2361 + } + + return 1; // L: 2363 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2366 + if (InterfaceParent.clanChat != null) { // L: 2367 + InterfaceParent.clanChat.addComparator(new UserComparator8(var7)); // L: 2368 + } + + return 1; // L: 2370 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2373 + if (InterfaceParent.clanChat != null) { // L: 2374 + InterfaceParent.clanChat.addComparator(new UserComparator9(var7)); // L: 2375 + } + + return 1; // L: 2377 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2380 + if (InterfaceParent.clanChat != null) { // L: 2381 + InterfaceParent.clanChat.addComparator(new UserComparator10(var7)); // L: 2382 + } + + return 1; // L: 2384 + } else if (var0 == 3655) { + if (InterfaceParent.clanChat != null) { // L: 2387 + InterfaceParent.clanChat.sort(); // L: 2388 + } + + return 1; // L: 2390 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2393 + class13.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2394 + return 1; // L: 2395 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 2398 + if (InterfaceParent.clanChat != null) { // L: 2399 + InterfaceParent.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2400 + } + + return 1; // L: 2402 + } else { + return 2; // L: 2404 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2227 + if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isIgnored()) { // L: 2228 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 2229 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2231 + } + + return 1; // L: 2232 + } + } + } + } +} diff --git a/runescape-client/src/main/java/class264.java b/runescape-client/src/main/java/class264.java new file mode 100644 index 0000000000..c0936e1d7e --- /dev/null +++ b/runescape-client/src/main/java/class264.java @@ -0,0 +1,51 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jj") +public class class264 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + static final class264 field3341; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + static final class264 field3340; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Ljj;" + ) + static final class264 field3339; + + static { + field3341 = new class264(); // L: 4 + field3340 = new class264(); // L: 5 + field3339 = new class264(); // L: 6 + } + + class264() { + } // L: 8 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lnk;I)I", + garbageValue = "-1827294520" + ) + static int method4680(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 179 + int var2; + if (var1 == 0) { // L: 181 + var2 = 0; + } else if (var1 == 1) { // L: 182 + var2 = var0.readBits(5); + } else if (var1 == 2) { // L: 183 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 184 + } + + return var2; // L: 185 + } +} diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java new file mode 100644 index 0000000000..4af45e6fb0 --- /dev/null +++ b/runescape-client/src/main/java/class266.java @@ -0,0 +1,18 @@ +import java.util.HashMap; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("jr") +public class class266 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("KitDefinition_modelsArchive") + public static AbstractArchive KitDefinition_modelsArchive; + + static { + new HashMap(); + } // L: 9 +} diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java new file mode 100644 index 0000000000..77258ab1cb --- /dev/null +++ b/runescape-client/src/main/java/class27.java @@ -0,0 +1,205 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ay") +public class class27 extends class14 { + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static StudioGame field208; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -455433791 + ) + int field209; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; + + @ObfuscatedSignature( + descriptor = "(Lu;)V" + ) + class27(class2 var1) { + this.this$0 = var1; + this.field209 = -1; // L: 144 + } // L: 146 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field209 = var1.readUnsignedShort(); // L: 149 + } // L: 150 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method190(this.field209); // L: 153 + } // L: 154 + + @ObfuscatedName("ja") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "190996497" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 10396 + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "862148066" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + class105.method2255(); // L: 11187 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 11189 + if (var1.obj != null) { // L: 11190 + var1.set(); + } + } + + int var4 = class303.VarpDefinition_get(var0).type; // L: 11193 + if (var4 != 0) { // L: 11194 + int var2 = Varps.Varps_main[var0]; // L: 11195 + if (var4 == 1) { // L: 11196 + if (var2 == 1) { // L: 11197 + MouseRecorder.method2109(0.9D); + } + + if (var2 == 2) { // L: 11198 + MouseRecorder.method2109(0.8D); + } + + if (var2 == 3) { // L: 11199 + MouseRecorder.method2109(0.7D); + } + + if (var2 == 4) { // L: 11200 + MouseRecorder.method2109(0.6D); + } + } + + if (var4 == 3) { // L: 11202 + if (var2 == 0) { // L: 11203 + Messages.method2367(255); + } + + if (var2 == 1) { // L: 11204 + Messages.method2367(192); + } + + if (var2 == 2) { // L: 11205 + Messages.method2367(128); + } + + if (var2 == 3) { // L: 11206 + Messages.method2367(64); + } + + if (var2 == 4) { // L: 11207 + Messages.method2367(0); + } + } + + if (var4 == 4) { // L: 11209 + if (var2 == 0) { // L: 11210 + Canvas.updateSoundEffectVolume(127); + } + + if (var2 == 1) { // L: 11211 + Canvas.updateSoundEffectVolume(96); + } + + if (var2 == 2) { // L: 11212 + Canvas.updateSoundEffectVolume(64); + } + + if (var2 == 3) { // L: 11213 + Canvas.updateSoundEffectVolume(32); + } + + if (var2 == 4) { // L: 11214 + Canvas.updateSoundEffectVolume(0); + } + } + + if (var4 == 5) { // L: 11216 + Client.leftClickOpensMenu = var2; + } + + if (var4 == 6) { + Client.chatEffects = var2; // L: 11217 + } + + if (var4 == 9) { // L: 11218 + Client.field767 = var2; + } + + if (var4 == 10) { // L: 11219 + if (var2 == 0) { // L: 11220 + MusicPatchPcmStream.method4126(127); + } + + if (var2 == 1) { // L: 11221 + MusicPatchPcmStream.method4126(96); + } + + if (var2 == 2) { // L: 11222 + MusicPatchPcmStream.method4126(64); + } + + if (var2 == 3) { // L: 11223 + MusicPatchPcmStream.method4126(32); + } + + if (var2 == 4) { // L: 11224 + MusicPatchPcmStream.method4126(0); + } + } + + if (var4 == 17) { // L: 11226 + Client.followerIndex = var2 & 65535; // L: 11227 + } + + AttackOption[] var3; + if (var4 == 18) { // L: 11229 + var3 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 11232 + Client.playerAttackOption = (AttackOption)UserComparator8.findEnumerated(var3, var2); // L: 11234 + if (Client.playerAttackOption == null) { // L: 11235 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var4 == 19) { // L: 11237 + if (var2 == -1) { // L: 11238 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 11239 + } + } + + if (var4 == 22) { // L: 11241 + var3 = new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 11244 + Client.npcAttackOption = (AttackOption)UserComparator8.findEnumerated(var3, var2); // L: 11246 + if (Client.npcAttackOption == null) { // L: 11247 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 11249 +} diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java deleted file mode 100644 index b2915489c6..0000000000 --- a/runescape-client/src/main/java/class277.java +++ /dev/null @@ -1,39 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jm") -public class class277 { - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lhz;" - ) - @Export("scriptDotWidget") - static Widget scriptDotWidget; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "([BILjava/lang/CharSequence;I)I", - garbageValue = "1470841417" - ) - public static int method5192(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); // L: 9 - int var4 = var1; // L: 10 - - for (int var5 = 0; var5 < var3; ++var5) { // L: 11 - char var6 = var2.charAt(var5); // L: 12 - if (var6 <= 127) { // L: 13 - var0[var4++] = (byte)var6; // L: 14 - } else if (var6 <= 2047) { // L: 16 - var0[var4++] = (byte)(192 | var6 >> 6); // L: 17 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 18 - } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); // L: 21 - var0[var4++] = (byte)(128 | var6 >> 6 & 63); // L: 22 - var0[var4++] = (byte)(128 | var6 & '?'); // L: 23 - } - } - - return var4 - var1; // L: 26 - } -} diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java new file mode 100644 index 0000000000..1004cfb1fb --- /dev/null +++ b/runescape-client/src/main/java/class28.java @@ -0,0 +1,30 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("am") +public class class28 implements class31 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;)Lnu;" + ) + public Buffer vmethod389(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 9 + this.method384(var1, var2); // L: 10 + return var2; // L: 11 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnu;Lnu;)V" + ) + void method384(Buffer var1, Buffer var2) { + class36 var3 = new class36(var1); // L: 15 + class33 var4 = new class33(var3); // L: 16 + + long var5; + for (var5 = 0L; !var4.method396(var3.method436(), var3.method437(), var5); ++var5) { // L: 17 18 19 + } + + var2.writeLong(var5); // L: 21 + } // L: 22 +} diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java deleted file mode 100644 index da51922fa0..0000000000 --- a/runescape-client/src/main/java/class281.java +++ /dev/null @@ -1,76 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jq") -public class class281 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Ljj;", - garbageValue = "-723955175" - ) - @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 = class299.ItemDefinition_archive.takeFile(10, var0); // L: 86 - var1 = new ItemComposition(); // L: 87 - var1.id = var0; // L: 88 - if (var2 != null) { // L: 89 - var1.decode(new Buffer(var2)); - } - - var1.post(); // L: 90 - if (var1.noteTemplate != -1) { // L: 91 - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); - } - - if (var1.notedId != -1) { // L: 92 - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { // L: 93 - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!Bounds.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94 - var1.name = "Members object"; // L: 95 - var1.isTradable = false; // L: 96 - var1.groundActions = null; // L: 97 - var1.inventoryActions = null; // L: 98 - var1.shiftClickIndex = -1; // L: 99 - var1.team = 0; // L: 100 - if (var1.params != null) { // L: 101 - boolean var3 = false; // L: 102 - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 103 - ParamComposition var5 = AbstractArchive.getParamDefinition((int)var4.key); // L: 104 - if (var5.autoDisable) { // L: 105 - var4.remove(); - } else { - var3 = true; // L: 106 - } - } - - if (!var3) { // L: 108 - var1.params = null; - } - } - } - - ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 111 - return var1; // L: 112 - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-610394630" - ) - public static final boolean method5194(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 16 - } -} diff --git a/runescape-client/src/main/java/class283.java b/runescape-client/src/main/java/class283.java new file mode 100644 index 0000000000..8fb7556353 --- /dev/null +++ b/runescape-client/src/main/java/class283.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ji") +public class class283 { + @ObfuscatedName("ei") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive19") + static Archive archive19; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "-587146564" + ) + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { // L: 9 + int var4 = (var3 + var2) / 2; // L: 10 + int var5 = var2; // L: 11 + String var6 = var0[var4]; // L: 12 + var0[var4] = var0[var3]; // L: 13 + var0[var3] = var6; // L: 14 + short var7 = var1[var4]; // L: 15 + var1[var4] = var1[var3]; // L: 16 + var1[var3] = var7; // L: 17 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 18 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 + String var9 = var0[var8]; // L: 20 + var0[var8] = var0[var5]; // L: 21 + var0[var5] = var9; // L: 22 + short var10 = var1[var8]; // L: 23 + var1[var8] = var1[var5]; // L: 24 + var1[var5++] = var10; // L: 25 + } + } + + var0[var3] = var0[var5]; // L: 29 + var0[var5] = var6; // L: 30 + var1[var3] = var1[var5]; // L: 31 + var1[var5] = var7; // L: 32 + sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 + sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 + } + + } // L: 36 + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-644454381" + ) + static void method4987() { + if (Varcs.localPlayer.x >> 7 == Client.destinationX && Varcs.localPlayer.y >> 7 == Client.destinationY) { // L: 3921 + Client.destinationX = 0; // L: 3922 + } + + } // L: 3924 +} diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java new file mode 100644 index 0000000000..53f6d53568 --- /dev/null +++ b/runescape-client/src/main/java/class29.java @@ -0,0 +1,56 @@ +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("ag") +public class class29 implements Callable { + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 254933769 + ) + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + final Buffer field216; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lat;" + ) + final class31 field215; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lax;" + ) + final class35 this$0; + + @ObfuscatedSignature( + descriptor = "(Lax;Lnu;Lat;)V" + ) + class29(class35 var1, Buffer var2, class31 var3) { + this.this$0 = var1; // L: 47 + this.field216 = var2; // L: 48 + this.field215 = var3; // L: 49 + } // L: 50 + + public Object call() { + return this.field215.vmethod389(this.field216); // L: 53 + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + descriptor = "(Lhu;I)V", + garbageValue = "1142852074" + ) + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field810) { // L: 11035 + Client.field811[var0.rootIndex] = true; // L: 11036 + } + + } // L: 11038 +} diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java deleted file mode 100644 index 365745c4c3..0000000000 --- a/runescape-client/src/main/java/class297.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kw") -public class class297 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - @Export("NetCache_socket") - public static AbstractSocket NetCache_socket; -} diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java deleted file mode 100644 index 795ba32e84..0000000000 --- a/runescape-client/src/main/java/class298.java +++ /dev/null @@ -1,31 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kb") -public class class298 { - @ObfuscatedName("n") - @Export("cp1252AsciiExtension") - public static final char[] cp1252AsciiExtension; - - static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmr;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { // L: 57 - var2 = (RunException)var0; // L: 58 - var2.message = var2.message + ' ' + var1; // L: 59 - } else { - var2 = new RunException(var0, var1); // L: 61 - } - - return var2; // L: 62 - } -} diff --git a/runescape-client/src/main/java/class299.java b/runescape-client/src/main/java/class299.java deleted file mode 100644 index 14f503391e..0000000000 --- a/runescape-client/src/main/java/class299.java +++ /dev/null @@ -1,28 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kf") -public final class class299 { - @ObfuscatedName("n") - @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("v") - static long[] field3683; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - - static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4 - field3683 = new long[12]; // L: 5 - - for (int var0 = 0; var0 < field3683.length; ++var0) { // L: 8 - field3683[var0] = (long)Math.pow(37.0D, (double)var0); - } - - } // L: 9 -} diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 1dab51f37b..3faf05d500 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,216 +1,234 @@ -import java.io.File; -import net.runelite.mapping.Export; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") -public class class3 implements Enumerated { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lc;" - ) - public static final class3 field26; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lc;" - ) - public static final class3 field17; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lc;" - ) - public static final class3 field18; - @ObfuscatedName("gj") +@ObfuscatedName("p") +public class class3 extends Node { + @ObfuscatedName("f") + boolean field32; + @ObfuscatedName("o") + boolean field28; + @ObfuscatedName("u") + public List field27; + @ObfuscatedName("p") + int[] field26; + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 585723225 + longValue = -1941040478688565745L ) - static int field24; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -313002573 - ) - final int field19; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 252641843 - ) - public final int field22; - @ObfuscatedName("h") - public final Class field21; - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ln;" - ) - final class0 field20; + long field29; + @ObfuscatedName("e") + public String field25; + @ObfuscatedName("k") + public byte field31; + @ObfuscatedName("g") + public byte field30; static { - field26 = new class3(1, 0, Integer.class, new class1()); // L: 10 - field17 = new class3(0, 1, Long.class, new class2()); // L: 23 - field18 = new class3(2, 2, String.class, new class4()); // L: 36 - } + new BitSet(65536); // L: 21 + } // L: 22 @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Ln;)V" + descriptor = "(Lnu;)V" ) - class3(int var1, int var2, Class var3, class0 var4) { - this.field19 = var1; // L: 55 - this.field22 = var2; // L: 56 - this.field21 = var3; - this.field20 = var4; - } + public class3(Buffer var1) { + this.field28 = true; // L: 12 + this.field25 = null; // L: 16 + this.method48(var1); // L: 25 + } // L: 26 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" + descriptor = "(B)[I", + garbageValue = "28" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field22; - } + public int[] method44() { + if (this.field26 == null) { // L: 29 + String[] var1 = new String[this.field27.size()]; // L: 30 + this.field26 = new int[this.field27.size()]; // L: 31 - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(Lkx;S)Ljava/lang/Object;", - garbageValue = "8209" - ) - public Object method32(Buffer var1) { - return this.field20.vmethod45(var1); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkx;I)V", - garbageValue = "1884916613" - ) - public static void method30(Object var0, Buffer var1) { - Class var3 = var0.getClass(); // L: 63 - class3[] var5 = new class3[]{field18, field26, field17}; - class3[] var6 = var5; - int var7 = 0; - - class3 var4; - while (true) { - if (var7 >= var6.length) { - var4 = null; - break; + for (int var2 = 0; var2 < this.field27.size(); this.field26[var2] = var2++) { // L: 32 34 + var1[var2] = ((class9)this.field27.get(var2)).field65; // L: 33 } - class3 var8 = var6[var7]; - if (var3 == var8.field21) { - var4 = var8; - break; - } - - ++var7; + int[] var3 = this.field26; // L: 36 + GrandExchangeOffer.method4633(var1, var3, 0, var1.length - 1); // L: 38 } - if (var4 == null) { + return this.field26; // L: 41 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ln;I)V", + garbageValue = "-1218707002" + ) + void method61(class9 var1) { + this.field27.add(var1); + this.field26 = null; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "525783356" + ) + void method45(int var1) { + this.field27.remove(var1); + this.field26 = null; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "77686460" + ) + public int method46() { + return this.field27.size(); + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "-59" + ) + public int method43(String var1) { + if (!this.field28) { + throw new RuntimeException("Displaynames not available"); + } else { + for (int var2 = 0; var2 < this.field27.size(); ++var2) { // L: 60 + if (((class9)this.field27.get(var2)).field65.equalsIgnoreCase(var1)) { + return var2; + } + } + + return -1; + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "1242419258" + ) + void method48(Buffer var1) { + int var2 = var1.readUnsignedByte(); + if ((var2 & 1) != 0) { + this.field32 = true; + } + + if ((var2 & 2) != 0) { // L: 69 + this.field28 = true; + } + + int var3 = 2; // L: 70 + if ((var2 & 4) != 0) { // L: 71 + var3 = var1.readUnsignedByte(); + } + + super.key = var1.readLong(); // L: 72 + this.field29 = var1.readLong(); // L: 73 + this.field25 = var1.readStringCp1252NullTerminated(); // L: 74 + var1.readBoolean(); // L: 75 + this.field30 = var1.readByte(); // L: 76 + this.field31 = var1.readByte(); // L: 77 + int var4 = var1.readUnsignedShort(); // L: 78 + if (var4 > 0) { // L: 79 + this.field27 = new ArrayList(var4); // L: 80 + + for (int var5 = 0; var5 < var4; ++var5) { // L: 81 + class9 var6 = new class9(); // L: 82 + if (this.field32) { // L: 83 + var1.readLong(); // L: 84 + } + + if (this.field28) { // L: 86 + var6.field65 = var1.readStringCp1252NullTerminated(); + } + + var6.field66 = var1.readByte(); // L: 87 + var6.field64 = var1.readUnsignedShort(); // L: 88 + if (var3 >= 3) { // L: 89 + var1.readBoolean(); // L: 90 + } + + this.field27.add(var5, var6); // L: 93 + } + } + + } // L: 96 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ldt;III)Lbh;", + garbageValue = "484099041" + ) + public static final PcmPlayer method57(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field394 == 0) { // L: 45 + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { // L: 46 + if (var2 < 256) { // L: 47 + var2 = 256; + } + + try { + PcmPlayer var3 = class301.pcmPlayerProvider.player(); // L: 49 + var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 50 + var3.field395 = 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 (Frames.field2007 > 0 && class0.soundSystem == null) { // L: 56 + class0.soundSystem = new SoundSystem(); // L: 57 + class34.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 58 + class34.soundSystemExecutor.scheduleAtFixedRate(class0.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 59 + } + + if (class0.soundSystem != null) { // L: 61 + if (class0.soundSystem.players[var1] != null) { // L: 62 + throw new IllegalArgumentException(); + } + + class0.soundSystem.players[var1] = var3; // L: 63 + } + + return var3; // L: 65 + } catch (Throwable var4) { // L: 67 + return new PcmPlayer(); // L: 68 + } + } else { throw new IllegalArgumentException(); - } else { - class0 var2 = var4.field20; - var2.vmethod48(var0, var1); } } - @ObfuscatedName("n") + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;B)V", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "2105009881" ) - @Export("assertCacheDirExists") - static void assertCacheDirExists(File var0) { - FileSystem.FileSystem_cacheDir = var0; // L: 16 - if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 - throw new RuntimeException(""); - } else { - FileSystem.FileSystem_hasPermissions = true; // L: 18 - } - } // L: 19 + static boolean method63() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1258 + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1259 + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1260 + if (!var0.isLoaded()) { + return false; // L: 1261 + } - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lig;Lig;I)V", - garbageValue = "614126080" - ) - public static void method41(AbstractArchive var0, AbstractArchive var1) { - NPCComposition.NpcDefinition_archive = var0; // L: 57 - NPCComposition.NpcDefinition_modelArchive = var1; // L: 58 - } // L: 59 - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)[B", - garbageValue = "-110" - ) - public static byte[] method40(CharSequence var0) { - int var1 = var0.length(); // L: 66 - byte[] var2 = new byte[var1]; // L: 67 - - for (int var3 = 0; var3 < var1; ++var3) { // L: 68 - char var4 = var0.charAt(var3); // L: 69 - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 70 - var2[var3] = (byte)var4; - } else if (var4 == 8364) { // L: 71 - var2[var3] = -128; - } else if (var4 == 8218) { // L: 72 - var2[var3] = -126; - } else if (var4 == 402) { // L: 73 - var2[var3] = -125; - } else if (var4 == 8222) { // L: 74 - var2[var3] = -124; - } else if (var4 == 8230) { // L: 75 - var2[var3] = -123; - } else if (var4 == 8224) { // L: 76 - var2[var3] = -122; - } else if (var4 == 8225) { // L: 77 - var2[var3] = -121; - } else if (var4 == 710) { // L: 78 - var2[var3] = -120; - } else if (var4 == 8240) { // L: 79 - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; // L: 80 - } else if (var4 == 8249) { // L: 81 - var2[var3] = -117; - } else if (var4 == 338) { // L: 82 - var2[var3] = -116; - } else if (var4 == 381) { // L: 83 - var2[var3] = -114; - } else if (var4 == 8216) { // L: 84 - var2[var3] = -111; - } else if (var4 == 8217) { // L: 85 - var2[var3] = -110; - } else if (var4 == 8220) { // L: 86 - var2[var3] = -109; - } else if (var4 == 8221) { // L: 87 - var2[var3] = -108; - } else if (var4 == 8226) { // L: 88 - var2[var3] = -107; - } else if (var4 == 8211) { // L: 89 - var2[var3] = -106; - } else if (var4 == 8212) { // L: 90 - var2[var3] = -105; - } else if (var4 == 732) { // L: 91 - var2[var3] = -104; - } else if (var4 == 8482) { // L: 92 - var2[var3] = -103; - } else if (var4 == 353) { // L: 93 - var2[var3] = -102; - } else if (var4 == 8250) { - var2[var3] = -101; // L: 94 - } else if (var4 == 339) { // L: 95 - var2[var3] = -100; - } else if (var4 == 382) { // L: 96 - var2[var3] = -98; - } else if (var4 == 376) { // L: 97 - var2[var3] = -97; - } else { - var2[var3] = 63; // L: 98 + ++Client.archiveLoadersDone; // L: 1262 } - } - return var2; // L: 100 + return true; // L: 1264 + } else { + return true; // L: 1263 + } } -} \ No newline at end of file +} diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java new file mode 100644 index 0000000000..48717e3415 --- /dev/null +++ b/runescape-client/src/main/java/class30.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("aq") +public interface class30 { +} diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index 2932819ce5..e2861d7d09 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,99 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("kd") public class class300 { - @ObfuscatedName("n") - static char[] field3688; - @ObfuscatedName("v") - static char[] field3685; - @ObfuscatedName("d") - static char[] field3686; - @ObfuscatedName("c") - static int[] field3687; + @ObfuscatedName("f") + @Export("cp1252AsciiExtension") + public static final char[] cp1252AsciiExtension; static { - field3688 = new char[64]; // L: 7 - - int var0; - for (var0 = 0; var0 < 26; ++var0) { // L: 8 - field3688[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 9 - field3688[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 10 - field3688[var0] = (char)(var0 + 48 - 52); - } - - field3688[62] = '+'; // L: 11 - field3688[63] = '/'; // L: 12 - field3685 = new char[64]; // L: 18 - - for (var0 = 0; var0 < 26; ++var0) { // L: 19 - field3685[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 20 - field3685[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 21 - field3685[var0] = (char)(var0 + 48 - 52); - } - - field3685[62] = '*'; // L: 22 - field3685[63] = '-'; // L: 23 - field3686 = new char[64]; // L: 29 - - for (var0 = 0; var0 < 26; ++var0) { // L: 30 - field3686[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { // L: 31 - field3686[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { // L: 32 - field3686[var0] = (char)(var0 + 48 - 52); - } - - field3686[62] = '-'; // L: 33 - field3686[63] = '_'; // L: 34 - field3687 = new int[128]; // L: 40 - - for (var0 = 0; var0 < field3687.length; ++var0) { // L: 41 - field3687[var0] = -1; - } - - for (var0 = 65; var0 <= 90; ++var0) { // L: 42 - field3687[var0] = var0 - 65; - } - - for (var0 = 97; var0 <= 122; ++var0) { // L: 43 - field3687[var0] = var0 - 97 + 26; - } - - for (var0 = 48; var0 <= 57; ++var0) { // L: 44 - field3687[var0] = var0 - 48 + 52; - } - - int[] var2 = field3687; // L: 45 - field3687[43] = 62; // L: 46 - var2[42] = 62; // L: 47 - int[] var1 = field3687; // L: 48 - field3687[47] = 63; // L: 49 - var1[45] = 63; // L: 50 - } // L: 51 - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-43" - ) - static final void method5473(String var0) { - AbstractWorldMapData.addGameMessage(30, "", var0); // L: 112 - } // L: 113 + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 + } } diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java new file mode 100644 index 0000000000..80a91f6237 --- /dev/null +++ b/runescape-client/src/main/java/class301.java @@ -0,0 +1,107 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ks") +public class class301 { + @ObfuscatedName("f") + static char[] field3751; + @ObfuscatedName("o") + static char[] field3753; + @ObfuscatedName("u") + static char[] field3752; + @ObfuscatedName("p") + static int[] field3754; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lbe;" + ) + @Export("pcmPlayerProvider") + public static PlayerProvider pcmPlayerProvider; + + static { + field3751 = new char[64]; // L: 7 + + int var0; + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field3751[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field3751[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field3751[var0] = (char)(var0 + 48 - 52); + } + + field3751[62] = '+'; // L: 11 + field3751[63] = '/'; // L: 12 + field3753 = new char[64]; // L: 18 + + for (var0 = 0; var0 < 26; ++var0) { // L: 19 + field3753[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 20 + field3753[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 21 + field3753[var0] = (char)(var0 + 48 - 52); + } + + field3753[62] = '*'; // L: 22 + field3753[63] = '-'; // L: 23 + field3752 = new char[64]; // L: 29 + + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field3752[var0] = (char)(var0 + 65); + } + + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field3752[var0] = (char)(var0 + 97 - 26); + } + + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field3752[var0] = (char)(var0 + 48 - 52); + } + + field3752[62] = '-'; // L: 33 + field3752[63] = '_'; // L: 34 + field3754 = new int[128]; + + for (var0 = 0; var0 < field3754.length; ++var0) { // L: 41 + field3754[var0] = -1; + } + + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field3754[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field3754[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field3754[var0] = var0 - 48 + 52; + } + + int[] var2 = field3754; // L: 45 + field3754[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field3754; // L: 48 + field3754[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)Lbs;", + garbageValue = "538543720" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 + } +} diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java new file mode 100644 index 0000000000..76ce3ca20e --- /dev/null +++ b/runescape-client/src/main/java/class302.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ku") +public final class class302 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "1843004219" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + class221.method4198(var0, var1, "openjs", var2); // L: 22 + } // L: 23 +} diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java new file mode 100644 index 0000000000..ef274b340b --- /dev/null +++ b/runescape-client/src/main/java/class303.java @@ -0,0 +1,100 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("km") +public class class303 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lli;" + ) + @Export("NetCache_socket") + public static AbstractSocket NetCache_socket; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;I)V", + garbageValue = "-1939913696" + ) + public static void method5526(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; // L: 17 + } // L: 18 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)Lje;", + garbageValue = "1697768546" + ) + @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("b") + @ObfuscatedSignature( + descriptor = "([BIIB)Ljava/lang/String;", + garbageValue = "-109" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 105 + int var4 = 0; // L: 106 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 107 + int var6 = var0[var5 + var1] & 255; // L: 108 + if (var6 != 0) { // L: 109 + if (var6 >= 128 && var6 < 160) { // L: 110 + char var7 = class300.cp1252AsciiExtension[var6 - 128]; // L: 111 + if (var7 == 0) { // L: 112 + var7 = '?'; + } + + var6 = var7; // L: 113 + } + + var3[var4++] = (char)var6; // L: 115 + } + } + + return new String(var3, 0, var4); // L: 117 + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-1225560249" + ) + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + NPCComposition.scrollBarSprites[0].drawAt(var0, var1); // L: 10063 + NPCComposition.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10064 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field665); // L: 10065 + int var5 = var3 * (var3 - 32) / var4; // L: 10066 + if (var5 < 8) { // L: 10067 + var5 = 8; + } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10068 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field666); // L: 10069 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field668); // L: 10070 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field668); // L: 10071 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field668); // L: 10072 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field668); // L: 10073 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field667); // L: 10074 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field667); // L: 10075 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field667); // L: 10076 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field667); // L: 10077 + } // L: 10078 +} diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java index d50ee2f4d2..4fa497f4d3 100644 --- a/runescape-client/src/main/java/class304.java +++ b/runescape-client/src/main/java/class304.java @@ -1,90 +1,140 @@ +import java.util.Arrays; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") -public class class304 { - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-1784292523" - ) - static int method5507(int var0, Script var1, boolean var2) { - if (var0 < 1000) { // L: 391 - return class228.method4309(var0, var1, var2); - } else if (var0 < 1100) { // L: 392 - return class4.method53(var0, var1, var2); - } else if (var0 < 1200) { // L: 393 - return class90.method2193(var0, var1, var2); - } else if (var0 < 1300) { // L: 394 - return class197.method3844(var0, var1, var2); - } else if (var0 < 1400) { // L: 395 - return AbstractWorldMapData.method350(var0, var1, var2); - } else if (var0 < 1500) { // L: 396 - return WorldMapSection1.method679(var0, var1, var2); - } else if (var0 < 1600) { // L: 397 - return AbstractWorldMapIcon.method713(var0, var1, var2); - } else if (var0 < 1700) { // L: 398 - return class9.method98(var0, var1, var2); - } else if (var0 < 1800) { // L: 399 - return PendingSpawn.method1845(var0, var1, var2); - } else if (var0 < 1900) { // L: 400 - return Huffman.method4157(var0, var1, var2); - } else if (var0 < 2000) { // L: 401 - return BuddyRankComparator.method3622(var0, var1, var2); - } else if (var0 < 2100) { // L: 402 - return class4.method53(var0, var1, var2); - } else if (var0 < 2200) { // L: 403 - return class90.method2193(var0, var1, var2); - } else if (var0 < 2300) { // L: 404 - return class197.method3844(var0, var1, var2); - } else if (var0 < 2400) { // L: 405 - return AbstractWorldMapData.method350(var0, var1, var2); - } else if (var0 < 2500) { - return WorldMapSection1.method679(var0, var1, var2); // L: 406 - } else if (var0 < 2600) { // L: 407 - return BuddyRankComparator.method3621(var0, var1, var2); - } else if (var0 < 2700) { // L: 408 - return PlayerType.method4346(var0, var1, var2); - } else if (var0 < 2800) { // L: 409 - return MouseHandler.method1174(var0, var1, var2); - } else if (var0 < 2900) { // L: 410 - return Login.method2223(var0, var1, var2); - } else if (var0 < 3000) { // L: 411 - return BuddyRankComparator.method3622(var0, var1, var2); - } else if (var0 < 3200) { // L: 412 - return MusicPatchPcmStream.method4118(var0, var1, var2); - } else if (var0 < 3300) { // L: 413 - return ApproximateRouteStrategy.method1313(var0, var1, var2); - } else if (var0 < 3400) { // L: 414 - return Strings.method4326(var0, var1, var2); - } else if (var0 < 3500) { // L: 415 - return WorldMapManager.method746(var0, var1, var2); - } else if (var0 < 3700) { // L: 416 - return Occluder.method3447(var0, var1, var2); - } else if (var0 < 3800) { // L: 417 - return class2.method25(var0, var1, var2); - } else if (var0 < 4000) { // L: 418 - return class219.method4173(var0, var1, var2); - } else if (var0 < 4100) { // L: 419 - return JagexCache.method3686(var0, var1, var2); - } else if (var0 < 4200) { // L: 420 - return HorizontalAlignment.method4924(var0, var1, var2); - } else if (var0 < 4300) { // L: 421 - return Tiles.method1215(var0, var1, var2); - } else if (var0 < 5100) { - return PendingSpawn.method1846(var0, var1, var2); // L: 422 - } else if (var0 < 5400) { // L: 423 - return ScriptFrame.method1221(var0, var1, var2); - } else if (var0 < 5600) { // L: 424 - return WorldMapIcon_0.method285(var0, var1, var2); - } else if (var0 < 5700) { // L: 425 - return Widget.method4292(var0, var1, var2); - } else if (var0 < 6300) { // L: 426 - return ApproximateRouteStrategy.method1315(var0, var1, var2); - } else if (var0 < 6600) { // L: 427 - return Client.method1839(var0, var1, var2); - } else { - return var0 < 6700 ? class195.method3821(var0, var1, var2) : 2; // L: 428 429 +@ObfuscatedName("kv") +public final class class304 { + @ObfuscatedName("f") + @Export("base37Table") + static final char[] base37Table; + @ObfuscatedName("o") + static long[] field3761; + + static { + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4 + field3761 = new long[12]; // L: 5 + + for (int var0 = 0; var0 < field3761.length; ++var0) { // L: 8 + field3761[var0] = (long)Math.pow(37.0D, (double)var0); } - } + + } // L: 9 + + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1745033175" + ) + static void method5536() { + Client.mouseLastLastPressedTimeMillis = -1L; // L: 2181 + Language.mouseRecorder.index = 0; // L: 2182 + GrandExchangeOfferAgeComparator.hasFocus = true; // L: 2183 + Client.hadFocus = true; // L: 2184 + Client.field678 = -1L; // L: 2185 + class69.reflectionChecks = new IterableNodeDeque(); // L: 2187 + Client.packetWriter.clearBuffer(); // L: 2189 + Client.packetWriter.packetBuffer.offset = 0; // L: 2190 + Client.packetWriter.serverPacket = null; // L: 2191 + Client.packetWriter.field1381 = null; // L: 2192 + Client.packetWriter.field1392 = null; // L: 2193 + Client.packetWriter.field1393 = null; // L: 2194 + Client.packetWriter.serverPacketLength = 0; // L: 2195 + Client.packetWriter.field1391 = 0; // L: 2196 + Client.rebootTimer = 0; // L: 2197 + Client.logoutTimer = 0; // L: 2198 + Client.hintArrowType = 0; // L: 2199 + Client.menuOptionsCount = 0; // L: 2201 + Client.isMenuOpen = false; // L: 2202 + MouseHandler.MouseHandler_idleCycles = 0; // L: 2205 + Script.method2010(); // L: 2207 + Client.isItemSelected = 0; // L: 2208 + Client.isSpellSelected = false; // L: 2209 + Client.soundEffectCount = 0; // L: 2210 + Client.camAngleY = 0; // L: 2211 + Client.oculusOrbState = 0; // L: 2212 + class105.field1331 = null; // L: 2213 + Client.minimapState = 0; // L: 2214 + Client.field833 = -1; // L: 2215 + Client.destinationX = 0; // L: 2216 + Client.destinationY = 0; // L: 2217 + Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2218 + Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2219 + Client.npcCount = 0; // L: 2220 + TaskHandler.method2524(); // L: 2221 + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { // L: 2222 + Client.players[var0] = null; + } + + for (var0 = 0; var0 < 32768; ++var0) { // L: 2223 + Client.npcs[var0] = null; + } + + Client.combatTargetPlayerIndex = -1; // L: 2224 + Client.projectiles.clear(); // L: 2225 + Client.graphicsObjects.clear(); // L: 2226 + + for (var0 = 0; var0 < 4; ++var0) { // L: 2227 + for (int var4 = 0; var4 < 104; ++var4) { // L: 2228 + for (int var2 = 0; var2 < 104; ++var2) { // L: 2229 + Client.groundItems[var0][var4][var2] = null; // L: 2230 + } + } + } + + Client.pendingSpawns = new NodeDeque(); // L: 2234 + class13.friendSystem.clear(); // L: 2235 + + for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { // L: 2236 + VarpDefinition var1 = class303.VarpDefinition_get(var0); // L: 2237 + if (var1 != null) { // L: 2238 + Varps.Varps_temp[var0] = 0; // L: 2239 + Varps.Varps_main[var0] = 0; // L: 2240 + } + } + + TextureProvider.varcs.clearTransient(); // L: 2243 + Client.followerIndex = -1; // L: 2244 + if (Client.rootInterface != -1) { // L: 2245 + WorldMapRegion.method2929(Client.rootInterface); + } + + for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2246 + WorldMapData_1.closeInterface(var3, true); // L: 2247 + } + + Client.rootInterface = -1; // L: 2249 + Client.interfaceParents = new NodeHashTable(8); // L: 2250 + Client.meslayerContinueWidget = null; // L: 2251 + Client.menuOptionsCount = 0; // L: 2253 + Client.isMenuOpen = false; // L: 2254 + Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2256 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2257 + Client.playerMenuActions[var0] = null; // L: 2258 + Client.playerOptionsPriorities[var0] = false; // L: 2259 + } + + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2262 + Client.isLoading = true; // L: 2264 + + for (var0 = 0; var0 < 100; ++var0) { // L: 2265 + Client.field811[var0] = true; + } + + ItemContainer.method2093(); // L: 2266 + InterfaceParent.clanChat = null; // L: 2267 + ObjectSound.field928 = null; // L: 2268 + Arrays.fill(Client.field831, (Object)null); // L: 2269 + IsaacCipher.field4266 = null; // L: 2270 + Arrays.fill(Client.field820, (Object)null); // L: 2271 + + for (var0 = 0; var0 < 8; ++var0) { // L: 2272 + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + Calendar.grandExchangeEvents = null; // L: 2273 + } // L: 2274 } diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java new file mode 100644 index 0000000000..bf56764f0a --- /dev/null +++ b/runescape-client/src/main/java/class305.java @@ -0,0 +1,71 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("kn") +public class class305 { + @ObfuscatedName("f") + @Export("writeRandomDat") + public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { + if (var2 == var0) { // L: 12 + if (var3 == var1) { // L: 13 + return; + } + + if (var3 > var1 && var3 < var4 + var1) { // L: 14 + --var4; // L: 15 + var1 += var4; // L: 16 + var3 += var4; // L: 17 + var4 = var1 - var4; // L: 18 + + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28 + var2[var3--] = var0[var1--]; // L: 21 + var2[var3--] = var0[var1--]; // L: 22 + var2[var3--] = var0[var1--]; // L: 23 + var2[var3--] = var0[var1--]; // L: 24 + var2[var3--] = var0[var1--]; // L: 25 + var2[var3--] = var0[var1--]; // L: 26 + var2[var3--] = var0[var1--]; // L: 27 + } + + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 + } + + return; // L: 32 + } + } + + var4 += var1; // L: 35 + + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45 + var2[var3++] = var0[var1++]; // L: 38 + var2[var3++] = var0[var1++]; // L: 39 + var2[var3++] = var0[var1++]; // L: 40 + var2[var3++] = var0[var1++]; // L: 41 + var2[var3++] = var0[var1++]; // L: 42 + var2[var3++] = var0[var1++]; // L: 43 + var2[var3++] = var0[var1++]; // L: 44 + } + + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 + } + + } // L: 49 + + @ObfuscatedName("n") + @Export("clearIntArray") + public static void clearIntArray(int[] var0, int var1, int var2) { + for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 + var0[var1++] = 0; // L: 366 + var0[var1++] = 0; // L: 367 + var0[var1++] = 0; // L: 368 + var0[var1++] = 0; // L: 369 + var0[var1++] = 0; // L: 370 + var0[var1++] = 0; // L: 371 + var0[var1++] = 0; // L: 372 + } + + for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 + } + + } // L: 377 +} diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java deleted file mode 100644 index f7ff9d6dd0..0000000000 --- a/runescape-client/src/main/java/class307.java +++ /dev/null @@ -1,28 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kc") -public final class class307 { - @ObfuscatedName("n") - @ObfuscatedGetter( - longValue = -5661179998477145969L - ) - static long field3734; - @ObfuscatedName("v") - @ObfuscatedGetter( - longValue = -6375840099148594553L - ) - static long field3735; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Llp;", - garbageValue = "1168600989" - ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field3897, FillMode.SOLID, FillMode.field3896}; // L: 15 - } -} diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java deleted file mode 100644 index 0d74762a62..0000000000 --- a/runescape-client/src/main/java/class308.java +++ /dev/null @@ -1,124 +0,0 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; - -@ObfuscatedName("kh") -public class class308 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Lkx;II)V", - garbageValue = "-1051867244" - ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); // L: 133 - var2.size = var0.readUnsignedByte(); // L: 134 - var2.id = var0.readInt(); // L: 135 - var2.operations = new int[var2.size]; // L: 136 - var2.creationErrors = new int[var2.size]; // L: 137 - var2.fields = new Field[var2.size]; // L: 138 - var2.intReplaceValues = new int[var2.size]; // L: 139 - var2.methods = new Method[var2.size]; // L: 140 - var2.arguments = new byte[var2.size][][]; // L: 141 - - for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142 - try { - int var4 = var0.readUnsignedByte(); // L: 144 - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145 - if (var4 == 3 || var4 == 4) { // L: 155 - var5 = var0.readStringCp1252NullTerminated(); // L: 156 - var6 = var0.readStringCp1252NullTerminated(); // L: 157 - var7 = var0.readUnsignedByte(); // L: 158 - String[] var8 = new String[var7]; // L: 159 - - for (int var9 = 0; var9 < var7; ++var9) { // L: 160 - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); // L: 161 - byte[][] var10 = new byte[var7][]; // L: 162 - int var12; - if (var4 == 3) { // L: 163 - for (int var11 = 0; var11 < var7; ++var11) { // L: 164 - var12 = var0.readInt(); // L: 165 - var10[var11] = new byte[var12]; // L: 166 - var0.readBytes(var10[var11], 0, var12); // L: 167 - } - } - - var2.operations[var3] = var4; // L: 170 - Class[] var21 = new Class[var7]; // L: 171 - - for (var12 = 0; var12 < var7; ++var12) { // L: 172 - var21[var12] = class23.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class23.loadClassFromDescriptor(var20); // L: 173 - if (class23.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174 - throw new SecurityException(); - } - - Method[] var13 = class23.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175 - Method[] var14 = var13; // L: 177 - - for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178 - Method var16 = var14[var15]; // L: 179 - if (Reflection.getMethodName(var16).equals(var6)) { // L: 181 - Class[] var17 = Reflection.getParameterTypes(var16); // L: 182 - if (var17.length == var21.length) { // L: 183 - boolean var18 = true; // L: 184 - - for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185 - if (var21[var19] != var17[var19]) { // L: 186 - var18 = false; // L: 187 - break; // L: 188 - } - } - - if (var18 && var22 == var16.getReturnType()) { // L: 191 - var2.methods[var3] = var16; // L: 192 - } - } - } - } - - var2.arguments[var3] = var10; // L: 199 - } - } else { - var5 = var0.readStringCp1252NullTerminated(); // L: 146 - var6 = var0.readStringCp1252NullTerminated(); // L: 147 - var7 = 0; // L: 148 - if (var4 == 1) { // L: 149 - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; // L: 150 - var2.intReplaceValues[var3] = var7; // L: 151 - if (class23.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152 - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class23.loadClassFromDescriptor(var5), var6); // L: 153 - } - } catch (ClassNotFoundException var24) { // L: 202 - var2.creationErrors[var3] = -1; // L: 203 - } catch (SecurityException var25) { // L: 205 - var2.creationErrors[var3] = -2; // L: 206 - } catch (NullPointerException var26) { // L: 208 - var2.creationErrors[var3] = -3; // L: 209 - } catch (Exception var27) { // L: 211 - var2.creationErrors[var3] = -4; // L: 212 - } catch (Throwable var28) { // L: 214 - var2.creationErrors[var3] = -5; // L: 215 - } - } - - class105.reflectionChecks.addFirst(var2); // L: 218 - } // L: 219 -} diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java new file mode 100644 index 0000000000..b238bd4f51 --- /dev/null +++ b/runescape-client/src/main/java/class309.java @@ -0,0 +1,132 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kg") +public class class309 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;III)[Low;", + garbageValue = "1718772272" + ) + public static IndexedSprite[] method5603(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 { + class244.SpriteBuffer_decode(var4); // L: 30 + var3 = true; // L: 31 + } + + if (!var3) { // L: 33 + return null; + } else { + IndexedSprite[] var5 = new IndexedSprite[class124.SpriteBuffer_spriteCount]; // L: 36 + + for (int var6 = 0; var6 < class124.SpriteBuffer_spriteCount; ++var6) { // L: 37 + IndexedSprite var7 = var5[var6] = new IndexedSprite(); // L: 38 + var7.width = class395.SpriteBuffer_spriteWidth; // L: 39 + var7.height = class395.SpriteBuffer_spriteHeight; // L: 40 + var7.xOffset = class0.SpriteBuffer_xOffsets[var6]; // L: 41 + var7.yOffset = Interpreter.SpriteBuffer_yOffsets[var6]; // L: 42 + var7.subWidth = class395.SpriteBuffer_spriteWidths[var6]; // L: 43 + var7.subHeight = class157.SpriteBuffer_spriteHeights[var6]; // L: 44 + var7.palette = Varps.SpriteBuffer_spritePalette; // L: 45 + var7.pixels = class223.SpriteBuffer_pixels[var6]; // L: 46 + } + + WorldMapDecorationType.method4370(); // L: 48 + return var5; // L: 51 + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(CI)C", + garbageValue = "386677351" + ) + static char method5602(char var0) { + switch(var0) { // L: 93 + case ' ': + case '-': + case '_': + case ' ': + return '_'; // L: 145 + case '#': + case '[': + case ']': + return var0; // L: 129 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; // L: 140 + case 'Ç': + case 'ç': + return 'c'; // L: 98 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; // L: 107 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; // L: 123 + case 'Ñ': + case 'ñ': + return 'n'; // L: 148 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; // L: 159 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; // L: 116 + case 'ß': + return 'b'; // L: 95 + case 'ÿ': + case 'Ÿ': + return 'y'; // L: 162 + default: + return Character.toLowerCase(var0); // L: 125 + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)[Lox;", + garbageValue = "-1941444476" + ) + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.SOLID, FillMode.field4229, FillMode.field4230}; // L: 15 + } +} diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java new file mode 100644 index 0000000000..a2691f6902 --- /dev/null +++ b/runescape-client/src/main/java/class31.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("at") +public interface class31 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;)Lnu;" + ) + Buffer vmethod389(Buffer var1); +} diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java index f6227ebb09..9b612d969a 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/class311.java @@ -1,71 +1,685 @@ +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("ki") public class class311 { - @ObfuscatedName("n") - @Export("writeRandomDat") - public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { // L: 12 - if (var3 == var1) { // L: 13 - return; + @ObfuscatedName("t") + @Export("cacheSubPaths") + static String[] cacheSubPaths; + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z", + garbageValue = "27746923" + ) + static boolean method5605(String var0, int var1, String var2) { + if (var1 == 0) { // L: 58 + try { + if (!class44.field294.startsWith("win")) { // L: 60 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 61 + throw new Exception(); + } else { + String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 62 + + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 63 + if (var10.indexOf(var0.charAt(var4)) == -1) { // L: 64 + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 66 + return true; // L: 67 + } + } catch (Throwable var5) { // L: 69 + return false; // L: 70 + } + } else if (var1 == 1) { // L: 73 + try { + Object var3 = class42.method511(class44.applet, var2, new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}); // L: 75 + return var3 != null; // L: 76 + } catch (Throwable var6) { // L: 78 + return false; // L: 79 + } + } else if (var1 == 2) { // L: 82 + try { + class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 84 + return true; // L: 85 + } catch (Exception var7) { // L: 87 + return false; // L: 88 + } + } else if (var1 == 3) { // L: 91 + try { + class42.method509(class44.applet, "loggedout"); // L: 93 + } catch (Throwable var9) { // L: 95 } - if (var3 > var1 && var3 < var4 + var1) { // L: 14 - --var4; // L: 15 - var1 += var4; // L: 16 - var3 += var4; // L: 17 - var4 = var1 - var4; // L: 18 - - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28 - var2[var3--] = var0[var1--]; // L: 21 - var2[var3--] = var0[var1--]; // L: 22 - var2[var3--] = var0[var1--]; // L: 23 - var2[var3--] = var0[var1--]; // L: 24 - var2[var3--] = var0[var1--]; // L: 25 - var2[var3--] = var0[var1--]; // L: 26 - var2[var3--] = var0[var1--]; // L: 27 - } - - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 - } - - return; // L: 32 + try { + class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 97 + return true; // L: 98 + } catch (Exception var8) { // L: 100 + return false; // L: 101 } + } else { + throw new IllegalArgumentException(); // L: 104 } + } - var4 += var1; // L: 35 + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(Lcd;IIIIIB)V", + garbageValue = "66" + ) + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4066 + if (var0 instanceof NPC) { // L: 4067 + NPCComposition var6 = ((NPC)var0).definition; // L: 4068 + if (var6.transforms != null) { // L: 4069 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 4070 + return; + } + } + + int var75 = Players.Players_count; // L: 4072 + int[] var7 = Players.Players_indices; // L: 4073 + byte var8 = 0; // L: 4074 + Player var10; + if (var1 < var75 && var0.playerCycle == Client.cycle) { // L: 4075 + var10 = (Player)var0; // L: 4077 + boolean var9; + if (Client.drawPlayerNames == 0) { // L: 4079 + var9 = false; // L: 4080 + } else if (var10 != Varcs.localPlayer) { // L: 4083 + boolean var11 = (Client.drawPlayerNames & 4) != 0; // L: 4086 + boolean var12 = var11; // L: 4088 + if (!var11) { // L: 4089 + boolean var13 = (Client.drawPlayerNames & 1) != 0; // L: 4092 + var12 = var13 && var10.isFriend(); // L: 4094 + } + + var9 = var12 || ApproximateRouteStrategy.method1206() && var10.isClanMember(); // L: 4096 + } else { + var9 = PcmPlayer.method855(); // L: 4098 + } + + if (var9) { // L: 4100 + Player var76 = (Player)var0; // L: 4101 + if (var1 < var75) { // L: 4102 + ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4103 + AbstractFont var77 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4104 + byte var92 = 9; // L: 4105 + var77.drawCentered(var76.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0); // L: 4106 + var8 = 18; // L: 4107 + } + } + } + + int var87 = -2; // L: 4111 + int var15; + int var22; + int var23; + if (!var0.healthBars.method4787()) { // L: 4112 + ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4113 + + for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { // L: 4114 + HealthBarUpdate var94 = var88.get(Client.cycle); // L: 4115 + if (var94 == null) { // L: 4116 + if (var88.isEmpty()) { // L: 4174 + var88.remove(); + } + } else { + HealthBarDefinition var95 = var88.definition; // L: 4117 + SpritePixels var79 = var95.getBackSprite(); // L: 4118 + SpritePixels var81 = var95.getFrontSprite(); // L: 4119 + int var82 = 0; // L: 4121 + if (var79 != null && var81 != null) { // L: 4122 + if (var95.widthPadding * 2 < var81.subWidth) { // L: 4123 + var82 = var95.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; // L: 4124 + } else { + var15 = var95.width; // L: 4126 + } + + int var17 = 255; // L: 4127 + boolean var83 = true; // L: 4128 + int var84 = Client.cycle - var94.cycle; // L: 4129 + int var85 = var15 * var94.health2 / var95.width; // L: 4130 + int var86; + int var97; + if (var94.cycleOffset > var84) { // L: 4131 + var86 = var95.field3449 == 0 ? 0 : var95.field3449 * (var84 / var95.field3449); // L: 4132 + var22 = var15 * var94.health / var95.width; // L: 4133 + var97 = var86 * (var85 - var22) / var94.cycleOffset + var22; // L: 4134 + } else { + var97 = var85; // L: 4137 + var86 = var94.cycleOffset + var95.int5 - var84; // L: 4138 + if (var95.int3 >= 0) { // L: 4139 + var17 = (var86 << 8) / (var95.int5 - var95.int3); + } + } + + if (var94.health2 > 0 && var97 < 1) { // L: 4141 + var97 = 1; + } + + if (var79 != null && var81 != null) { // L: 4142 + if (var97 == var15) { // L: 4143 + var97 += var82 * 2; + } else { + var97 += var82; // L: 4144 + } + + var86 = var79.subHeight; // L: 4145 + var87 += var86; // L: 4146 + var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4147 + var23 = var3 + Client.viewportTempY - var87; // L: 4148 + var22 -= var82; // L: 4149 + if (var17 >= 0 && var17 < 255) { // L: 4150 + var79.drawTransAt(var22, var23, var17); // L: 4151 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var86); // L: 4152 + var81.drawTransAt(var22, var23, var17); // L: 4153 + } else { + var79.drawTransBgAt(var22, var23); // L: 4156 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var86 + var23); // L: 4157 + var81.drawTransBgAt(var22, var23); // L: 4158 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4160 + var87 += 2; // L: 4161 + } else { + var87 += 5; // L: 4164 + if (Client.viewportTempX > -1) { // L: 4165 + var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4166 + var22 = var3 + Client.viewportTempY - var87; // L: 4167 + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var97, 5, 65280); // L: 4168 + Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var97, var22, var15 - var97, 5, 16711680); // L: 4169 + } + + var87 += 2; // L: 4171 + } + } + } + } + + if (var87 == -2) { // L: 4177 + var87 += 7; + } + + var87 += var8; // L: 4178 + if (var1 < var75) { // L: 4179 + var10 = (Player)var0; // L: 4180 + if (var10.isHidden) { // L: 4181 + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { // L: 4182 + ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4183 + if (Client.viewportTempX > -1) { // L: 4184 + if (var10.headIconPk != -1) { // L: 4185 + var87 += 25; // L: 4186 + ItemContainer.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4187 + } + + if (var10.headIconPrayer != -1) { // L: 4189 + var87 += 25; // L: 4190 + ArchiveDiskActionHandler.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4191 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4195 + ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4196 + if (Client.viewportTempX > -1) { // L: 4197 + var87 += Script.headIconHintSprites[1].subHeight; // L: 4198 + Script.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); // L: 4199 + } + } + } else { + NPCComposition var89 = ((NPC)var0).definition; // L: 4204 + if (var89.transforms != null) { // L: 4205 + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < ArchiveDiskActionHandler.headIconPrayerSprites.length) { // L: 4206 + ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4207 + if (Client.viewportTempX > -1) { // L: 4208 + ArchiveDiskActionHandler.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4209 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4212 + ScriptFrame.method1173(var0, var0.defaultHeight + 15); // L: 4213 + if (Client.viewportTempX > -1) { // L: 4214 + Script.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field1208 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4217 4218 + ScriptFrame.method1173(var0, var0.defaultHeight); // L: 4219 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4220 + Client.overheadTextXOffsets[Client.overheadTextCount] = class368.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4221 + Client.overheadTextAscents[Client.overheadTextCount] = class368.fontBold12.ascent; // L: 4222 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4223 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4224 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4225 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4226 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4227 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4228 + ++Client.overheadTextCount; // L: 4229 + } + } + + for (int var78 = 0; var78 < 4; ++var78) { // L: 4233 + int var90 = var0.hitSplatCycles[var78]; // L: 4234 + int var91 = var0.hitSplatTypes[var78]; // L: 4235 + HitSplatDefinition var96 = null; // L: 4236 + int var14 = 0; // L: 4237 + if (var91 >= 0) { // L: 4238 + if (var90 <= Client.cycle) { // L: 4239 + continue; + } + + var96 = StudioGame.method4391(var0.hitSplatTypes[var78]); // L: 4240 + var14 = var96.field3581; // L: 4241 + if (var96 != null && var96.transforms != null) { // L: 4242 + var96 = var96.transform(); // L: 4243 + if (var96 == null) { // L: 4244 + var0.hitSplatCycles[var78] = -1; // L: 4245 + continue; // L: 4246 + } + } + } else if (var90 < 0) { // L: 4250 + continue; + } + + var15 = var0.hitSplatTypes2[var78]; // L: 4251 + HitSplatDefinition var16 = null; // L: 4252 + if (var15 >= 0) { // L: 4253 + var16 = StudioGame.method4391(var15); // L: 4254 + if (var16 != null && var16.transforms != null) { // L: 4255 + var16 = var16.transform(); + } + } + + if (var90 - var14 <= Client.cycle) { // L: 4257 + if (var96 == null) { // L: 4258 + var0.hitSplatCycles[var78] = -1; // L: 4259 + } else { + ScriptFrame.method1173(var0, var0.defaultHeight / 2); // L: 4262 + if (Client.viewportTempX > -1) { // L: 4263 + if (var78 == 1) { // L: 4265 + Client.viewportTempY -= 20; // L: 4266 + } + + if (var78 == 2) { // L: 4268 + Client.viewportTempX -= 15; // L: 4269 + Client.viewportTempY -= 10; // L: 4270 + } + + if (var78 == 3) { // L: 4272 + Client.viewportTempX += 15; // L: 4273 + Client.viewportTempY -= 10; // L: 4274 + } + + SpritePixels var18 = null; // L: 4276 + SpritePixels var19 = null; // L: 4277 + SpritePixels var20 = null; // L: 4278 + SpritePixels var21 = null; // L: 4279 + var22 = 0; // L: 4280 + var23 = 0; // L: 4281 + int var24 = 0; // L: 4282 + int var25 = 0; // L: 4283 + int var26 = 0; // L: 4284 + int var27 = 0; // L: 4285 + int var28 = 0; // L: 4286 + int var29 = 0; // L: 4287 + SpritePixels var30 = null; // L: 4288 + SpritePixels var31 = null; // L: 4289 + SpritePixels var32 = null; // L: 4290 + SpritePixels var33 = null; // L: 4291 + int var34 = 0; // L: 4292 + int var35 = 0; // L: 4293 + int var36 = 0; // L: 4294 + int var37 = 0; // L: 4295 + int var38 = 0; // L: 4296 + int var39 = 0; // L: 4297 + int var40 = 0; // L: 4298 + int var41 = 0; // L: 4299 + int var42 = 0; // L: 4300 + var18 = var96.method5166(); // L: 4301 + int var43; + if (var18 != null) { // L: 4302 + var22 = var18.subWidth; // L: 4303 + var43 = var18.subHeight; // L: 4304 + if (var43 > var42) { // L: 4305 + var42 = var43; + } + + var26 = var18.xOffset; // L: 4306 + } + + var19 = var96.method5137(); // L: 4308 + if (var19 != null) { // L: 4309 + var23 = var19.subWidth; // L: 4310 + var43 = var19.subHeight; // L: 4311 + if (var43 > var42) { // L: 4312 + var42 = var43; + } + + var27 = var19.xOffset; // L: 4313 + } + + var20 = var96.method5138(); // L: 4315 + if (var20 != null) { // L: 4316 + var24 = var20.subWidth; // L: 4317 + var43 = var20.subHeight; // L: 4318 + if (var43 > var42) { // L: 4319 + var42 = var43; + } + + var28 = var20.xOffset; // L: 4320 + } + + var21 = var96.method5157(); // L: 4322 + if (var21 != null) { // L: 4323 + var25 = var21.subWidth; // L: 4324 + var43 = var21.subHeight; // L: 4325 + if (var43 > var42) { // L: 4326 + var42 = var43; + } + + var29 = var21.xOffset; // L: 4327 + } + + if (var16 != null) { // L: 4329 + var30 = var16.method5166(); // L: 4330 + if (var30 != null) { // L: 4331 + var34 = var30.subWidth; // L: 4332 + var43 = var30.subHeight; // L: 4333 + if (var43 > var42) { // L: 4334 + var42 = var43; + } + + var38 = var30.xOffset; // L: 4335 + } + + var31 = var16.method5137(); // L: 4337 + if (var31 != null) { // L: 4338 + var35 = var31.subWidth; // L: 4339 + var43 = var31.subHeight; // L: 4340 + if (var43 > var42) { // L: 4341 + var42 = var43; + } + + var39 = var31.xOffset; // L: 4342 + } + + var32 = var16.method5138(); // L: 4344 + if (var32 != null) { // L: 4345 + var36 = var32.subWidth; // L: 4346 + var43 = var32.subHeight; // L: 4347 + if (var43 > var42) { // L: 4348 + var42 = var43; + } + + var40 = var32.xOffset; // L: 4349 + } + + var33 = var16.method5157(); // L: 4351 + if (var33 != null) { // L: 4352 + var37 = var33.subWidth; // L: 4353 + var43 = var33.subHeight; // L: 4354 + if (var43 > var42) { // L: 4355 + var42 = var43; + } + + var41 = var33.xOffset; // L: 4356 + } + } + + Font var80 = var96.getFont(); // L: 4361 + if (var80 == null) { // L: 4362 + var80 = class0.fontPlain11; + } + + Font var44; + if (var16 != null) { // L: 4363 + var44 = var16.getFont(); // L: 4364 + if (var44 == null) { // L: 4365 + var44 = class0.fontPlain11; + } + } else { + var44 = class0.fontPlain11; // L: 4367 + } + + String var45 = null; // L: 4368 + String var46 = null; // L: 4369 + boolean var47 = false; // L: 4370 + int var48 = 0; // L: 4371 + var45 = var96.getString(var0.hitSplatValues[var78]); // L: 4372 + int var93 = var80.stringWidth(var45); // L: 4373 + if (var16 != null) { // L: 4374 + var46 = var16.getString(var0.hitSplatValues2[var78]); // L: 4375 + var48 = var44.stringWidth(var46); // L: 4376 + } + + int var49 = 0; // L: 4378 + int var50 = 0; // L: 4379 + if (var23 > 0) { // L: 4380 + if (var20 == null && var21 == null) { // L: 4381 + var49 = 1; // L: 4382 + } else { + var49 = var93 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { // L: 4384 4385 + if (var32 == null && var33 == null) { // L: 4386 + var50 = 1; // L: 4387 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 4390 + int var52 = var51; // L: 4391 + if (var22 > 0) { // L: 4392 + var51 += var22; + } + + var51 += 2; // L: 4393 + int var53 = var51; // L: 4394 + if (var24 > 0) { // L: 4395 + var51 += var24; + } + + int var54 = var51; // L: 4396 + int var55 = var51; // L: 4397 + int var56; + if (var23 > 0) { // L: 4398 + var56 = var23 * var49; // L: 4399 + var51 += var56; // L: 4400 + var55 += (var56 - var93) / 2; // L: 4401 + } else { + var51 += var93; // L: 4404 + } + + var56 = var51; // L: 4406 + if (var25 > 0) { // L: 4407 + var51 += var25; + } + + int var57 = 0; // L: 4408 + int var58 = 0; // L: 4409 + int var59 = 0; // L: 4410 + int var60 = 0; // L: 4411 + int var61 = 0; // L: 4412 + int var62; + if (var16 != null) { // L: 4413 + var51 += 2; // L: 4414 + var57 = var51; // L: 4415 + if (var34 > 0) { // L: 4416 + var51 += var34; + } + + var51 += 2; // L: 4417 + var58 = var51; // L: 4418 + if (var36 > 0) { // L: 4419 + var51 += var36; + } + + var59 = var51; // L: 4420 + var61 = var51; // L: 4421 + if (var35 > 0) { // L: 4422 + var62 = var50 * var35; // L: 4423 + var51 += var62; // L: 4424 + var61 += (var62 - var48) / 2; // L: 4425 + } else { + var51 += var48; // L: 4428 + } + + var60 = var51; // L: 4430 + if (var37 > 0) { // L: 4431 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var78] - Client.cycle; // L: 4433 + int var63 = var96.field3572 - var62 * var96.field3572 / var96.field3581; // L: 4434 + int var64 = var62 * var96.field3584 / var96.field3581 + -var96.field3584; // L: 4435 + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4436 + int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 4437 + int var67 = var66; // L: 4438 + int var68 = var42 + var66; // L: 4439 + int var69 = var66 + var96.field3582 + 15; // L: 4440 + int var70 = var69 - var80.maxAscent; // L: 4441 + int var71 = var69 + var80.maxDescent; // L: 4442 + if (var70 < var66) { // L: 4443 + var67 = var70; + } + + if (var71 > var68) { // L: 4444 + var68 = var71; + } + + int var72 = 0; // L: 4445 + int var73; + int var74; + if (var16 != null) { // L: 4446 + var72 = var66 + var16.field3582 + 15; // L: 4447 + var73 = var72 - var44.maxAscent; // L: 4448 + var74 = var72 + var44.maxDescent; // L: 4449 + if (var73 < var67) { // L: 4450 + ; + } + + if (var74 > var68) { // L: 4451 + ; + } + } + + var73 = 255; // L: 4453 + if (var96.field3579 >= 0) { // L: 4454 + var73 = (var62 << 8) / (var96.field3581 - var96.field3579); + } + + if (var73 >= 0 && var73 < 255) { // L: 4455 + if (var18 != null) { // L: 4456 + var18.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var20 != null) { // L: 4457 + var20.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var19 != null) { // L: 4458 + for (var74 = 0; var74 < var49; ++var74) { // L: 4459 + var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 4460 + } + } + + if (var21 != null) { // L: 4463 + var21.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var80.drawAlpha(var45, var55 + var65, var69, var96.textColor, 0, var73); // L: 4464 + if (var16 != null) { // L: 4465 + if (var30 != null) { // L: 4466 + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { // L: 4467 + var32.drawTransAt(var58 + var65 - var40, var66, var73); + } + + if (var31 != null) { // L: 4468 + for (var74 = 0; var74 < var50; ++var74) { // L: 4469 + var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); // L: 4470 + } + } + + if (var33 != null) { // L: 4473 + var33.drawTransAt(var65 + var60 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var16.textColor, 0, var73); // L: 4474 + } + } else { + if (var18 != null) { // L: 4478 + var18.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var20 != null) { // L: 4479 + var20.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var19 != null) { // L: 4480 + for (var74 = 0; var74 < var49; ++var74) { // L: 4481 + var19.drawTransBgAt(var23 * var74 + (var65 + var54 - var27), var66); // L: 4482 + } + } + + if (var21 != null) { // L: 4485 + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var80.draw(var45, var65 + var55, var69, var96.textColor | -16777216, 0); // L: 4486 + if (var16 != null) { // L: 4487 + if (var30 != null) { // L: 4488 + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { // L: 4489 + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { // L: 4490 + for (var74 = 0; var74 < var50; ++var74) { // L: 4491 + var31.drawTransBgAt(var35 * var74 + (var65 + var59 - var39), var66); // L: 4492 + } + } + + if (var33 != null) { // L: 4495 + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 4496 + } + } + } + } + } + } - for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45 - var2[var3++] = var0[var1++]; // L: 38 - var2[var3++] = var0[var1++]; // L: 39 - var2[var3++] = var0[var1++]; // L: 40 - var2[var3++] = var0[var1++]; // L: 41 - var2[var3++] = var0[var1++]; // L: 42 - var2[var3++] = var0[var1++]; // L: 43 - var2[var3++] = var0[var1++]; // L: 44 } - - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 - } - - } // L: 49 - - @ObfuscatedName("l") - @Export("clearIntArray") - public static void clearIntArray(int[] var0, int var1, int var2) { - for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 - var0[var1++] = 0; // L: 366 - var0[var1++] = 0; // L: 367 - var0[var1++] = 0; // L: 368 - var0[var1++] = 0; // L: 369 - var0[var1++] = 0; // L: 370 - var0[var1++] = 0; // L: 371 - var0[var1++] = 0; // L: 372 - } - - for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 - } - - } // L: 377 + } // L: 4501 } diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java new file mode 100644 index 0000000000..a9c5c0c427 --- /dev/null +++ b/runescape-client/src/main/java/class312.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("le") +public class class312 { + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-92832695" + ) + static final int method5606(int var0, int var1) { + int var2 = var1 * 57 + var0; // L: 984 + var2 ^= var2 << 13; // L: 985 + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; // L: 986 + return var3 >> 19 & 255; // L: 987 + } +} diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java new file mode 100644 index 0000000000..84b825b9bb --- /dev/null +++ b/runescape-client/src/main/java/class32.java @@ -0,0 +1,802 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("aj") +public final class class32 { + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("eg") + @ObfuscatedSignature( + descriptor = "Llc;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "Lde;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "Loh;" + ) + @Export("redHintArrowSprite") + static SpritePixels redHintArrowSprite; + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "-634814317" + ) + static int method394(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 471 + class16.Interpreter_intStackSize -= 3; // L: 472 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 473 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 474 + int var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 475 + if (var4 == 0) { // L: 476 + throw new RuntimeException(); // L: 477 + } else { + Widget var6 = class139.getWidget(var9); // L: 479 + if (var6.children == null) { // L: 480 + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { // L: 481 + Widget[] var7 = new Widget[var11 + 1]; // L: 482 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 483 + var7[var8] = var6.children[var8]; + } + + var6.children = var7; // L: 484 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 486 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 487 + var12.type = var4; // L: 488 + var12.parentId = var12.id = var6.id; // L: 489 + var12.childIndex = var11; // L: 490 + var12.isIf3 = true; // L: 491 + var6.children[var11] = var12; // L: 492 + if (var2) { // L: 493 + FriendSystem.scriptDotWidget = var12; + } else { + class4.scriptActiveWidget = var12; // L: 494 + } + + class29.invalidateWidget(var6); // L: 495 + return 1; // L: 496 + } + } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 498 + var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 499 + Widget var10 = class139.getWidget(var3.id); // L: 500 + var10.children[var3.childIndex] = null; // L: 501 + class29.invalidateWidget(var10); // L: 502 + return 1; // L: 503 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 505 + var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 506 + var3.children = null; // L: 507 + class29.invalidateWidget(var3); // L: 508 + return 1; // L: 509 + } else if (var0 == 103) { // L: 511 + class16.Interpreter_intStackSize -= 3; // L: 512 + return 1; // L: 513 + } else if (var0 == 104) { // L: 515 + --class16.Interpreter_intStackSize; // L: 516 + return 1; // L: 517 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 519 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 532 + var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 533 + if (var3 != null) { // L: 534 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 535 + if (var2) { // L: 536 + FriendSystem.scriptDotWidget = var3; + } else { + class4.scriptActiveWidget = var3; // L: 537 + } + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 539 + } + + return 1; // L: 540 + } else if (var0 == 202) { // L: 542 + Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] = 0; // L: 543 + return 1; // L: 544 + } else if (var0 == 203) { // L: 546 + Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize + 1] = 0; // L: 547 + return 1; // L: 548 + } else { + return 2; // L: 550 + } + } else { + class16.Interpreter_intStackSize -= 2; // L: 520 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 521 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 522 + Widget var5 = class231.getWidgetChild(var9, var4); // L: 523 + if (var5 != null && var4 != -1) { // L: 524 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 525 + if (var2) { // L: 526 + FriendSystem.scriptDotWidget = var5; + } else { + class4.scriptActiveWidget = var5; // L: 527 + } + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 529 + } + + return 1; // L: 530 + } + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1817166338" + ) + static void method393(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 + } + } // L: 73 75 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lkq;Lkq;Lkq;I)V", + garbageValue = "-652668563" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (InterfaceParent.canvasWidth - 765) / 2; // L: 733 + Login.loginBoxX = Login.xPadding + 202; // L: 734 + GraphicsObject.loginBoxCenter = Login.loginBoxX + 180; // L: 735 + byte var3; + int var4; + int var9; + int var11; + int var26; + int var27; + int var32; + int var39; + if (Login.worldSelectOpen) { // L: 736 + if (Tile.worldSelectBackSprites == null) { // L: 738 + Tile.worldSelectBackSprites = class124.method2492(SoundSystem.archive8, "sl_back", ""); + } + + if (ByteArrayPool.worldSelectFlagSprites == null) { // L: 739 + ByteArrayPool.worldSelectFlagSprites = Players.method2284(SoundSystem.archive8, "sl_flags", ""); + } + + if (class6.worldSelectArrows == null) { // L: 740 + class6.worldSelectArrows = Players.method2284(SoundSystem.archive8, "sl_arrows", ""); + } + + if (class13.worldSelectStars == null) { // L: 741 + class13.worldSelectStars = Players.method2284(SoundSystem.archive8, "sl_stars", ""); + } + + if (World.worldSelectLeftSprite == null) { // L: 742 + World.worldSelectLeftSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(SoundSystem.archive8, "leftarrow", ""); + } + + if (Interpreter.worldSelectRightSprite == null) { // L: 743 + Interpreter.worldSelectRightSprite = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(SoundSystem.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 744 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 745 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 746 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 747 + if (class13.worldSelectStars != null) { // L: 748 + class13.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 749 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 750 + class13.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 751 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 752 + } + + int var40; + if (class6.worldSelectArrows != null) { // L: 754 + var32 = Login.xPadding + 280; // L: 755 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 756 + class6.worldSelectArrows[2].drawAt(var32, 4); + } else { + class6.worldSelectArrows[0].drawAt(var32, 4); // L: 757 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 758 + class6.worldSelectArrows[3].drawAt(var32 + 15, 4); + } else { + class6.worldSelectArrows[1].drawAt(var32 + 15, 4); // L: 759 + } + + var0.draw("World", var32 + 32, 17, 16777215, -1); // L: 760 + var4 = Login.xPadding + 390; // L: 761 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 762 + class6.worldSelectArrows[2].drawAt(var4, 4); + } else { + class6.worldSelectArrows[0].drawAt(var4, 4); // L: 763 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 764 + class6.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + class6.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 765 + } + + var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 766 + var40 = Login.xPadding + 500; // L: 767 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 768 + class6.worldSelectArrows[2].drawAt(var40, 4); + } else { + class6.worldSelectArrows[0].drawAt(var40, 4); // L: 769 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 770 + class6.worldSelectArrows[3].drawAt(var40 + 15, 4); + } else { + class6.worldSelectArrows[1].drawAt(var40 + 15, 4); // L: 771 + } + + var0.draw("Location", var40 + 32, 17, 16777215, -1); // L: 772 + var27 = Login.xPadding + 610; // L: 773 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 774 + class6.worldSelectArrows[2].drawAt(var27, 4); + } else { + class6.worldSelectArrows[0].drawAt(var27, 4); // L: 775 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 776 + class6.worldSelectArrows[3].drawAt(var27 + 15, 4); + } else { + class6.worldSelectArrows[1].drawAt(var27 + 15, 4); // L: 777 + } + + var0.draw("Type", var27 + 32, 17, 16777215, -1); // L: 778 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 780 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 781 + Login.hoveredWorldIndex = -1; // L: 782 + if (Tile.worldSelectBackSprites != null) { // L: 783 + var3 = 88; // L: 784 + byte var34 = 19; // L: 785 + var40 = 765 / (var3 + 1) - 1; // L: 786 + var27 = 480 / (var34 + 1); // L: 787 + + do { + var39 = var27; // L: 789 + var26 = var40; // L: 790 + if (var27 * (var40 - 1) >= World.World_count) { // L: 791 + --var40; + } + + if (var40 * (var27 - 1) >= World.World_count) { // L: 792 + --var27; + } + + if (var40 * (var27 - 1) >= World.World_count) { // L: 793 + --var27; + } + } while(var39 != var27 || var40 != var26); // L: 794 + + var39 = (765 - var3 * var40) / (var40 + 1); // L: 796 + if (var39 > 5) { // L: 797 + var39 = 5; + } + + var26 = (480 - var27 * var34) / (var27 + 1); // L: 798 + if (var26 > 5) { // L: 799 + var26 = 5; + } + + var9 = (765 - var3 * var40 - var39 * (var40 - 1)) / 2; // L: 800 + int var29 = (480 - var34 * var27 - var26 * (var27 - 1)) / 2; // L: 801 + var11 = (var27 + World.World_count - 1) / var27; // L: 802 + Login.worldSelectPagesCount = var11 - var40; // L: 803 + if (World.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 804 + World.worldSelectLeftSprite.drawAt(8, GameEngine.canvasHeight / 2 - World.worldSelectLeftSprite.subHeight / 2); // L: 805 + } + + if (Interpreter.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 807 + Interpreter.worldSelectRightSprite.drawAt(InterfaceParent.canvasWidth - Interpreter.worldSelectRightSprite.subWidth - 8, GameEngine.canvasHeight / 2 - Interpreter.worldSelectRightSprite.subHeight / 2); // L: 808 + } + + int var36 = var29 + 23; // L: 810 + int var13 = var9 + Login.xPadding; // L: 811 + int var14 = 0; // L: 812 + boolean var15 = false; // L: 813 + int var16 = Login.worldSelectPage; // L: 814 + + int var17; + for (var17 = var16 * var27; var17 < World.World_count && var16 - Login.worldSelectPage < var40; ++var17) { // L: 815 816 + World var18 = class9.World_worlds[var17]; // L: 819 + boolean var19 = true; // L: 820 + String var20 = Integer.toString(var18.population); // L: 821 + if (var18.population == -1) { // L: 822 + var20 = "OFF"; // L: 823 + var19 = false; // L: 824 + } else if (var18.population > 1980) { // L: 826 + var20 = "FULL"; // L: 827 + var19 = false; // L: 828 + } + + int var22 = 0; // L: 831 + byte var21; + if (var18.isBeta()) { // L: 832 + if (var18.isMembersOnly()) { // L: 833 + var21 = 7; + } else { + var21 = 6; // L: 834 + } + } else if (var18.isDeadman()) { // L: 836 + var22 = 16711680; // L: 837 + if (var18.isMembersOnly()) { // L: 838 + var21 = 5; + } else { + var21 = 4; // L: 839 + } + } else if (var18.method1677()) { // L: 841 + if (var18.isMembersOnly()) { // L: 842 + var21 = 9; + } else { + var21 = 8; // L: 843 + } + } else if (var18.isPvp()) { // L: 845 + if (var18.isMembersOnly()) { // L: 846 + var21 = 3; + } else { + var21 = 2; // L: 847 + } + } else if (var18.isMembersOnly()) { // L: 850 + var21 = 1; + } else { + var21 = 0; // L: 851 + } + + if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var36 && MouseHandler.MouseHandler_x < var13 + var3 && MouseHandler.MouseHandler_y < var34 + var36 && var19) { // L: 853 + Login.hoveredWorldIndex = var17; // L: 854 + Tile.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var36, 128, 16777215); // L: 855 + var15 = true; // L: 856 + } else { + Tile.worldSelectBackSprites[var21].drawAt(var13, var36); // L: 858 + } + + if (ByteArrayPool.worldSelectFlagSprites != null) { // L: 859 + ByteArrayPool.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var13 + 29, var36); + } + + var0.drawCentered(Integer.toString(var18.id), var13 + 15, var34 / 2 + var36 + 5, var22, -1); // L: 860 + var1.drawCentered(var20, var13 + 60, var34 / 2 + var36 + 5, 268435455, -1); // L: 861 + var36 = var36 + var34 + var26; // L: 862 + ++var14; // L: 863 + if (var14 >= var27) { + var36 = var29 + 23; // L: 864 + var13 = var13 + var39 + var3; // L: 865 + var14 = 0; // L: 866 + ++var16; // L: 867 + } + } + + if (var15) { // L: 870 + var17 = var1.stringWidth(class9.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 871 + int var30 = var1.ascent + 8; // L: 872 + int var37 = MouseHandler.MouseHandler_y + 25; // L: 873 + if (var30 + var37 > 480) { // L: 874 + var37 = MouseHandler.MouseHandler_y - 25 - var30; // L: 875 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var30, 16777120); // L: 877 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var37, var17, var30, 0); // L: 878 + var1.drawCentered(class9.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var37 + var1.ascent + 4, 0, -1); // L: 879 + } + } + + GameEngine.rasterProvider.drawFull(0, 0); // L: 882 + } else { + Client.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 886 + ArchiveDiskActionHandler.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 887 + class125.logoSprite.drawAt(Login.xPadding + 382 - class125.logoSprite.subWidth / 2, 18); // L: 888 + if (Client.gameState == 0 || Client.gameState == 5) { // L: 889 + var3 = 20; // L: 890 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 891 + var4 = 253 - var3; // L: 892 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 893 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 894 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 895 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 896 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 897 + } + + String var5; + String var7; + String var8; + char[] var10; + short var31; + short var33; + if (Client.gameState == 20) { // L: 899 + TileItem.titleboxSprite.drawAt(Login.loginBoxX + 180 - TileItem.titleboxSprite.subWidth / 2, 271 - TileItem.titleboxSprite.subHeight / 2); // L: 900 + var31 = 201; // L: 901 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 902 + var32 = var31 + 15; // L: 903 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 904 + var32 += 15; // L: 905 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 906 + var32 += 15; // L: 907 + var32 += 7; // L: 908 + if (Login.loginIndex != 4) { // L: 909 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0); // L: 910 + var33 = 200; // L: 911 + + for (var5 = Players.method2283(); var0.stringWidth(var5) > var33; var5 = var5.substring(0, var5.length() - 1)) { // L: 912 913 914 + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var32, 16777215, 0); // L: 916 + var32 += 15; // L: 917 + var7 = Login.Login_password; // L: 919 + var9 = var7.length(); // L: 922 + var10 = new char[var9]; // L: 924 + + for (var11 = 0; var11 < var9; ++var11) { // L: 925 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 926 + + for (var8 = var8; var0.stringWidth(var8) > var33; var8 = var8.substring(1)) { // L: 930 931 932 + } + + var0.draw("Password: " + var8, Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 934 + var32 += 15; // L: 935 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 938 + TileItem.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 939 + short var23; + if (Login.loginIndex == 0) { // L: 940 + var31 = 251; // L: 941 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0); // L: 942 + var32 = var31 + 30; // L: 943 + var4 = Login.loginBoxX + 180 - 80; // L: 944 + var23 = 291; // L: 945 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 946 + var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 947 + var4 = Login.loginBoxX + 180 + 80; // L: 948 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 949 + var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 950 + } else if (Login.loginIndex == 1) { // L: 952 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 953 + var31 = 236; // L: 954 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 955 + var32 = var31 + 15; // L: 956 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 957 + var32 += 15; // L: 958 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 959 + var32 += 15; // L: 960 + var4 = Login.loginBoxX + 180 - 80; // L: 961 + var23 = 321; // L: 962 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 963 + var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 964 + var4 = Login.loginBoxX + 180 + 80; // L: 965 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 966 + var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 967 + } else { + short var12; + IndexedSprite var35; + if (Login.loginIndex == 2) { // L: 969 + var31 = 201; // L: 970 + var0.drawCentered(Login.Login_response1, GraphicsObject.loginBoxCenter, var31, 16776960, 0); // L: 971 + var32 = var31 + 15; // L: 972 + var0.drawCentered(Login.Login_response2, GraphicsObject.loginBoxCenter, var32, 16776960, 0); // L: 973 + var32 += 15; // L: 974 + var0.drawCentered(Login.Login_response3, GraphicsObject.loginBoxCenter, var32, 16776960, 0); // L: 975 + var32 += 15; // L: 976 + var32 += 7; // L: 977 + var0.draw("Login: ", GraphicsObject.loginBoxCenter - 110, var32, 16777215, 0); // L: 978 + var33 = 200; // L: 979 + + for (var5 = Players.method2283(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 980 981 982 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), GraphicsObject.loginBoxCenter - 70, var32, 16777215, 0); // L: 984 + var32 += 15; // L: 985 + var7 = Login.Login_password; // L: 987 + var9 = var7.length(); // L: 990 + var10 = new char[var9]; // L: 992 + + for (var11 = 0; var11 < var9; ++var11) { // L: 993 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 994 + + for (var8 = var8; var0.stringWidth(var8) > var33; var8 = var8.substring(1)) { // L: 998 999 1000 + } + + var0.draw("Password: " + var8 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), GraphicsObject.loginBoxCenter - 108, var32, 16777215, 0); // L: 1002 + var32 += 15; // L: 1003 + var31 = 277; // L: 1004 + var9 = GraphicsObject.loginBoxCenter + -117; // L: 1005 + var35 = class12.method213(Client.Login_isUsernameRemembered, Login.field1003); // L: 1006 + var35.drawAt(var9, var31); // L: 1007 + var9 = var9 + var35.subWidth + 5; // L: 1008 + var1.draw("Remember username", var9, var31 + 13, 16776960, 0); // L: 1009 + var9 = GraphicsObject.loginBoxCenter + 24; // L: 1010 + var35 = class12.method213(Login.clientPreferences.hideUsername, Login.field1012); // L: 1011 + var35.drawAt(var9, var31); // L: 1012 + var9 = var9 + var35.subWidth + 5; // L: 1013 + var1.draw("Hide username", var9, var31 + 13, 16776960, 0); // L: 1014 + var32 = var31 + 15; // L: 1015 + var11 = GraphicsObject.loginBoxCenter - 80; // L: 1016 + var12 = 321; // L: 1017 + Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1018 + var0.drawCentered("Login", var11, var12 + 5, 16777215, 0); // L: 1019 + var11 = GraphicsObject.loginBoxCenter + 80; // L: 1020 + Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1021 + var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1022 + var31 = 357; // L: 1023 + switch(Login.field994) { // L: 1024 + case 2: + class34.field229 = "Having trouble logging in?"; // L: 1026 + break; + default: + class34.field229 = "Can't login? Click here."; // L: 1029 + } + + ChatChannel.field1084 = new Bounds(GraphicsObject.loginBoxCenter, var31, var1.stringWidth(class34.field229), 11); // L: 1032 + ModeWhere.field3378 = new Bounds(GraphicsObject.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1033 + var1.drawCentered(class34.field229, GraphicsObject.loginBoxCenter, var31, 16777215, 0); // L: 1034 + } else if (Login.loginIndex == 3) { // L: 1036 + var31 = 201; // L: 1037 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1038 + var32 = var31 + 20; // L: 1039 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1040 + var32 += 15; // L: 1041 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1042 + var32 += 15; // L: 1043 + var4 = Login.loginBoxX + 180; // L: 1044 + var23 = 276; // L: 1045 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1046 + var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1047 + var4 = Login.loginBoxX + 180; // L: 1048 + var23 = 326; // L: 1049 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1050 + var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1051 + } else if (Login.loginIndex == 4) { // L: 1053 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1054 + var31 = 236; // L: 1055 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1056 + var32 = var31 + 15; // L: 1057 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1058 + var32 += 15; // L: 1059 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1060 + var32 += 15; // L: 1061 + var5 = "PIN: "; // L: 1063 + var7 = Bounds.otp; // L: 1065 + var9 = var7.length(); // L: 1068 + var10 = new char[var9]; // L: 1070 + + for (var11 = 0; var11 < var9; ++var11) { // L: 1071 + var10[var11] = '*'; + } + + var8 = new String(var10); // L: 1072 + var0.draw(var5 + var8 + (Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1076 + var32 -= 8; // L: 1077 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1078 + var32 += 15; // L: 1079 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1080 + var26 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1081 + var9 = var32 - var0.ascent; // L: 1082 + if (Login.field1005) { // L: 1084 + var35 = Skeleton.options_buttons_2Sprite; // L: 1085 + } else { + var35 = TileItem.options_buttons_0Sprite; // L: 1088 + } + + var35.drawAt(var26, var9); // L: 1090 + var32 += 15; // L: 1091 + var11 = Login.loginBoxX + 180 - 80; // L: 1092 + var12 = 321; // L: 1093 + Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1094 + var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); // L: 1095 + var11 = Login.loginBoxX + 180 + 80; // L: 1096 + Interpreter.titlebuttonSprite.drawAt(var11 - 73, var12 - 20); // L: 1097 + var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); // L: 1098 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var12 + 36, 255, 0); // L: 1099 + } else if (Login.loginIndex == 5) { // L: 1101 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1102 + var31 = 221; // L: 1103 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1104 + var32 = var31 + 15; // L: 1105 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1106 + var32 += 15; // L: 1107 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1108 + var32 += 15; // L: 1109 + var32 += 14; // L: 1110 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0); // L: 1111 + var33 = 174; // L: 1112 + + for (var5 = Players.method2283(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1113 1114 1115 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? DefaultsGroup.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0); // L: 1117 + var32 += 15; // L: 1118 + var27 = Login.loginBoxX + 180 - 80; // L: 1119 + short var25 = 321; // L: 1120 + Interpreter.titlebuttonSprite.drawAt(var27 - 73, var25 - 20); // L: 1121 + var0.drawCentered("Recover", var27, var25 + 5, 16777215, 0); // L: 1122 + var27 = Login.loginBoxX + 180 + 80; // L: 1123 + Interpreter.titlebuttonSprite.drawAt(var27 - 73, var25 - 20); // L: 1124 + var0.drawCentered("Back", var27, var25 + 5, 16777215, 0); // L: 1125 + var25 = 356; // L: 1126 + var1.drawCentered("Still having trouble logging in?", GraphicsObject.loginBoxCenter, var25, 268435455, 0); // L: 1127 + } else if (Login.loginIndex == 6) { // L: 1129 + var31 = 201; // L: 1130 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1131 + var32 = var31 + 15; // L: 1132 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1133 + var32 += 15; // L: 1134 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1135 + var32 += 15; // L: 1136 + var4 = Login.loginBoxX + 180; // L: 1137 + var23 = 321; // L: 1138 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1139 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1140 + } else if (Login.loginIndex == 7) { // L: 1142 + var31 = 216; // L: 1143 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1144 + var32 = var31 + 15; // L: 1145 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1146 + var32 += 15; // L: 1147 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1148 + var32 += 15; // L: 1149 + var4 = Login.loginBoxX + 180 - 80; // L: 1150 + var23 = 321; // L: 1151 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1152 + var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1153 + var4 = Login.loginBoxX + 180 + 80; // L: 1154 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1155 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1156 + } else if (Login.loginIndex == 8) { // L: 1158 + var31 = 216; // L: 1159 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1160 + var32 = var31 + 15; // L: 1161 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1162 + var32 += 15; // L: 1163 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1164 + var32 += 15; // L: 1165 + var4 = Login.loginBoxX + 180 - 80; // L: 1166 + var23 = 321; // L: 1167 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1168 + var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1169 + var4 = Login.loginBoxX + 180 + 80; // L: 1170 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1171 + var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1172 + } else if (Login.loginIndex == 12) { // L: 1174 + var31 = 201; // L: 1175 + String var24 = ""; // L: 1176 + var5 = ""; // L: 1177 + String var6 = ""; // L: 1178 + switch(Login.field993) { // L: 1179 + case 0: + var24 = "Your account has been disabled."; // L: 1187 + var5 = Strings.field2966; // L: 1188 + var6 = ""; // L: 1189 + break; // L: 1190 + case 1: + var24 = "Account locked as we suspect it has been stolen."; // L: 1194 + var5 = Strings.field3005; // L: 1195 + var6 = ""; // L: 1196 + break; + default: + class25.Login_promptCredentials(false); // L: 1182 + } + + var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1200 + var32 = var31 + 15; // L: 1201 + var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1202 + var32 += 15; // L: 1203 + var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1204 + var32 += 15; // L: 1205 + var39 = Login.loginBoxX + 180; // L: 1206 + short var41 = 276; // L: 1207 + Interpreter.titlebuttonSprite.drawAt(var39 - 73, var41 - 20); // L: 1208 + var0.drawCentered("Support Page", var39, var41 + 5, 16777215, 0); // L: 1209 + var39 = Login.loginBoxX + 180; // L: 1210 + var41 = 326; // L: 1211 + Interpreter.titlebuttonSprite.drawAt(var39 - 73, var41 - 20); // L: 1212 + var0.drawCentered("Back", var39, var41 + 5, 16777215, 0); // L: 1213 + } else if (Login.loginIndex == 24) { // L: 1215 + var31 = 221; // L: 1216 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1217 + var32 = var31 + 15; // L: 1218 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1219 + var32 += 15; // L: 1220 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1221 + var32 += 15; // L: 1222 + var4 = Login.loginBoxX + 180; // L: 1223 + var23 = 301; // L: 1224 + Interpreter.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1225 + var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1226 + } + } + } + + if (Client.gameState >= 10) { // L: 1229 + int[] var28 = new int[4]; // L: 1230 + Rasterizer2D.Rasterizer2D_getClipArray(var28); // L: 1231 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, GameEngine.canvasHeight); // L: 1232 + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1233 + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1234 + Rasterizer2D.Rasterizer2D_setClipArray(var28); // L: 1235 + } + + class373.title_muteSprite[Login.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1237 + if (Client.gameState > 5 && class35.clientLanguage == Language.Language_EN) { // L: 1238 + if (class242.field2900 != null) { // L: 1239 + var32 = Login.xPadding + 5; // L: 1240 + var33 = 463; // L: 1241 + byte var38 = 100; // L: 1242 + byte var42 = 35; // L: 1243 + class242.field2900.drawAt(var32, var33); // L: 1244 + var0.drawCentered("World" + " " + Client.worldId, var38 / 2 + var32, var42 / 2 + var33 - 2, 16777215, 0); // L: 1245 + if (World.World_request != null) { // L: 1246 + var1.drawCentered("Loading...", var38 / 2 + var32, var42 / 2 + var33 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var38 / 2 + var32, var42 / 2 + var33 + 12, 16777215, 0); // L: 1247 + } + } else { + class242.field2900 = WorldMapSection1.SpriteBuffer_getIndexedSpriteByName(SoundSystem.archive8, "sl_button", ""); // L: 1250 + } + } + + } + } // L: 884 1253 + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(Lcs;IIB)V", + garbageValue = "-125" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 3572 + int var3 = class225.SequenceDefinition_get(var1).field3707; // L: 3573 + if (var3 == 1) { // L: 3574 + var0.sequenceFrame = 0; // L: 3575 + var0.sequenceFrameCycle = 0; // L: 3576 + var0.sequenceDelay = var2; // L: 3577 + var0.field1245 = 0; // L: 3578 + } + + if (var3 == 2) { // L: 3580 + var0.field1245 = 0; // L: 3581 + } + } else if (var1 == -1 || var0.sequence == -1 || class225.SequenceDefinition_get(var1).field3718 >= class225.SequenceDefinition_get(var0.sequence).field3718) { // L: 3584 + var0.sequence = var1; // L: 3585 + var0.sequenceFrame = 0; // L: 3586 + var0.sequenceFrameCycle = 0; // L: 3587 + var0.sequenceDelay = var2; // L: 3588 + var0.field1245 = 0; // L: 3589 + var0.field1224 = var0.pathLength; // L: 3590 + } + + } // L: 3592 +} diff --git a/runescape-client/src/main/java/class323.java b/runescape-client/src/main/java/class323.java deleted file mode 100644 index 22f0a46ea7..0000000000 --- a/runescape-client/src/main/java/class323.java +++ /dev/null @@ -1,64 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ln") -public enum class323 implements Enumerated { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - field3852(1, 0), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - field3851(0, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - field3849(2, 5), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - field3856(3, 6), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - field3853(4, 7), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lln;" - ) - field3854(5, 8); - - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 397636239 - ) - final int field3855; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 961427767 - ) - final int field3850; - - class323(int var3, int var4) { - this.field3855 = var3; // L: 18 - this.field3850 = var4; // L: 19 - } // L: 20 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field3850; // L: 23 - } -} diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java new file mode 100644 index 0000000000..7c9514aa24 --- /dev/null +++ b/runescape-client/src/main/java/class33.java @@ -0,0 +1,80 @@ +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("aw") +public class class33 implements class30 { + @ObfuscatedName("f") + final MessageDigest field227; + + @ObfuscatedSignature( + descriptor = "(Las;)V" + ) + class33(class36 var1) { + this.field227 = this.method400(); // L: 14 + } // L: 15 + + @ObfuscatedName("f") + boolean method396(int var1, String var2, long var3) { + byte[] var5 = this.method399(var2, var3); // L: 18 + return method395(var5) >= var1; // L: 19 + } + + @ObfuscatedName("p") + byte[] method399(String var1, long var2) { + StringBuilder var4 = new StringBuilder(); // L: 56 + var4.append(var1).append(Long.toHexString(var2)); // L: 57 + this.field227.reset(); // L: 58 + + try { + this.field227.update(var4.toString().getBytes("UTF-8")); // L: 60 + } catch (UnsupportedEncodingException var6) { // L: 62 + var6.printStackTrace(); // L: 63 + } + + return this.field227.digest(); // L: 65 + } + + @ObfuscatedName("b") + MessageDigest method400() { + try { + return MessageDigest.getInstance("SHA-256"); // L: 70 + } catch (NoSuchAlgorithmException var2) { // L: 72 + var2.printStackTrace(); // L: 73 + return null; // L: 74 + } + } + + @ObfuscatedName("o") + static int method395(byte[] var0) { + int var1 = 0; // L: 23 + byte[] var2 = var0; // L: 25 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 + byte var4 = var2[var3]; // L: 27 + int var5 = method401(var4); // L: 29 + var1 += var5; // L: 30 + if (var5 != 8) { // L: 31 + break; + } + } + + return var1; // L: 37 + } + + @ObfuscatedName("u") + static int method401(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) { // L: 46 47 49 + ++var1; // L: 48 + } + } + + return var1; // L: 52 + } +} diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index 6d3fc753c6..ebdc1f77ef 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,31 +1,101 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lz") +@ObfuscatedName("lq") public class class336 { - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1826963065 + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;Lmf;I)Ljava/lang/String;", + garbageValue = "744512659" ) - @Export("SpriteBuffer_spriteCount") - static int SpriteBuffer_spriteCount; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 341867827 - ) - @Export("SpriteBuffer_spriteWidth") - static int SpriteBuffer_spriteWidth; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1978795799 - ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("y") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("h") - @Export("SpriteBuffer_spriteWidths") - public static int[] SpriteBuffer_spriteWidths; + public static String method5978(CharSequence var0, LoginType var1) { + if (var0 == null) { // L: 20 + return null; + } else { + int var2 = 0; // L: 21 + + int var3; + for (var3 = var0.length(); var2 < var3 && ServerPacket.method3902(var0.charAt(var2)); ++var2) { // L: 22 23 + } + + while (var3 > var2 && ServerPacket.method3902(var0.charAt(var3 - 1))) { // L: 24 + --var3; + } + + int var4 = var3 - var2; // L: 25 + if (var4 >= 1) { // L: 27 + byte var6; + if (var1 == null) { // L: 31 + var6 = 12; // L: 32 + } else { + switch(var1.field4092) { // L: 35 + case 1: + var6 = 20; // L: 37 + break; // L: 38 + default: + var6 = 12; // L: 40 + } + } + + if (var4 <= var6) { // L: 44 + StringBuilder var12 = new StringBuilder(var4); // L: 48 + + for (int var14 = var2; var14 < var3; ++var14) { // L: 49 + char var7 = var0.charAt(var14); // L: 50 + boolean var8; + if (Character.isISOControl(var7)) { // L: 53 + var8 = false; // L: 54 + } else if (class238.isAlphaNumeric(var7)) { // L: 57 + var8 = true; // L: 58 + } else { + char[] var9 = class364.field4098; // L: 62 + int var10 = 0; + + label84: + while (true) { + char var11; + if (var10 >= var9.length) { + var9 = class364.field4096; // L: 72 + + for (var10 = 0; var10 < var9.length; ++var10) { // L: 73 + var11 = var9[var10]; // L: 74 + if (var7 == var11) { // L: 75 + var8 = true; // L: 76 + break label84; // L: 77 + } + } + + var8 = false; // L: 81 + break; + } + + var11 = var9[var10]; // L: 64 + if (var11 == var7) { // L: 65 + var8 = true; // L: 66 + break; // L: 67 + } + + ++var10; // L: 63 + } + } + + if (var8) { // L: 83 + char var13 = class309.method5602(var7); // L: 84 + if (var13 != 0) { // L: 85 + var12.append(var13); // L: 86 + } + } + } + + if (var12.length() == 0) { // L: 88 + return null; + } + + return var12.toString(); // L: 89 + } + } + + return null; // L: 46 + } + } } diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java new file mode 100644 index 0000000000..43610504dd --- /dev/null +++ b/runescape-client/src/main/java/class337.java @@ -0,0 +1,138 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lr") +public enum class337 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + field3920(3, 1), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + field3922(2, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + field3921(1, 3), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Llr;" + ) + field3925(0, 10); + + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1527224895 + ) + final int field3923; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 436920949 + ) + final int field3924; + + class337(int var3, int var4) { + this.field3923 = var3; // L: 16 + this.field3924 = var4; // L: 17 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field3924; // L: 21 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-405584171" + ) + static String method5986(int var0) { + return ""; // L: 18 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lir;III)[Loh;", + garbageValue = "738130292" + ) + public static SpritePixels[] method5985(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { // L: 58 + var3 = false; // L: 59 + } else { + class244.SpriteBuffer_decode(var4); + var3 = true; + } + + if (!var3) { + return null; + } else { + SpritePixels[] var5 = new SpritePixels[class124.SpriteBuffer_spriteCount]; // L: 68 + + for (int var6 = 0; var6 < class124.SpriteBuffer_spriteCount; ++var6) { // L: 69 + SpritePixels var7 = var5[var6] = new SpritePixels(); // L: 70 + var7.width = class395.SpriteBuffer_spriteWidth; // L: 71 + var7.height = class395.SpriteBuffer_spriteHeight; // L: 72 + var7.xOffset = class0.SpriteBuffer_xOffsets[var6]; // L: 73 + var7.yOffset = Interpreter.SpriteBuffer_yOffsets[var6]; // L: 74 + var7.subWidth = class395.SpriteBuffer_spriteWidths[var6]; // L: 75 + var7.subHeight = class157.SpriteBuffer_spriteHeights[var6]; // L: 76 + int var8 = var7.subWidth * var7.subHeight; // L: 77 + byte[] var9 = class223.SpriteBuffer_pixels[var6]; // L: 78 + var7.pixels = new int[var8]; // L: 79 + + for (int var10 = 0; var10 < var8; ++var10) { // L: 80 + var7.pixels[var10] = Varps.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + } + + WorldMapDecorationType.method4370(); // L: 82 + return var5; // L: 85 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1948443713" + ) + public static void method5984(int var0, int var1) { + VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 48 + VarbitComposition var2; + if (var3 != null) { // L: 49 + var2 = var3; // L: 50 + } else { + byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 53 + var3 = new VarbitComposition(); // L: 54 + if (var4 != null) { // L: 55 + var3.decode(new Buffer(var4)); + } + + VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 56 + var2 = var3; // L: 57 + } + + int var8 = var2.baseVar; // L: 60 + int var5 = var2.startBit; // L: 61 + int var6 = var2.endBit; // L: 62 + int var7 = Varps.Varps_masks[var6 - var5]; // L: 63 + if (var1 < 0 || var1 > var7) { // L: 64 + var1 = 0; + } + + var7 <<= var5; // L: 65 + Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 66 + } // L: 67 +} diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java new file mode 100644 index 0000000000..7a702f2d54 --- /dev/null +++ b/runescape-client/src/main/java/class338.java @@ -0,0 +1,34 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mk") +public class class338 implements class343 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lmt;" + ) + public final class361 field3926; + + @ObfuscatedSignature( + descriptor = "(Lmu;)V" + ) + class338(class362 var1) { + this.field3926 = var1; // L: 14 + } // L: 15 + + @ObfuscatedSignature( + descriptor = "(Lms;)V" + ) + public class338(class339 var1) { + this(new class362(var1)); // L: 10 + } // L: 11 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-527387396" + ) + public int method5988(int var1) { + return this.field3926.vmethod6335(var1); // L: 18 + } +} diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java new file mode 100644 index 0000000000..54a9b8011a --- /dev/null +++ b/runescape-client/src/main/java/class339.java @@ -0,0 +1,64 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ms") +public abstract class class339 extends class192 implements class388 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lmd;", + garbageValue = "-883591339" + ) + protected abstract class341 vmethod6425(int var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "324704805" + ) + public int method5994() { + return super.field2198; // L: 17 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "14" + ) + public Object vmethod6841(int var1) { + class341 var2 = this.vmethod6425(var1); // L: 21 + return var2 != null && var2.method6007() ? var2.method6010() : null; // L: 22 23 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Lnl;", + garbageValue = "-821097421" + ) + public class389 method5996(Buffer var1) { + int var2 = var1.readUnsignedShort(); // L: 27 + class341 var3 = this.vmethod6425(var2); // L: 28 + class389 var4 = new class389(var2); // L: 29 + Class var5 = var3.field3928.field4131; // L: 30 + if (var5 == Integer.class) { // L: 31 + var4.field4216 = var1.readInt(); + } else if (var5 == Long.class) { + var4.field4216 = var1.readLong(); // L: 32 + } else if (var5 == String.class) { // L: 33 + var4.field4216 = var1.readStringCp1252NullCircumfixed(); + } else { + if (!class384.class.isAssignableFrom(var5)) { // L: 34 + throw new IllegalStateException(); // L: 43 + } + + try { + class384 var6 = (class384)var5.newInstance(); // L: 36 + var6.method6821(var1); // L: 37 + var4.field4216 = var6; // L: 38 + } catch (InstantiationException var7) { // L: 40 + } catch (IllegalAccessException var8) { // L: 41 + } + } + + return var4; // L: 44 + } +} diff --git a/runescape-client/src/main/java/class34.java b/runescape-client/src/main/java/class34.java new file mode 100644 index 0000000000..a0c4db18c9 --- /dev/null +++ b/runescape-client/src/main/java/class34.java @@ -0,0 +1,516 @@ +import java.util.concurrent.ScheduledExecutorService; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ap") +public enum class34 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lap;" + ) + field236(0, 0); + + @ObfuscatedName("rl") + @ObfuscatedSignature( + descriptor = "Lby;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("g") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("aw") + static String field229; + @ObfuscatedName("ak") + @ObfuscatedGetter( + intValue = -1478025593 + ) + static int field232; + @ObfuscatedName("nb") + @ObfuscatedGetter( + intValue = -337730907 + ) + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1373587667 + ) + public final int field230; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -2109916151 + ) + final int field233; + + class34(int var3, int var4) { + this.field230 = var3; // L: 12 + this.field233 = var4; // L: 13 + } // L: 14 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field233; // L: 17 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "0" + ) + public static boolean method415() { + ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 24 + return var0 != null; // L: 25 + } + + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-842302459" + ) + @Export("load") + static void load() { + int var26; + if (Client.titleLoadingStage == 0) { // L: 1281 + WorldMapArea.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1282 + + for (var26 = 0; var26 < 4; ++var26) { // L: 1283 + Client.collisionMaps[var26] = new CollisionMap(104, 104); + } + + class19.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1284 + Login.Login_loadingText = "Starting game engine..."; // L: 1285 + Login.Login_loadingPercent = 5; // L: 1286 + Client.titleLoadingStage = 20; // L: 1287 + } else if (Client.titleLoadingStage == 20) { // L: 1290 + Login.Login_loadingText = "Prepared visibility map"; // L: 1291 + Login.Login_loadingPercent = 10; // L: 1292 + Client.titleLoadingStage = 30; // L: 1293 + } else if (Client.titleLoadingStage == 30) { // L: 1296 + TriBool.archive0 = HitSplatDefinition.newArchive(0, false, true, true); // L: 1297 + class367.archive1 = HitSplatDefinition.newArchive(1, false, true, true); // L: 1298 + class235.archive2 = HitSplatDefinition.newArchive(2, true, false, true); // L: 1299 + class5.archive3 = HitSplatDefinition.newArchive(3, false, true, true); // L: 1300 + ItemContainer.archive4 = HitSplatDefinition.newArchive(4, false, true, true); // L: 1301 + class157.archive5 = HitSplatDefinition.newArchive(5, true, true, true); // L: 1302 + class8.archive6 = HitSplatDefinition.newArchive(6, true, true, true); // L: 1303 + class12.archive7 = HitSplatDefinition.newArchive(7, false, true, true); // L: 1304 + SoundSystem.archive8 = HitSplatDefinition.newArchive(8, false, true, true); // L: 1305 + AbstractWorldMapData.archive9 = HitSplatDefinition.newArchive(9, false, true, true); // L: 1306 + class373.archive10 = HitSplatDefinition.newArchive(10, false, true, true); // L: 1307 + class10.archive11 = HitSplatDefinition.newArchive(11, false, true, true); // L: 1308 + BuddyRankComparator.archive12 = HitSplatDefinition.newArchive(12, false, true, true); // L: 1309 + MilliClock.archive13 = HitSplatDefinition.newArchive(13, true, false, true); // L: 1310 + WorldMapSection0.archive14 = HitSplatDefinition.newArchive(14, false, true, true); // L: 1311 + Buddy.archive15 = HitSplatDefinition.newArchive(15, false, true, true); // L: 1312 + class0.archive17 = HitSplatDefinition.newArchive(17, true, true, true); // L: 1313 + class246.archive18 = HitSplatDefinition.newArchive(18, false, true, true); // L: 1314 + class283.archive19 = HitSplatDefinition.newArchive(19, false, true, true); // L: 1315 + NPCComposition.archive20 = HitSplatDefinition.newArchive(20, false, true, true); // L: 1316 + Login.Login_loadingText = "Connecting to update server"; // L: 1317 + Login.Login_loadingPercent = 20; // L: 1318 + Client.titleLoadingStage = 40; // L: 1319 + } else if (Client.titleLoadingStage != 40) { // L: 1322 + Archive var21; + Archive var22; + Archive var23; + if (Client.titleLoadingStage == 45) { // L: 1369 + boolean var30 = !Client.isLowDetail; // L: 1370 + PcmPlayer.field394 = 22050; // L: 1373 + PcmPlayer.PcmPlayer_stereo = var30; // L: 1374 + Frames.field2007 = 2; // L: 1375 + MidiPcmStream var27 = new MidiPcmStream(); // L: 1377 + var27.method3938(9, 128); // L: 1378 + ApproximateRouteStrategy.pcmPlayer0 = class3.method57(GameEngine.taskHandler, 0, 22050); // L: 1379 + ApproximateRouteStrategy.pcmPlayer0.setStream(var27); // L: 1380 + var21 = Buddy.archive15; // L: 1381 + var22 = WorldMapSection0.archive14; // L: 1382 + var23 = ItemContainer.archive4; // L: 1383 + class210.musicPatchesArchive = var21; // L: 1385 + class372.musicSamplesArchive = var22; // L: 1386 + class210.soundEffectsArchive = var23; // L: 1387 + class210.midiPcmStream = var27; // L: 1388 + class43.pcmPlayer1 = class3.method57(GameEngine.taskHandler, 1, 2048); // L: 1390 + Huffman.pcmStreamMixer = new PcmStreamMixer(); // L: 1391 + class43.pcmPlayer1.setStream(Huffman.pcmStreamMixer); // L: 1392 + decimator = new Decimator(22050, PcmPlayer.field394); // L: 1393 + Login.Login_loadingText = "Prepared sound engine"; // L: 1394 + Login.Login_loadingPercent = 35; // L: 1395 + Client.titleLoadingStage = 50; // L: 1396 + class243.WorldMapElement_fonts = new Fonts(SoundSystem.archive8, MilliClock.archive13); // L: 1397 + } else { + int var1; + if (Client.titleLoadingStage == 50) { // L: 1400 + FontName[] var25 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 1403 + var1 = var25.length; // L: 1405 + Fonts var28 = class243.WorldMapElement_fonts; // L: 1406 + FontName[] var29 = new FontName[]{FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana13}; // L: 1409 + Client.fontsMap = var28.createMap(var29); // L: 1411 + if (Client.fontsMap.size() < var1) { // L: 1412 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1413 + Login.Login_loadingPercent = 40; // L: 1414 + } else { + class0.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1417 + class14.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1418 + class368.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1419 + UserComparator8.platformInfo = Client.platformInfoProvider.get(); // L: 1420 + Login.Login_loadingText = "Loaded fonts"; // L: 1421 + Login.Login_loadingPercent = 40; // L: 1422 + Client.titleLoadingStage = 60; // L: 1423 + } + } else { + int var3; + int var4; + Archive var20; + if (Client.titleLoadingStage == 60) { // L: 1426 + var20 = class373.archive10; // L: 1428 + var21 = SoundSystem.archive8; // L: 1429 + var3 = 0; // L: 1431 + if (var20.tryLoadFileByNames("title.jpg", "")) { // L: 1432 + ++var3; + } + + if (var21.tryLoadFileByNames("logo", "")) { // L: 1433 + ++var3; + } + + if (var21.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1434 + ++var3; + } + + if (var21.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1435 + ++var3; + } + + if (var21.tryLoadFileByNames("titlebox", "")) { // L: 1436 + ++var3; + } + + if (var21.tryLoadFileByNames("titlebutton", "")) { // L: 1437 + ++var3; + } + + if (var21.tryLoadFileByNames("runes", "")) { // L: 1438 + ++var3; + } + + if (var21.tryLoadFileByNames("title_mute", "")) { // L: 1439 + ++var3; + } + + if (var21.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1440 + ++var3; + } + + if (var21.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1441 + ++var3; + } + + if (var21.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1442 + ++var3; + } + + if (var21.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1443 + ++var3; + } + + var21.tryLoadFileByNames("sl_back", ""); // L: 1444 + var21.tryLoadFileByNames("sl_flags", ""); // L: 1445 + var21.tryLoadFileByNames("sl_arrows", ""); // L: 1446 + var21.tryLoadFileByNames("sl_stars", ""); // L: 1447 + var21.tryLoadFileByNames("sl_button", ""); // L: 1448 + var4 = DirectByteArrayCopier.method4354(); // L: 1452 + if (var3 < var4) { // L: 1453 + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 1454 + Login.Login_loadingPercent = 50; // L: 1455 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1458 + Login.Login_loadingPercent = 50; // L: 1459 + class20.updateGameState(5); // L: 1460 + Client.titleLoadingStage = 70; // L: 1461 + } + } else if (Client.titleLoadingStage == 70) { // L: 1464 + if (!class235.archive2.isFullyLoaded()) { // L: 1465 + Login.Login_loadingText = "Loading config - " + class235.archive2.loadPercent() + "%"; // L: 1466 + Login.Login_loadingPercent = 60; // L: 1467 + } else { + Archive var24 = class235.archive2; // L: 1470 + FloorOverlayDefinition.FloorOverlayDefinition_archive = var24; // L: 1472 + class0.method13(class235.archive2); // L: 1474 + var20 = class235.archive2; // L: 1475 + var21 = class12.archive7; // L: 1476 + KitDefinition.KitDefinition_archive = var20; // L: 1478 + class266.KitDefinition_modelsArchive = var21; // L: 1479 + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 1480 + var22 = class235.archive2; // L: 1482 + var23 = class12.archive7; // L: 1483 + boolean var5 = Client.isLowDetail; // L: 1484 + ObjectComposition.ObjectDefinition_archive = var22; // L: 1486 + ObjectComposition.ObjectDefinition_modelsArchive = var23; // L: 1487 + ObjectComposition.ObjectDefinition_isLowDetail = var5; // L: 1488 + Decimator.method1114(class235.archive2, class12.archive7); // L: 1490 + Archive var6 = class235.archive2; // L: 1491 + StructComposition.StructDefinition_archive = var6; // L: 1493 + ScriptEvent.method2101(class235.archive2, class12.archive7, Client.isMembersWorld, class0.fontPlain11); // L: 1495 + Archive var7 = class235.archive2; // L: 1496 + Archive var8 = TriBool.archive0; // L: 1497 + Archive var9 = class367.archive1; // L: 1498 + SequenceDefinition.SequenceDefinition_archive = var7; // L: 1500 + GrandExchangeOfferOwnWorldComparator.SequenceDefinition_animationsArchive = var8; // L: 1501 + SequenceDefinition.SequenceDefinition_skeletonsArchive = var9; // L: 1502 + Archive var10 = class235.archive2; // L: 1504 + Archive var11 = class12.archive7; // L: 1505 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var10; // L: 1507 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var11; // L: 1508 + Archive var12 = class235.archive2; // L: 1510 + VarbitComposition.VarbitDefinition_archive = var12; // L: 1512 + ItemLayer.method3268(class235.archive2); // L: 1514 + Archive var13 = class5.archive3; // L: 1515 + Archive var14 = class12.archive7; // L: 1516 + Archive var15 = SoundSystem.archive8; // L: 1517 + Archive var16 = MilliClock.archive13; // L: 1518 + FloorDecoration.Widget_archive = var13; // L: 1520 + WorldMapDecoration.Widget_modelsArchive = var14; // L: 1521 + UrlRequest.Widget_spritesArchive = var15; // L: 1522 + class32.Widget_fontsArchive = var16; // L: 1523 + Widget.Widget_interfaceComponents = new Widget[FloorDecoration.Widget_archive.getGroupCount()][]; // L: 1524 + class69.Widget_loadedInterfaces = new boolean[FloorDecoration.Widget_archive.getGroupCount()]; // L: 1525 + Archive var17 = class235.archive2; // L: 1527 + InvDefinition.InvDefinition_archive = var17; // L: 1529 + Archive var18 = class235.archive2; // L: 1531 + EnumComposition.EnumDefinition_archive = var18; // L: 1533 + class303.method5526(class235.archive2); // L: 1535 + class6.method97(class235.archive2); // L: 1536 + TextureProvider.varcs = new Varcs(); // L: 1537 + WorldMapSection0.method3034(class235.archive2, SoundSystem.archive8, MilliClock.archive13); // L: 1538 + VertexNormal.method3782(class235.archive2, SoundSystem.archive8); // L: 1539 + class18.method280(class235.archive2, SoundSystem.archive8); // L: 1540 + Login.Login_loadingText = "Loaded config"; // L: 1541 + Login.Login_loadingPercent = 60; // L: 1542 + Client.titleLoadingStage = 80; // L: 1543 + } + } else if (Client.titleLoadingStage == 80) { // L: 1546 + var26 = 0; // L: 1547 + if (class22.compass == null) { // L: 1548 + class22.compass = ModelData0.SpriteBuffer_getSprite(SoundSystem.archive8, class32.spriteIds.compass, 0); + } else { + ++var26; // L: 1549 + } + + if (class32.redHintArrowSprite == null) { // L: 1550 + class32.redHintArrowSprite = ModelData0.SpriteBuffer_getSprite(SoundSystem.archive8, class32.spriteIds.field3898, 0); + } else { + ++var26; // L: 1551 + } + + if (class18.mapSceneSprites == null) { // L: 1552 + class18.mapSceneSprites = class309.method5603(SoundSystem.archive8, class32.spriteIds.mapScenes, 0); + } else { + ++var26; // L: 1553 + } + + if (ItemContainer.headIconPkSprites == null) { // L: 1554 + ItemContainer.headIconPkSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.headIconsPk, 0); + } else { + ++var26; // L: 1555 + } + + if (ArchiveDiskActionHandler.headIconPrayerSprites == null) { // L: 1556 + ArchiveDiskActionHandler.headIconPrayerSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3901, 0); + } else { + ++var26; // L: 1557 + } + + if (Script.headIconHintSprites == null) { // L: 1558 + Script.headIconHintSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3897, 0); + } else { + ++var26; // L: 1559 + } + + if (class14.mapMarkerSprites == null) { // L: 1560 + class14.mapMarkerSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3903, 0); + } else { + ++var26; // L: 1561 + } + + if (class18.crossSprites == null) { // L: 1562 + class18.crossSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3907, 0); + } else { + ++var26; // L: 1563 + } + + if (class244.mapDotSprites == null) { // L: 1564 + class244.mapDotSprites = class337.method5985(SoundSystem.archive8, class32.spriteIds.field3902, 0); + } else { + ++var26; // L: 1565 + } + + if (NPCComposition.scrollBarSprites == null) { // L: 1566 + NPCComposition.scrollBarSprites = class309.method5603(SoundSystem.archive8, class32.spriteIds.field3906, 0); + } else { + ++var26; // L: 1567 + } + + if (class93.modIconSprites == null) { // L: 1568 + class93.modIconSprites = class309.method5603(SoundSystem.archive8, class32.spriteIds.field3899, 0); + } else { + ++var26; // L: 1569 + } + + if (var26 < 11) { // L: 1570 + Login.Login_loadingText = "Loading sprites - " + var26 * 100 / 12 + "%"; // L: 1571 + Login.Login_loadingPercent = 70; // L: 1572 + } else { + AbstractFont.AbstractFont_modIconSprites = class93.modIconSprites; // L: 1575 + class32.redHintArrowSprite.normalize(); // L: 1576 + var1 = (int)(Math.random() * 21.0D) - 10; // L: 1577 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1578 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 1579 + var4 = (int)(Math.random() * 41.0D) - 20; // L: 1580 + class18.mapSceneSprites[0].shiftColors(var4 + var1, var4 + var2, var4 + var3); // L: 1581 + Login.Login_loadingText = "Loaded sprites"; // L: 1582 + Login.Login_loadingPercent = 70; // L: 1583 + Client.titleLoadingStage = 90; // L: 1584 + } + } else if (Client.titleLoadingStage == 90) { // L: 1587 + if (!AbstractWorldMapData.archive9.isFullyLoaded()) { // L: 1588 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1589 + Login.Login_loadingPercent = 90; // L: 1590 + } else { + FriendLoginUpdate.textureProvider = new TextureProvider(AbstractWorldMapData.archive9, SoundSystem.archive8, 20, Login.clientPreferences.field1304, Client.isLowDetail ? 64 : 128); // L: 1593 + Rasterizer3D.Rasterizer3D_setTextureLoader(FriendLoginUpdate.textureProvider); // L: 1594 + Rasterizer3D.Rasterizer3D_setBrightness(Login.clientPreferences.field1304); // L: 1595 + Client.titleLoadingStage = 100; // L: 1596 + } + } else if (Client.titleLoadingStage == 100) { // L: 1599 + var26 = FriendLoginUpdate.textureProvider.getLoadedPercentage(); // L: 1600 + if (var26 < 100) { // L: 1601 + Login.Login_loadingText = "Loading textures - " + var26 + "%"; // L: 1602 + Login.Login_loadingPercent = 90; // L: 1603 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 1606 + Login.Login_loadingPercent = 90; // L: 1607 + Client.titleLoadingStage = 110; // L: 1608 + } + } else if (Client.titleLoadingStage == 110) { // L: 1611 + Language.mouseRecorder = new MouseRecorder(); // L: 1612 + GameEngine.taskHandler.newThreadTask(Language.mouseRecorder, 10); // L: 1613 + Login.Login_loadingText = "Loaded input handler"; // L: 1614 + Login.Login_loadingPercent = 92; // L: 1615 + Client.titleLoadingStage = 120; // L: 1616 + } else if (Client.titleLoadingStage == 120) { // L: 1619 + if (!class373.archive10.tryLoadFileByNames("huffman", "")) { // L: 1620 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1621 + Login.Login_loadingPercent = 94; // L: 1622 + } else { + Huffman var0 = new Huffman(class373.archive10.takeFileByNames("huffman", "")); // L: 1625 + ClientPacket.method3884(var0); // L: 1626 + Login.Login_loadingText = "Loaded wordpack"; // L: 1627 + Login.Login_loadingPercent = 94; // L: 1628 + Client.titleLoadingStage = 130; // L: 1629 + } + } else if (Client.titleLoadingStage == 130) { // L: 1632 + if (!class5.archive3.isFullyLoaded()) { // L: 1633 + Login.Login_loadingText = "Loading interfaces - " + class5.archive3.loadPercent() * 4 / 5 + "%"; // L: 1634 + Login.Login_loadingPercent = 96; // L: 1635 + } else if (!BuddyRankComparator.archive12.isFullyLoaded()) { // L: 1638 + Login.Login_loadingText = "Loading interfaces - " + (80 + BuddyRankComparator.archive12.loadPercent() / 6) + "%"; // L: 1639 + Login.Login_loadingPercent = 96; // L: 1640 + } else if (!MilliClock.archive13.isFullyLoaded()) { // L: 1643 + Login.Login_loadingText = "Loading interfaces - " + (96 + MilliClock.archive13.loadPercent() / 50) + "%"; // L: 1644 + Login.Login_loadingPercent = 96; // L: 1645 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 1648 + Login.Login_loadingPercent = 98; // L: 1649 + Client.titleLoadingStage = 140; // L: 1650 + } + } else if (Client.titleLoadingStage == 140) { // L: 1653 + Login.Login_loadingPercent = 100; // L: 1654 + if (!class283.archive19.tryLoadGroupByName(WorldMapCacheName.field1768.name)) { // L: 1655 + Login.Login_loadingText = "Loading world map - " + class283.archive19.groupLoadPercentByName(WorldMapCacheName.field1768.name) / 10 + "%"; // L: 1656 + } else { + if (UserComparator4.worldMap == null) { // L: 1659 + UserComparator4.worldMap = new WorldMap(); // L: 1660 + UserComparator4.worldMap.init(class283.archive19, class246.archive18, NPCComposition.archive20, class368.fontBold12, Client.fontsMap, class18.mapSceneSprites); // L: 1661 + } + + Login.Login_loadingText = "Loaded world map"; // L: 1663 + Client.titleLoadingStage = 150; // L: 1664 + } + } else if (Client.titleLoadingStage == 150) { // L: 1667 + class20.updateGameState(10); // L: 1668 + } + } + } + } else { + byte var19 = 0; // L: 1323 + var26 = var19 + TriBool.archive0.percentage() * 4 / 100; // L: 1324 + var26 += class367.archive1.percentage() * 4 / 100; // L: 1325 + var26 += class235.archive2.percentage() * 2 / 100; // L: 1326 + var26 += class5.archive3.percentage() * 2 / 100; // L: 1327 + var26 += ItemContainer.archive4.percentage() * 6 / 100; // L: 1328 + var26 += class157.archive5.percentage() * 4 / 100; // L: 1329 + var26 += class8.archive6.percentage() * 2 / 100; // L: 1330 + var26 += class12.archive7.percentage() * 56 / 100; // L: 1331 + var26 += SoundSystem.archive8.percentage() * 2 / 100; // L: 1332 + var26 += AbstractWorldMapData.archive9.percentage() * 2 / 100; // L: 1333 + var26 += class373.archive10.percentage() * 2 / 100; // L: 1334 + var26 += class10.archive11.percentage() * 2 / 100; // L: 1335 + var26 += BuddyRankComparator.archive12.percentage() * 2 / 100; // L: 1336 + var26 += MilliClock.archive13.percentage() * 2 / 100; // L: 1337 + var26 += WorldMapSection0.archive14.percentage() * 2 / 100; // L: 1338 + var26 += Buddy.archive15.percentage() * 2 / 100; // L: 1339 + var26 += class283.archive19.percentage() / 100; // L: 1340 + var26 += class246.archive18.percentage() / 100; // L: 1341 + var26 += NPCComposition.archive20.percentage() / 100; // L: 1342 + var26 += class0.archive17.method4430() && class0.archive17.isFullyLoaded() ? 1 : 0; // L: 1343 + if (var26 != 100) { // L: 1344 + if (var26 != 0) { // L: 1345 + Login.Login_loadingText = "Checking for updates - " + var26 + "%"; + } + + Login.Login_loadingPercent = 30; // L: 1346 + } else { + class231.method4356(TriBool.archive0, "Animations"); // L: 1349 + class231.method4356(class367.archive1, "Skeletons"); // L: 1350 + class231.method4356(ItemContainer.archive4, "Sound FX"); // L: 1351 + class231.method4356(class157.archive5, "Maps"); // L: 1352 + class231.method4356(class8.archive6, "Music Tracks"); // L: 1353 + class231.method4356(class12.archive7, "Models"); // L: 1354 + class231.method4356(SoundSystem.archive8, "Sprites"); // L: 1355 + class231.method4356(class10.archive11, "Music Jingles"); // L: 1356 + class231.method4356(WorldMapSection0.archive14, "Music Samples"); // L: 1357 + class231.method4356(Buddy.archive15, "Music Patches"); // L: 1358 + class231.method4356(class283.archive19, "World Map"); // L: 1359 + class231.method4356(class246.archive18, "World Map Geography"); // L: 1360 + class231.method4356(NPCComposition.archive20, "World Map Ground"); // L: 1361 + class32.spriteIds = new GraphicsDefaults(); // L: 1362 + class32.spriteIds.decode(class0.archive17); // L: 1363 + Login.Login_loadingText = "Loaded update list"; // L: 1364 + Login.Login_loadingPercent = 30; // L: 1365 + Client.titleLoadingStage = 45; // L: 1366 + } + } + } // L: 1288 1294 1320 1347 1367 1398 1415 1424 1456 1462 1468 1544 1573 1585 1591 1597 1604 1609 1617 1623 1630 1636 1641 1646 1651 1657 1665 1669 1671 + + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "927217331" + ) + static final int method420() { + if (Login.clientPreferences.roofsHidden) { // L: 4051 + return class26.Client_plane; + } else { + int var0 = UserComparator7.getTileHeight(ModeWhere.cameraX, ReflectionCheck.cameraZ, class26.Client_plane); // L: 4052 + return var0 - WorldMapRectangle.cameraY < 800 && (Tiles.Tiles_renderFlags[class26.Client_plane][ModeWhere.cameraX >> 7][ReflectionCheck.cameraZ >> 7] & 4) != 0 ? class26.Client_plane : 3; // L: 4053 4054 + } + } +} diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java new file mode 100644 index 0000000000..568436963c --- /dev/null +++ b/runescape-client/src/main/java/class340.java @@ -0,0 +1,17 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mx") +public class class340 extends class341 { + public class340(int var1) { + super(var1); // L: 7 + } // L: 8 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;IB)V", + garbageValue = "31" + ) + void vmethod6008(Buffer var1, int var2) { + } // L: 11 +} diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java new file mode 100644 index 0000000000..aaef74d90c --- /dev/null +++ b/runescape-client/src/main/java/class341.java @@ -0,0 +1,119 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("md") +public abstract class class341 implements class191 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lne;" + ) + class373 field3928; + + class341(int var1) { + } // L: 13 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;IB)V", + garbageValue = "31" + ) + abstract void vmethod6008(Buffer var1, int var2); + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1416767343" + ) + public void method6014(Buffer var1) { + while (true) { + int var2 = var1.readUnsignedByte(); // L: 17 + if (var2 == 0) { // L: 18 + return; // L: 47 + } + + class337[] var3 = new class337[]{class337.field3921, class337.field3922, class337.field3920, class337.field3925}; // L: 21 + class337 var4 = (class337)UserComparator8.findEnumerated(var3, var2); // L: 23 + if (var4 != null) { // L: 24 + switch(var4.field3923) { // L: 25 + case 0: + var1.readStringCp1252NullCircumfixed(); // L: 29 + break; + case 1: + default: + throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 27 + case 2: + class246[] var5 = new class246[]{class246.field3215, class246.field3214, class246.field3217, class246.field3216}; // L: 34 + UserComparator8.findEnumerated(var5, var1.readUnsignedByte()); // L: 36 + break; // L: 37 + case 3: + int var6 = var1.readUnsignedByte(); // L: 39 + this.field3928 = Login.method1969(var6); // L: 40 + } + } else { + this.vmethod6008(var1, var2); // L: 45 + } + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "660336316" + ) + boolean method6007() { + return this.field3928 != null; // L: 52 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/Object;", + garbageValue = "58" + ) + Object method6010() { + if (this.field3928 == class373.field4126) { // L: 56 + return 0; // L: 57 + } else if (this.field3928 == class373.field4134) { // L: 59 + return -1L; // L: 60 + } else { + return this.field3928 == class373.field4128 ? "" : null; // L: 62 63 65 + } + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(Lcr;I)V", + garbageValue = "-745115962" + ) + static final void method6017(PendingSpawn var0) { + long var1 = 0L; // L: 6828 + int var3 = -1; // L: 6829 + int var4 = 0; // L: 6830 + int var5 = 0; // L: 6831 + if (var0.type == 0) { // L: 6832 + var1 = WorldMapArea.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 6833 + var1 = WorldMapArea.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 6834 + var1 = WorldMapArea.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { // L: 6835 + var1 = WorldMapArea.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { // L: 6836 + int var6 = WorldMapArea.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 6837 + var3 = WorldMapSection1.Entity_unpackID(var1); // L: 6838 + var4 = var6 & 31; // L: 6839 + var5 = var6 >> 6 & 3; // L: 6840 + } + + var0.objectId = var3; // L: 6842 + var0.field1203 = var4; // L: 6843 + var0.field1199 = var5; // L: 6844 + } // L: 6845 +} diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java new file mode 100644 index 0000000000..1b7425d60f --- /dev/null +++ b/runescape-client/src/main/java/class342.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("ma") +public interface class342 { +} diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java new file mode 100644 index 0000000000..6cf373726b --- /dev/null +++ b/runescape-client/src/main/java/class343.java @@ -0,0 +1,5 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("my") +public interface class343 extends class342 { +} diff --git a/runescape-client/src/main/java/class347.java b/runescape-client/src/main/java/class347.java deleted file mode 100644 index 9bdeb38eb5..0000000000 --- a/runescape-client/src/main/java/class347.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mk") -public class class347 { - @ObfuscatedName("l") - static final int[] field4062; - @ObfuscatedName("s") - static final int[] field4063; - - static { - field4062 = new int[2048]; // L: 13 - field4063 = new int[2048]; // L: 14 - double var0 = 0.0030679615757712823D; // L: 17 - - for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 - field4062[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 - field4063[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 - } - - } // L: 22 -} diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java new file mode 100644 index 0000000000..cd1e96e6e4 --- /dev/null +++ b/runescape-client/src/main/java/class348.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("mb") +public class class348 extends Node { + @ObfuscatedName("f") + public long field3938; + + public class348(long var1) { + this.field3938 = var1; // L: 7 + } // L: 8 +} diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java deleted file mode 100644 index ac59649aa8..0000000000 --- a/runescape-client/src/main/java/class349.java +++ /dev/null @@ -1,18 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("mp") -public class class349 { - @ObfuscatedName("d") - public static final char[] field4080; - @ObfuscatedName("c") - public static final char[] field4078; - @ObfuscatedName("h") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - - static { - field4080 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 - field4078 = new char[]{'[', ']', '#'}; // L: 9 - } -} diff --git a/runescape-client/src/main/java/class35.java b/runescape-client/src/main/java/class35.java new file mode 100644 index 0000000000..67a88de268 --- /dev/null +++ b/runescape-client/src/main/java/class35.java @@ -0,0 +1,92 @@ +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("ax") +public class class35 { + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Ljh;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("f") + ExecutorService field239; + @ObfuscatedName("o") + Future field238; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lnu;" + ) + final Buffer field237; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lat;" + ) + final class31 field240; + + @ObfuscatedSignature( + descriptor = "(Lnu;Lat;)V" + ) + public class35(Buffer var1, class31 var2) { + this.field239 = Executors.newSingleThreadExecutor(); // L: 10 + this.field237 = var1; // L: 16 + this.field240 = var2; // L: 17 + this.method432(); // L: 18 + } // L: 19 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1164318842" + ) + public boolean method426() { + return this.field238.isDone(); // L: 22 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "0" + ) + public void method427() { + this.field239.shutdown(); // L: 26 + this.field239 = null; // L: 27 + } // L: 28 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)Lnu;", + garbageValue = "-112" + ) + public Buffer method425() { + try { + return (Buffer)this.field238.get(); // L: 32 + } catch (Exception var2) { // L: 34 + return null; // L: 35 + } + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-993058043" + ) + void method432() { + this.field238 = this.field239.submit(new class29(this, this.field237, this.field240)); // L: 40 + } // L: 41 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "26" + ) + static final void method435() { + Object var10000 = null; // L: 196 + String var0 = "You can't add yourself to your own ignore list"; + class69.addGameMessage(30, "", var0); // L: 198 + } // L: 200 +} diff --git a/runescape-client/src/main/java/class350.java b/runescape-client/src/main/java/class350.java deleted file mode 100644 index dde8da4771..0000000000 --- a/runescape-client/src/main/java/class350.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("mu") -public class class350 { - @ObfuscatedName("fu") - @ObfuscatedSignature( - descriptor = "Lki;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; -} diff --git a/runescape-client/src/main/java/class36.java b/runescape-client/src/main/java/class36.java new file mode 100644 index 0000000000..191003da32 --- /dev/null +++ b/runescape-client/src/main/java/class36.java @@ -0,0 +1,35 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("as") +public class class36 { + @ObfuscatedName("f") + final int field242; + @ObfuscatedName("o") + final int field243; + @ObfuscatedName("u") + final String field244; + + @ObfuscatedSignature( + descriptor = "(Lnu;)V" + ) + class36(Buffer var1) { + this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 + } // L: 20 + + class36(int var1, int var2, String var3) { + this.field242 = var1; // L: 13 + this.field243 = var2; // L: 14 + this.field244 = var3; // L: 15 + } // L: 16 + + @ObfuscatedName("f") + String method437() { + return Integer.toHexString(this.field242) + Integer.toHexString(this.field243) + this.field244; // L: 23 + } + + @ObfuscatedName("o") + int method436() { + return this.field243; // L: 27 + } +} diff --git a/runescape-client/src/main/java/class361.java b/runescape-client/src/main/java/class361.java new file mode 100644 index 0000000000..28eabd12fb --- /dev/null +++ b/runescape-client/src/main/java/class361.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mt") +public interface class361 extends Iterable { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "768076376" + ) + int vmethod6335(int var1); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "-65" + ) + void vmethod6336(int var1, Object var2); +} diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java new file mode 100644 index 0000000000..125b7811f6 --- /dev/null +++ b/runescape-client/src/main/java/class362.java @@ -0,0 +1,66 @@ +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("mu") +public class class362 implements class361 { + @ObfuscatedName("k") + static byte[][][] field4079; + @ObfuscatedName("f") + Map field4080; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lnz;" + ) + final class388 field4082; + + @ObfuscatedSignature( + descriptor = "(Lnz;)V" + ) + public class362(class388 var1) { + this.field4082 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "768076376" + ) + public int vmethod6335(int var1) { + if (this.field4080 != null) { // L: 19 + class389 var2 = (class389)this.field4080.get(var1); // L: 20 + if (var2 != null) { + return (Integer)var2.field4216; // L: 21 + } + } + + return (Integer)this.field4082.vmethod6841(var1); // L: 23 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/Object;B)V", + garbageValue = "-65" + ) + public void vmethod6336(int var1, Object var2) { + if (this.field4080 == null) { // L: 27 + this.field4080 = new HashMap(); // L: 28 + this.field4080.put(var1, new class389(var1, var2)); // L: 29 + } else { + class389 var3 = (class389)this.field4080.get(var1); // L: 32 + if (var3 == null) { + this.field4080.put(var1, new class389(var1, var2)); // L: 33 + } else { + var3.field4216 = var2; // L: 34 + } + } + + } // L: 36 + + public Iterator iterator() { + return this.field4080 == null ? Collections.emptyList().iterator() : this.field4080.values().iterator(); // L: 39 40 + } +} diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java new file mode 100644 index 0000000000..ccff522016 --- /dev/null +++ b/runescape-client/src/main/java/class364.java @@ -0,0 +1,14 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nm") +public class class364 { + @ObfuscatedName("u") + static final char[] field4098; + @ObfuscatedName("p") + static final char[] field4096; + + static { + field4098 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4096 = new char[]{'[', ']', '#'}; // L: 9 + } +} diff --git a/runescape-client/src/main/java/class367.java b/runescape-client/src/main/java/class367.java new file mode 100644 index 0000000000..3b051be888 --- /dev/null +++ b/runescape-client/src/main/java/class367.java @@ -0,0 +1,51 @@ +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("na") +class class367 implements Iterator { + @ObfuscatedName("du") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("ex") + @ObfuscatedGetter( + intValue = -76066485 + ) + static int field4117; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 315072013 + ) + int field4115; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lnh;" + ) + final class368 this$0; + + @ObfuscatedSignature( + descriptor = "(Lnh;)V" + ) + class367(class368 var1) { + this.this$0 = var1; // L: 40 + } + + public boolean hasNext() { + return this.field4115 < this.this$0.method5994(); // L: 44 + } + + public Object next() { + int var1 = ++this.field4115 - 1; // L: 48 + class340 var2 = (class340)this.this$0.field4119.get((long)var1); // L: 49 + return var2 != null ? var2 : this.this$0.method6432(var1); // L: 50 51 + } + + public void remove() { + throw new UnsupportedOperationException(); // L: 55 + } +} diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java new file mode 100644 index 0000000000..4a2e143362 --- /dev/null +++ b/runescape-client/src/main/java/class368.java @@ -0,0 +1,116 @@ +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("nh") +public class class368 extends class339 implements class194 { + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "Lkq;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + AbstractArchive field4121; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgo;" + ) + DemotingHashTable field4119; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -1297473835 + ) + int field4122; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(II)Lmd;", + garbageValue = "-883591339" + ) + protected class341 vmethod6425(int var1) { + synchronized(this.field4119) { // L: 22 + class340 var2 = (class340)this.field4119.get((long)var1); // L: 23 + if (var2 == null) { // L: 24 + var2 = this.method6432(var1); // L: 25 + this.field4119.method3825(var2, (long)var1); // L: 26 + } + + return var2; // L: 29 + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(II)Lmx;", + garbageValue = "-665957162" + ) + class340 method6432(int var1) { + byte[] var2 = this.field4121.takeFile(this.field4122, var1); // L: 33 + class340 var3 = new class340(var1); // L: 34 + if (var2 != null) { + var3.method6014(new Buffer(var2)); // L: 35 + } + + return var3; // L: 36 + } + + public Iterator iterator() { + return new class367(this); // L: 40 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "2140330129" + ) + @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 = class9.World_worlds[var6]; // L: 180 + class9.World_worlds[var6] = class9.World_worlds[var1]; // L: 181 + class9.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + World var11 = class9.World_worlds[var9]; // L: 185 + int var12 = WorldMapRectangle.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 = WorldMapRectangle.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 = class9.World_worlds[var9]; // L: 207 + class9.World_worlds[var9] = class9.World_worlds[var7]; // L: 208 + class9.World_worlds[var7++] = var14; // L: 209 + } + } + + class9.World_worlds[var1] = class9.World_worlds[var7]; // L: 213 + class9.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 +} diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java new file mode 100644 index 0000000000..0019120d00 --- /dev/null +++ b/runescape-client/src/main/java/class369.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nn") +public interface class369 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnu;B)V", + garbageValue = "32" + ) + void vmethod6493(Object var1, Buffer var2); + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Ljava/lang/Object;", + garbageValue = "-2127791785" + ) + Object vmethod6492(Buffer var1); +} diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java new file mode 100644 index 0000000000..0c47317d48 --- /dev/null +++ b/runescape-client/src/main/java/class370.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("no") +final class class370 implements class369 { + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 692421353 + ) + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnu;B)V", + garbageValue = "32" + ) + public void vmethod6493(Object var1, Buffer var2) { + this.method6444((Integer)var1, var2); // L: 20 + } // L: 21 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Ljava/lang/Object;", + garbageValue = "-2127791785" + ) + public Object vmethod6492(Buffer var1) { + return var1.readInt(); // L: 16 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Integer;Lnu;I)V", + garbageValue = "843542220" + ) + void method6444(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 +} diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java new file mode 100644 index 0000000000..4d15c17479 --- /dev/null +++ b/runescape-client/src/main/java/class371.java @@ -0,0 +1,39 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("np") +public class class371 { + @ObfuscatedName("f") + static final int[] field4124; + + static { + field4124 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4 + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + descriptor = "(IIIILoh;Lhh;I)V", + garbageValue = "1024019958" + ) + @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: 11453 + if (var6 > 4225 && var6 < 90000) { // L: 11454 + int var7 = Client.camAngleY & 2047; // L: 11455 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11456 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11457 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11458 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11459 + double var12 = Math.atan2((double)var10, (double)var11); // L: 11460 + int var14 = var5.width / 2 - 25; // L: 11461 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11462 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11463 + byte var17 = 20; // L: 11464 + class32.redHintArrowSprite.method6999(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11465 + } else { + WorldMapCacheName.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11467 + } + + } // L: 11468 +} diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java new file mode 100644 index 0000000000..a6b8bc6516 --- /dev/null +++ b/runescape-client/src/main/java/class372.java @@ -0,0 +1,40 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ns") +final class class372 implements class369 { + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lir;" + ) + @Export("musicSamplesArchive") + public static AbstractArchive musicSamplesArchive; + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnu;B)V", + garbageValue = "32" + ) + public void vmethod6493(Object var1, Buffer var2) { + this.method6461((Long)var1, var2); // L: 33 + } // L: 34 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Ljava/lang/Object;", + garbageValue = "-2127791785" + ) + public Object vmethod6492(Buffer var1) { + return var1.readLong(); // L: 29 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Long;Lnu;I)V", + garbageValue = "-1776493604" + ) + void method6461(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 25 + } // L: 26 +} diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java new file mode 100644 index 0000000000..e18743dbb2 --- /dev/null +++ b/runescape-client/src/main/java/class373.java @@ -0,0 +1,138 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ne") +public class class373 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lne;" + ) + public static final class373 field4126; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lne;" + ) + public static final class373 field4134; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lne;" + ) + public static final class373 field4128; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "Lig;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 652831107 + ) + final int field4129; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1417064257 + ) + public final int field4130; + @ObfuscatedName("e") + public final Class field4131; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lnn;" + ) + final class369 field4132; + + static { + field4126 = new class373(2, 0, Integer.class, new class370()); // L: 10 + field4134 = new class373(1, 1, Long.class, new class372()); // L: 23 + field4128 = new class373(0, 2, String.class, new class374()); // L: 36 + } + + @ObfuscatedSignature( + descriptor = "(IILjava/lang/Class;Lnn;)V" + ) + class373(int var1, int var2, Class var3, class369 var4) { + this.field4129 = var1; // L: 55 + this.field4130 = var2; // L: 56 + this.field4131 = var3; // L: 57 + this.field4132 = var4; // L: 58 + } // L: 59 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4130; // L: 85 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Ljava/lang/Object;", + garbageValue = "228670088" + ) + public Object method6482(Buffer var1) { + return this.field4132.vmethod6492(var1); // L: 89 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;I)Lne;", + garbageValue = "-1723331254" + ) + public static class373 method6477(Class var0) { + class373[] var1 = new class373[]{field4128, field4134, field4126}; // L: 65 + class373[] var2 = var1; // L: 67 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 68 + class373 var4 = var2[var3]; // L: 69 + if (var4.field4131 == var0) { // L: 71 + return var4; + } + } + + return null; // L: 75 + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Class;I)Lnn;", + garbageValue = "1858970757" + ) + public static class369 method6480(Class var0) { + class373 var1 = method6477(var0); // L: 79 + if (var1 == null) { + throw new IllegalArgumentException(); // L: 80 + } else { + return var1.field4132; // L: 81 + } + } + + @ObfuscatedName("kb") + @ObfuscatedSignature( + descriptor = "(Lhu;IIIB)V", + garbageValue = "2" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 11446 + if (var4 != null) { // L: 11447 + if (Client.minimapState < 3) { // L: 11448 + class22.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: 11449 + } + + } + } // L: 11450 +} diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java new file mode 100644 index 0000000000..803d2073c6 --- /dev/null +++ b/runescape-client/src/main/java/class374.java @@ -0,0 +1,32 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nc") +final class class374 implements class369 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lnu;B)V", + garbageValue = "32" + ) + public void vmethod6493(Object var1, Buffer var2) { + this.method6496((String)var1, var2); // L: 46 + } // L: 47 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lnu;I)Ljava/lang/Object;", + garbageValue = "-2127791785" + ) + public Object vmethod6492(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 42 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lnu;B)V", + garbageValue = "-29" + ) + void method6496(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 38 + } // L: 39 +} diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java new file mode 100644 index 0000000000..7aeb91f9ad --- /dev/null +++ b/runescape-client/src/main/java/class375.java @@ -0,0 +1,15 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nq") +public final class class375 { + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -88227289 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("c") + static int[] field4136; +} diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java new file mode 100644 index 0000000000..d0f607fabb --- /dev/null +++ b/runescape-client/src/main/java/class376.java @@ -0,0 +1,120 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ng") +public class class376 { + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "1948355809" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = class231.getWidgetChild(var1, var2); // L: 8862 + if (var5 != null) { // L: 8863 + if (var5.onOp != null) { // L: 8864 + ScriptEvent var6 = new ScriptEvent(); // L: 8865 + var6.widget = var5; // L: 8866 + var6.opIndex = var0; // L: 8867 + var6.targetName = var4; // L: 8868 + var6.args = var5.onOp; // L: 8869 + class19.runScriptEvent(var6); // L: 8870 + } + + boolean var11 = true; // L: 8872 + if (var5.contentType > 0) { // L: 8873 + var11 = ClanChat.method5644(var5); + } + + if (var11) { // L: 8874 + int var8 = DirectByteArrayCopier.getWidgetFlags(var5); // L: 8876 + int var9 = var0 - 1; // L: 8877 + boolean var7 = (var8 >> var9 + 1 & 1) != 0; // L: 8879 + if (var7) { // L: 8881 + PacketBufferNode var10; + if (var0 == 1) { // L: 8884 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); // L: 8886 + var10.packetBuffer.writeInt(var1); // L: 8887 + var10.packetBuffer.writeShort(var2); // L: 8888 + var10.packetBuffer.writeShort(var3); // L: 8889 + Client.packetWriter.addNode(var10); // L: 8890 + } + + if (var0 == 2) { // L: 8892 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); // L: 8894 + var10.packetBuffer.writeInt(var1); // L: 8895 + var10.packetBuffer.writeShort(var2); // L: 8896 + var10.packetBuffer.writeShort(var3); // L: 8897 + Client.packetWriter.addNode(var10); // L: 8898 + } + + if (var0 == 3) { // L: 8900 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); // L: 8902 + var10.packetBuffer.writeInt(var1); // L: 8903 + var10.packetBuffer.writeShort(var2); // L: 8904 + var10.packetBuffer.writeShort(var3); // L: 8905 + Client.packetWriter.addNode(var10); // L: 8906 + } + + if (var0 == 4) { // L: 8908 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); // L: 8910 + var10.packetBuffer.writeInt(var1); // L: 8911 + var10.packetBuffer.writeShort(var2); // L: 8912 + var10.packetBuffer.writeShort(var3); // L: 8913 + Client.packetWriter.addNode(var10); // L: 8914 + } + + if (var0 == 5) { // L: 8916 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher); // L: 8918 + var10.packetBuffer.writeInt(var1); // L: 8919 + var10.packetBuffer.writeShort(var2); // L: 8920 + var10.packetBuffer.writeShort(var3); // L: 8921 + Client.packetWriter.addNode(var10); // L: 8922 + } + + if (var0 == 6) { // L: 8924 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); // L: 8926 + var10.packetBuffer.writeInt(var1); // L: 8927 + var10.packetBuffer.writeShort(var2); // L: 8928 + var10.packetBuffer.writeShort(var3); // L: 8929 + Client.packetWriter.addNode(var10); // L: 8930 + } + + if (var0 == 7) { // L: 8932 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); // L: 8934 + var10.packetBuffer.writeInt(var1); // L: 8935 + var10.packetBuffer.writeShort(var2); // L: 8936 + var10.packetBuffer.writeShort(var3); // L: 8937 + Client.packetWriter.addNode(var10); // L: 8938 + } + + if (var0 == 8) { // L: 8940 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2310, Client.packetWriter.isaacCipher); // L: 8942 + var10.packetBuffer.writeInt(var1); // L: 8943 + var10.packetBuffer.writeShort(var2); // L: 8944 + var10.packetBuffer.writeShort(var3); // L: 8945 + Client.packetWriter.addNode(var10); // L: 8946 + } + + if (var0 == 9) { // L: 8948 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 8950 + var10.packetBuffer.writeInt(var1); // L: 8951 + var10.packetBuffer.writeShort(var2); // L: 8952 + var10.packetBuffer.writeShort(var3); // L: 8953 + Client.packetWriter.addNode(var10); // L: 8954 + } + + if (var0 == 10) { // L: 8956 + var10 = ObjectComposition.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 8958 + var10.packetBuffer.writeInt(var1); // L: 8959 + var10.packetBuffer.writeShort(var2); // L: 8960 + var10.packetBuffer.writeShort(var3); // L: 8961 + Client.packetWriter.addNode(var10); // L: 8962 + } + + } + } + } + } // L: 8882 8964 +} diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java new file mode 100644 index 0000000000..68921d331f --- /dev/null +++ b/runescape-client/src/main/java/class378.java @@ -0,0 +1,16 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nb") +public final class class378 { + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 955023585666784833L + ) + static long field4146; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 3001331764796270147L + ) + static long field4145; +} diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java new file mode 100644 index 0000000000..6a77b2599b --- /dev/null +++ b/runescape-client/src/main/java/class379.java @@ -0,0 +1,18 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ny") +public class class379 { + @ObfuscatedName("jr") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1966944763" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (class15.loadInterface(var0)) { // L: 10879 + Clock.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10880 + } + } // L: 10881 +} diff --git a/runescape-client/src/main/java/class384.java b/runescape-client/src/main/java/class384.java new file mode 100644 index 0000000000..b084615910 --- /dev/null +++ b/runescape-client/src/main/java/class384.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nd") +public interface class384 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V" + ) + void method6821(Buffer var1); +} diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java new file mode 100644 index 0000000000..974f094e06 --- /dev/null +++ b/runescape-client/src/main/java/class385.java @@ -0,0 +1,64 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nj") +public enum class385 implements Enumerated { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + field4204(4, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + field4209(1, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + field4203(0, 5), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + field4205(5, 6), + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + field4206(2, 7), + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lnj;" + ) + field4207(3, 8); + + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -2069080899 + ) + final int field4202; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 800594363 + ) + final int field4208; + + class385(int var3, int var4) { + this.field4202 = var3; // L: 18 + this.field4208 = var4; // L: 19 + } // L: 20 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1000839247" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field4208; // L: 23 + } +} diff --git a/runescape-client/src/main/java/class388.java b/runescape-client/src/main/java/class388.java new file mode 100644 index 0000000000..20fdc15436 --- /dev/null +++ b/runescape-client/src/main/java/class388.java @@ -0,0 +1,12 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("nz") +public interface class388 { + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/Object;", + garbageValue = "14" + ) + Object vmethod6841(int var1); +} diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java new file mode 100644 index 0000000000..38ce2f3960 --- /dev/null +++ b/runescape-client/src/main/java/class389.java @@ -0,0 +1,41 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("nl") +public class class389 { + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1604550251 + ) + public final int field4215; + @ObfuscatedName("o") + public Object field4216; + + public class389(int var1) { + this.field4215 = var1; // L: 8 + } // L: 9 + + public class389(int var1, Object var2) { + this.field4215 = var1; // L: 12 + this.field4216 = var2; // L: 13 + } // L: 14 + + public boolean equals(Object var1) { + if (!(var1 instanceof class389)) { // L: 21 + return false; + } else { + class389 var2 = (class389)var1; // L: 22 + if (var2.field4216 == null && this.field4216 != null) { // L: 23 + return false; + } else if (this.field4216 == null && var2.field4216 != null) { // L: 24 + return false; + } else { + return var2.field4215 == this.field4215 && var2.field4216.equals(this.field4216); // L: 25 + } + } + } + + public int hashCode() { + return super.hashCode(); // L: 17 + } +} diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java deleted file mode 100644 index c14f7b4310..0000000000 --- a/runescape-client/src/main/java/class39.java +++ /dev/null @@ -1,83 +0,0 @@ -import java.security.SecureRandom; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("aw") -public class class39 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Law;" - ) - static final class39 field285; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Law;" - ) - static final class39 field283; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1455031991 - ) - static int field288; - @ObfuscatedName("gf") - @ObfuscatedGetter( - intValue = 1613594049 - ) - static int field284; - @ObfuscatedName("hm") - @ObfuscatedGetter( - intValue = 1560346671 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1348128359 - ) - @Export("value") - final int value; - - static { - field285 = new class39(0); // L: 4 - field283 = new class39(1); // L: 5 - } - - class39(int var1) { - this.value = var1; // L: 9 - } // L: 10 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1057060168" - ) - public static int method644(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 28 - if ((var1 & 1) != 0) { - var2 = var0 * var2; // L: 26 - } - - var0 *= var0; // L: 27 - } - - if (var1 == 1) { // L: 30 - return var0 * var2; - } else { - return var2; // L: 31 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "12" - ) - static SecureRandom method643() { - SecureRandom var0 = new SecureRandom(); // L: 39 - var0.nextInt(); // L: 40 - return var0; // L: 41 - } -} diff --git a/runescape-client/src/main/java/class395.java b/runescape-client/src/main/java/class395.java new file mode 100644 index 0000000000..8e7845ec11 --- /dev/null +++ b/runescape-client/src/main/java/class395.java @@ -0,0 +1,22 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("os") +public class class395 { + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1998870835 + ) + @Export("SpriteBuffer_spriteWidth") + static int SpriteBuffer_spriteWidth; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 698278665 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("e") + @Export("SpriteBuffer_spriteWidths") + static int[] SpriteBuffer_spriteWidths; +} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 5ae1713d3f..5e46c57e04 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,167 +1,122 @@ +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("y") -final class class4 implements class0 { - @ObfuscatedName("n") +@ObfuscatedName("b") +public class class4 extends class14 { + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkx;B)V", - garbageValue = "-41" + descriptor = "Lhu;" ) - public void vmethod48(Object var1, Buffer var2) { - this.method54((String)var1, var2); // L: 46 - } // L: 47 + @Export("scriptActiveWidget") + static Widget scriptActiveWidget; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -464721427 + ) + int field33; + @ObfuscatedName("o") + String field34; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; - @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "(Lkx;I)Ljava/lang/Object;", - garbageValue = "1678106953" + descriptor = "(Lu;)V" ) - public Object vmethod45(Buffer var1) { - return var1.readStringCp1252NullTerminated(); // L: 42 + class4(class2 var1) { + this.this$0 = var1; // L: 323 } - @ObfuscatedName("h") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lkx;I)V", - garbageValue = "-768475899" + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" ) - void method54(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); // L: 38 - } // L: 39 + void vmethod371(Buffer var1) { + this.field33 = var1.readInt(); // L: 326 + this.field34 = var1.readStringCp1252NullTerminated(); // L: 327 + } // L: 328 - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-21" + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" ) - static final void method55(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80 - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81 - TaskHandler.field2045[0][var5][var4] = 127; // L: 82 - if (var0 == var5 && var5 > 0) { // L: 83 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } + void vmethod376(class11 var1) { + var1.method158(this.field33, this.field34); // L: 331 + } // L: 332 - if (var0 + var2 == var5 && var5 < 103) { // L: 84 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-2084142050" + ) + static boolean method76(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 679 + } - if (var4 == var1 && var4 > 0) { // L: 85 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { // L: 86 - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } + @ObfuscatedName("fr") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1882988132" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field842) { // L: 3093 + class232.method4360(); // L: 3094 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Login.clientPreferences.musicVolume != 0 && !Client.field842) { // L: 3096 + WorldMapSection0.method3059(2, class8.archive6, var0, 0, Login.clientPreferences.musicVolume, false); // L: 3097 } - } // L: 90 + Client.currentTrackGroupId = var0; // L: 3099 + } // L: 3100 - @ObfuscatedName("d") + @ObfuscatedName("kd") @ObfuscatedSignature( - descriptor = "(III)Lcl;", - garbageValue = "836178308" + descriptor = "(IIZB)V", + garbageValue = "1" ) - static Script method46(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); // L: 59 - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); // L: 63 - int var4 = WorldMapSection0.archive12.getGroupId(var3); // L: 64 - if (var4 == -1) { // L: 65 - return null; // L: 66 + static final void method75(int var0, int var1, boolean var2) { + if (Client.field820[var0] != null) { // L: 11567 + if (var1 >= 0 && var1 < Client.field820[var0].method46()) { // L: 11568 + class9 var3 = (class9)Client.field820[var0].field27.get(var1); // L: 11569 + PacketWriter var4 = Client.packetWriter; // L: 11570 + PacketBufferNode var5 = ObjectComposition.getPacketBufferNode(ClientPacket.field2298, var4.isaacCipher); // L: 11571 + var5.packetBuffer.writeByte(4 + Friend.stringCp1252NullTerminatedByteSize(var3.field65)); // L: 11572 + var5.packetBuffer.writeByte(var0); // L: 11573 + var5.packetBuffer.writeShort(var1); // L: 11574 + var5.packetBuffer.writeBoolean(var2); // L: 11575 + var5.packetBuffer.writeStringCp1252NullTerminated(var3.field65); // L: 11576 + var4.addNode(var5); // L: 11577 + } + } + } // L: 11578 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1616057238" + ) + static void method77(String var0) { + class0.field4 = var0; // L: 11620 + + try { + String var1 = class10.client.getParameter(Integer.toString(18)); // L: 11622 + String var2 = class10.client.getParameter(Integer.toString(13)); // L: 11623 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11624 + if (var0.length() == 0) { // L: 11625 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - byte[] var5 = WorldMapSection0.archive12.takeFileFlat(var4); // L: 68 - if (var5 != null) { // L: 69 - if (var5.length <= 1) { // L: 70 - return null; // L: 71 - } - - var2 = GameObject.newScript(var5); // L: 73 - if (var2 != null) { // L: 74 - Script.Script_cached.put(var2, (long)(var0 << 16)); // L: 75 - return var2; // L: 76 - } - } - - return null; // L: 79 + var3 = var3 + "; Expires=" + MouseHandler.method724(ObjectSound.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 11626 } - } - } - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-989634997" - ) - public static boolean method56() { - return class206.musicPlayerStatus != 0 ? true : VertexNormal.midiPcmStream.isReady(); // L: 60 61 - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "856520106" - ) - static int method53(int var0, Script var1, boolean var2) { - int var3 = -1; // L: 500 - Widget var4; - if (var0 >= 2000) { // L: 502 - var0 -= 1000; // L: 503 - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 504 - var4 = class237.getWidget(var3); // L: 505 - } else { - var4 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 507 + class42.method505(class10.client, "document.cookie=\"" + var3 + "\""); // L: 11627 + } catch (Throwable var4) { // L: 11629 } - if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 508 - Interpreter.Interpreter_intStackSize -= 4; // L: 509 - var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 510 - var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 511 - var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 512 - var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 513 - IsaacCipher.invalidateWidget(var4); // L: 514 - class1.client.alignWidget(var4); // L: 515 - if (var3 != -1 && var4.type == 0) { // L: 516 - class182.revalidateWidgetScroll(DefaultsGroup.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 517 - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 519 - Interpreter.Interpreter_intStackSize -= 4; // L: 520 - var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 521 - var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 522 - var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 523 - var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 524 - IsaacCipher.invalidateWidget(var4); // L: 525 - class1.client.alignWidget(var4); // L: 526 - if (var3 != -1 && var4.type == 0) { // L: 527 - class182.revalidateWidgetScroll(DefaultsGroup.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; // L: 528 - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 530 - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 531 - if (var5 != var4.isHidden) { // L: 532 - var4.isHidden = var5; // L: 533 - IsaacCipher.invalidateWidget(var4); // L: 534 - } - - return 1; // L: 536 - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 538 - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 539 - return 1; // L: 540 - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 542 - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 543 - return 1; // L: 544 - } else { - return 2; // L: 546 - } - } + } // L: 11630 } diff --git a/runescape-client/src/main/java/class401.java b/runescape-client/src/main/java/class401.java new file mode 100644 index 0000000000..f990c4acad --- /dev/null +++ b/runescape-client/src/main/java/class401.java @@ -0,0 +1,69 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("oz") +public class class401 { + @ObfuscatedName("n") + static final int[] field4284; + @ObfuscatedName("l") + static final int[] field4285; + + static { + field4284 = new int[2048]; // L: 13 + field4285 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 + + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4284[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 + field4285[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20 + } + + } // L: 22 + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(Lhu;IIZI)V", + garbageValue = "771513192" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 9996 + int var5 = var0.height; // L: 9997 + if (var0.widthAlignment == 0) { // L: 9998 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 9999 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 10000 + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { // L: 10001 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 10002 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { // L: 10003 + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { // L: 10004 + var0.width = var0.height * var0.field2614 / var0.field2642; + } + + if (var0.heightAlignment == 4) { // L: 10005 + var0.height = var0.width * var0.field2642 / var0.field2614; + } + + if (var0.contentType == 1337) { // L: 10006 + Client.viewportWidget = var0; + } + + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 10007 + ScriptEvent var6 = new ScriptEvent(); // L: 10008 + var6.widget = var0; // L: 10009 + var6.args = var0.onResize; // L: 10010 + Client.scriptEvents.addFirst(var6); // L: 10011 + } + + } // L: 10013 +} diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java deleted file mode 100644 index a15585fb65..0000000000 --- a/runescape-client/src/main/java/class41.java +++ /dev/null @@ -1,694 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ah") -public class class41 { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lcq;Lcq;IZI)I", - garbageValue = "-1892807226" - ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { // L: 211 - int var4 = var0.population; // L: 212 - int var5 = var1.population; // L: 213 - if (!var3) { // L: 214 - if (var4 == -1) { // L: 215 - var4 = 2001; - } - - if (var5 == -1) { // L: 216 - var5 = 2001; - } - } - - return var4 - var5; // L: 218 - } else if (var2 == 2) { // L: 220 - return var0.location - var1.location; - } else if (var2 == 3) { // L: 221 - if (var0.activity.equals("-")) { // L: 222 - if (var1.activity.equals("-")) { // L: 223 - return 0; - } else { - return var3 ? -1 : 1; // L: 224 - } - } else if (var1.activity.equals("-")) { // L: 226 - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); // L: 227 - } - } else if (var2 == 4) { // L: 229 - return var0.method1880() ? (var1.method1880() ? 0 : 1) : (var1.method1880() ? -1 : 0); - } else if (var2 == 5) { // L: 230 - return var0.method1878() ? (var1.method1878() ? 0 : 1) : (var1.method1878() ? -1 : 0); - } else if (var2 == 6) { // L: 231 - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { // L: 232 - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; // L: 233 - } - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-20058245" - ) - static void method650() { - GrandExchangeOfferTotalQuantityComparator.method162(CollisionMap.menuWidth / 2 + ApproximateRouteStrategy.menuX, AbstractUserComparator.menuY); // L: 7981 - } // L: 7982 - - @ObfuscatedName("ii") - @ObfuscatedSignature( - descriptor = "([Lhz;IIIIIIIII)V", - garbageValue = "-1513061199" - ) - @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: 9398 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9399 - - for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9400 - Widget var10 = var0[var9]; // L: 9401 - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9402 9403 - int var11; - if (var8 == -1) { // L: 9405 - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9406 - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9407 - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9408 - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9409 - var11 = ++Client.rootWidgetCount - 1; // L: 9410 - } else { - var11 = var8; // L: 9412 - } - - var10.rootIndex = var11; // L: 9413 - var10.cycle = Client.cycle; // L: 9414 - if (!var10.isIf3 || !DevicePcmPlayerProvider.isComponentHidden(var10)) { // L: 9415 - if (var10.contentType > 0) { // L: 9416 - WorldMapSection2.method401(var10); - } - - int var12 = var10.x + var6; // L: 9417 - int var13 = var7 + var10.y; // L: 9418 - int var14 = var10.transparencyTop; // L: 9419 - int var15; - int var16; - if (var10 == Client.clickedWidget) { // L: 9420 - if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9421 - WorldMapAreaData.field362 = var0; // L: 9422 - WorldMapIcon_1.field218 = var6; // L: 9423 - GrandExchangeOfferOwnWorldComparator.field656 = var7; // L: 9424 - continue; // L: 9425 - } - - if (Client.isDraggingWidget && Client.field912) { // L: 9427 - var15 = MouseHandler.MouseHandler_x; // L: 9428 - var16 = MouseHandler.MouseHandler_y; // L: 9429 - var15 -= Client.widgetClickX; // L: 9430 - var16 -= Client.widgetClickY; // L: 9431 - if (var15 < Client.field714) { // L: 9432 - var15 = Client.field714; - } - - if (var15 + var10.width > Client.field714 + Client.clickedWidgetParent.width) { // L: 9433 - var15 = Client.field714 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field844) { // L: 9434 - var16 = Client.field844; - } - - if (var16 + var10.height > Client.field844 + Client.clickedWidgetParent.height) { // L: 9435 - var16 = Client.field844 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; // L: 9436 - var13 = var16; // L: 9437 - } - - if (!var10.isScrollBar) { // L: 9439 - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { // L: 9445 - var15 = var2; // L: 9446 - var16 = var3; // L: 9447 - var17 = var4; // L: 9448 - var18 = var5; // L: 9449 - } else if (var10.type == 9) { // L: 9451 - var19 = var12; // L: 9452 - var20 = var13; // L: 9453 - var21 = var12 + var10.width; // L: 9454 - var22 = var13 + var10.height; // L: 9455 - if (var21 < var12) { // L: 9456 - var19 = var21; // L: 9458 - var21 = var12; // L: 9459 - } - - if (var22 < var13) { // L: 9461 - var20 = var22; // L: 9463 - var22 = var13; // L: 9464 - } - - ++var21; // L: 9466 - ++var22; // L: 9467 - var15 = var19 > var2 ? var19 : var2; // L: 9468 - var16 = var20 > var3 ? var20 : var3; // L: 9469 - var17 = var21 < var4 ? var21 : var4; // L: 9470 - var18 = var22 < var5 ? var22 : var5; // L: 9471 - } else { - var19 = var12 + var10.width; // L: 9474 - var20 = var13 + var10.height; // L: 9475 - var15 = var12 > var2 ? var12 : var2; // L: 9476 - var16 = var13 > var3 ? var13 : var3; // L: 9477 - var17 = var19 < var4 ? var19 : var4; // L: 9478 - var18 = var20 < var5 ? var20 : var5; // L: 9479 - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9481 - if (var10.contentType != 0) { // L: 9482 - if (var10.contentType == 1336) { // L: 9483 - if (Client.displayFps) { // L: 9484 - var13 += 15; // L: 9485 - Login.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9486 - var13 += 15; // L: 9487 - Runtime var42 = Runtime.getRuntime(); // L: 9488 - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9489 - var21 = 16776960; // L: 9490 - if (var20 > 327680 && !Client.isLowDetail) { // L: 9491 - var21 = 16711680; - } - - Login.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9492 - var13 += 15; // L: 9493 - } - continue; - } - - if (var10.contentType == 1337) { // L: 9497 - Client.viewportX = var12; // L: 9498 - Client.viewportY = var13; // L: 9499 - class13.drawEntities(var12, var13, var10.width, var10.height); // L: 9500 - Client.field816[var10.rootIndex] = true; // L: 9501 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9502 - continue; // L: 9503 - } - - if (var10.contentType == 1338) { // L: 9505 - class204.drawMinimap(var10, var12, var13, var11); // L: 9506 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9507 - continue; // L: 9508 - } - - if (var10.contentType == 1339) { // L: 9510 - Message.drawCompass(var10, var12, var13, var11); // L: 9511 - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9512 - continue; // L: 9513 - } - - if (var10.contentType == 1400) { // L: 9515 - SoundSystem.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9516 - } - - if (var10.contentType == 1401) { // L: 9518 - SoundSystem.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9519 - } - - if (var10.contentType == 1402) { // L: 9521 - class9.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9522 - } - } - - if (var10.type == 0) { // L: 9525 - if (!var10.isIf3 && DevicePcmPlayerProvider.isComponentHidden(var10) && var10 != Canvas.mousedOverWidgetIf1) { // L: 9526 - continue; - } - - if (!var10.isIf3) { // L: 9527 - if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9528 - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { // L: 9529 - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9531 - if (var10.children != null) { // L: 9532 - 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: 9533 - if (var30 != null) { // L: 9534 - ViewportMouse.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9535 - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9537 - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9538 - } - - if (Client.isResizable || Client.field871[var11] || Client.gameDrawingMode > 1) { // L: 9540 - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9541 9542 - WorldMapLabelSize.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { // L: 9544 - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { // L: 9547 - var19 = 0; // L: 9548 - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9549 - for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9550 - var22 = var21 * (var10.paddingX + 32) + var12; // L: 9551 - var23 = var20 * (var10.paddingY + 32) + var13; // L: 9552 - if (var19 < 20) { // L: 9553 - var22 += var10.inventoryXOffsets[var19]; // L: 9554 - var23 += var10.inventoryYOffsets[var19]; // L: 9555 - } - - if (var10.itemIds[var19] <= 0) { // L: 9557 - if (var10.inventorySprites != null && var19 < 20) { // L: 9602 - SpritePixels var46 = var10.getInventorySprite(var19); // L: 9603 - if (var46 != null) { // L: 9604 - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2591) { // L: 9605 - IsaacCipher.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; // L: 9558 - boolean var38 = false; // L: 9559 - var26 = var10.itemIds[var19] - 1; // L: 9560 - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == JagexCache.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9561 - SpritePixels var35; - if (Client.isItemSelected == 1 && var19 == class195.selectedItemSlot && var10.id == ClientPacket.selectedItemWidget) { // L: 9563 - var35 = TaskHandler.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var35 = TaskHandler.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9564 - } - - if (var35 != null) { // L: 9565 - if (var10 == JagexCache.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9566 - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9567 - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9568 - if (var24 < 5 && var24 > -5) { // L: 9569 - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { // L: 9570 - var25 = 0; - } - - if (Client.itemDragDuration < 5) { // L: 9571 - var24 = 0; // L: 9572 - var25 = 0; // L: 9573 - } - - var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 9575 - if (var1 != -1) { // L: 9576 - Widget var28 = var0[var1 & 65535]; // L: 9577 - int var29; - if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9578 - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field808 / 3; // L: 9579 - if (var29 > Client.field808 * 10) { // L: 9580 - var29 = Client.field808 * 10; - } - - if (var29 > var28.scrollY) { // L: 9581 - var29 = var28.scrollY; - } - - var28.scrollY -= var29; // L: 9582 - Client.draggedWidgetY += var29; // L: 9583 - IsaacCipher.invalidateWidget(var28); // L: 9584 - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9586 - var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field808 / 3; // L: 9587 - if (var29 > Client.field808 * 10) { // L: 9588 - var29 = Client.field808 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9589 - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; // L: 9590 - Client.draggedWidgetY -= var29; // L: 9591 - IsaacCipher.invalidateWidget(var28); // L: 9592 - } - } - } else if (var10 == WorldMapSprite.field260 && var19 == Client.field931) { // L: 9596 - var35.drawTransAt(var22, var23, 128); - } else { - var35.drawTransBgAt(var22, var23); // L: 9597 - } - } else { - IsaacCipher.invalidateWidget(var10); // L: 9599 - } - } - } - - ++var19; // L: 9607 - } - } - } else if (var10.type == 3) { // L: 9612 - if (GrandExchangeOfferWorldComparator.runCs1(var10)) { // L: 9614 - var19 = var10.color2; // L: 9615 - if (var10 == Canvas.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9616 - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; // L: 9619 - if (var10 == Canvas.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9620 - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { // L: 9622 - switch(var10.fillMode.field3898) { // L: 9623 - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9629 - break; // L: 9630 - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9632 - break; // L: 9633 - default: - if (var14 == 0) { // L: 9625 - 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: 9626 - } - } - } else if (var14 == 0) { // L: 9637 - 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: 9638 - } - } else { - Font var39; - if (var10.type == 4) { // L: 9642 - var39 = var10.getFont(); // L: 9643 - if (var39 == null) { // L: 9644 - if (Widget.field2591) { // L: 9645 - IsaacCipher.invalidateWidget(var10); - } - } else { - String var44 = var10.text; // L: 9649 - if (GrandExchangeOfferWorldComparator.runCs1(var10)) { // L: 9650 - var20 = var10.color2; // L: 9651 - if (var10 == Canvas.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9652 - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { // L: 9653 - var44 = var10.text2; - } - } else { - var20 = var10.color; // L: 9656 - if (var10 == Canvas.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9657 - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { // L: 9659 - ItemComposition var45 = class281.ItemDefinition_get(var10.itemId); // L: 9660 - var44 = var45.name; // L: 9661 - if (var44 == null) { // L: 9662 - var44 = "null"; - } - - if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9663 - var44 = FileSystem.colorStartTag(16748608) + var44 + "" + " " + 'x' + WorldMapRectangle.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { // L: 9665 - var44 = "Please wait..."; // L: 9666 - var20 = var10.color; // L: 9667 - } - - if (!var10.isIf3) { // L: 9669 - var44 = class9.method95(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9670 - } - } else if (var10.type == 5) { // L: 9673 - SpritePixels var40; - if (!var10.isIf3) { // L: 9674 - var40 = var10.getSprite(GrandExchangeOfferWorldComparator.runCs1(var10)); // L: 9675 - if (var40 != null) { // L: 9676 - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2591) { // L: 9677 - IsaacCipher.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { // L: 9681 - var40 = TaskHandler.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); // L: 9682 - } - - if (var40 == null) { // L: 9683 - if (Widget.field2591) { // L: 9707 - IsaacCipher.invalidateWidget(var10); - } - } else { - var20 = var40.width; // L: 9684 - var21 = var40.height; // L: 9685 - if (!var10.spriteTiling) { // L: 9686 - var22 = var10.width * 4096 / var20; // L: 9700 - if (var10.spriteAngle != 0) { // L: 9701 - var40.method6425(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { // L: 9702 - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { // L: 9703 - var40.drawTransBgAt(var12, var13); // L: 9704 - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9687 - var22 = (var20 - 1 + var10.width) / var20; // L: 9688 - var23 = (var21 - 1 + var10.height) / var21; // L: 9689 - - for (var24 = 0; var24 < var22; ++var24) { // L: 9690 - for (var25 = 0; var25 < var23; ++var25) { // L: 9691 - if (var10.spriteAngle != 0) { // L: 9692 - var40.method6425(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { // L: 9693 - var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); // L: 9694 - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9697 - } - } - } - } else { - ItemComposition var33; - if (var10.type == 6) { // L: 9711 - boolean var36 = GrandExchangeOfferWorldComparator.runCs1(var10); // L: 9712 - if (var36) { // L: 9714 - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; // L: 9715 - } - - Model var41 = null; // L: 9716 - var22 = 0; // L: 9717 - if (var10.itemId != -1) { // L: 9718 - var33 = class281.ItemDefinition_get(var10.itemId); // L: 9719 - if (var33 != null) { // L: 9720 - var33 = var33.getCountObj(var10.itemQuantity); // L: 9721 - var41 = var33.getModel(1); // L: 9722 - if (var41 != null) { // L: 9723 - var41.calculateBoundsCylinder(); // L: 9724 - var22 = var41.height / 2; // L: 9725 - } else { - IsaacCipher.invalidateWidget(var10); // L: 9727 - } - } - } else if (var10.modelType == 5) { // L: 9730 - if (var10.modelId == 0) { // L: 9731 - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = UserComparator9.localPlayer.getModel(); // L: 9732 - } - } else if (var20 == -1) { // L: 9734 - var41 = var10.getModel((SequenceDefinition)null, -1, var36, UserComparator9.localPlayer.appearance); // L: 9735 - if (var41 == null && Widget.field2591) { // L: 9736 - IsaacCipher.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = InterfaceParent.SequenceDefinition_get(var20); // L: 9739 - var41 = var10.getModel(var47, var10.modelFrame, var36, UserComparator9.localPlayer.appearance); // L: 9740 - if (var41 == null && Widget.field2591) { // L: 9741 - IsaacCipher.invalidateWidget(var10); - } - } - - Rasterizer3D.method3169(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9743 - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9744 - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9745 - if (var41 != null) { // L: 9746 - if (!var10.isIf3) { // L: 9747 - var41.method3106(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); // L: 9749 - if (var10.modelOrthog) { // L: 9750 - var41.method3053(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method3106(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9751 - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); // L: 9754 - } else { - if (var10.type == 7) { // L: 9757 - var39 = var10.getFont(); // L: 9758 - if (var39 == null) { // L: 9759 - if (Widget.field2591) { // L: 9760 - IsaacCipher.invalidateWidget(var10); - } - continue; - } - - var20 = 0; // L: 9763 - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9764 - for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9765 - if (var10.itemIds[var20] > 0) { // L: 9766 - var33 = class281.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9767 - String var34; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9769 - var34 = FileSystem.colorStartTag(16748608) + var33.name + ""; - } else { - var34 = FileSystem.colorStartTag(16748608) + var33.name + "" + " " + 'x' + WorldMapRectangle.formatItemStacks(var10.itemQuantities[var20]); // L: 9770 - } - - var25 = var22 * (var10.paddingX + 115) + var12; // L: 9771 - var26 = var21 * (var10.paddingY + 12) + var13; // L: 9772 - if (var10.textXAlignment == 0) { // L: 9773 - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { // L: 9774 - 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: 9775 - } - } - - ++var20; // L: 9777 - } - } - } - - if (var10.type == 8 && var10 == GrandExchangeOffer.field100 && Client.field815 == Client.field925) { // L: 9781 9782 - var19 = 0; // L: 9783 - var20 = 0; // L: 9784 - Font var31 = Login.fontPlain12; // L: 9785 - String var32 = var10.text; // L: 9786 - - String var43; - for (var32 = class9.method95(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9788 9789 9801 - var24 = var32.indexOf("
"); // L: 9790 - if (var24 != -1) { // L: 9791 - var43 = var32.substring(0, var24); // L: 9792 - var32 = var32.substring(var24 + 4); // L: 9793 - } else { - var43 = var32; // L: 9796 - var32 = ""; // L: 9797 - } - - var25 = var31.stringWidth(var43); // L: 9799 - if (var25 > var19) { // L: 9800 - var19 = var25; - } - } - - var19 += 6; // L: 9803 - var20 += 7; // L: 9804 - var24 = var12 + var10.width - 5 - var19; // L: 9805 - var25 = var13 + var10.height + 5; // L: 9806 - if (var24 < var12 + 5) { // L: 9807 - var24 = var12 + 5; - } - - if (var24 + var19 > var4) { // L: 9808 - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { // L: 9809 - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9810 - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9811 - var32 = var10.text; // L: 9812 - var26 = var25 + var31.ascent + 2; // L: 9813 - - for (var32 = class9.method95(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9814 9815 9826 - int var27 = var32.indexOf("
"); // L: 9816 - if (var27 != -1) { // L: 9817 - var43 = var32.substring(0, var27); // L: 9818 - var32 = var32.substring(var27 + 4); // L: 9819 - } else { - var43 = var32; // L: 9822 - var32 = ""; // L: 9823 - } - - var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9825 - } - } - - if (var10.type == 9) { // L: 9830 - if (var10.field2627) { // L: 9835 - var19 = var12; // L: 9836 - var20 = var13 + var10.height; // L: 9837 - var21 = var12 + var10.width; // L: 9838 - var22 = var13; // L: 9839 - } else { - var19 = var12; // L: 9842 - var20 = var13; // L: 9843 - var21 = var12 + var10.width; // L: 9844 - var22 = var13 + var10.height; // L: 9845 - } - - if (var10.lineWid == 1) { // L: 9847 - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9848 - } else { - GrandExchangeOfferNameComparator.method199(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9851 - } - } - } - } - } - } - } - } - } - } - } - - } // L: 9856 -} diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java new file mode 100644 index 0000000000..4ec07f62d9 --- /dev/null +++ b/runescape-client/src/main/java/class42.java @@ -0,0 +1,34 @@ +import java.applet.Applet; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; + +@ObfuscatedName("az") +public class class42 { + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "58889024" + ) + public static void method505(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); // L: 13 + } // L: 14 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;", + garbageValue = "-30" + ) + public static Object method509(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;B)Ljava/lang/Object;", + garbageValue = "55" + ) + public static Object method511(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); // L: 21 + } +} diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java new file mode 100644 index 0000000000..fea878b079 --- /dev/null +++ b/runescape-client/src/main/java/class43.java @@ -0,0 +1,31 @@ +import javax.imageio.ImageIO; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("au") +public class class43 { + @ObfuscatedName("qh") + @ObfuscatedSignature( + descriptor = "Lbh;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + + static { + ImageIO.setUseCache(false); // L: 12 + } // L: 13 + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1704226507" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = ObjectComposition.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8855 + var2.packetBuffer.method6625(var0); // L: 8856 + var2.packetBuffer.writeIntME(var1); // L: 8857 + Client.packetWriter.addNode(var2); // L: 8858 + } // L: 8859 +} diff --git a/runescape-client/src/main/java/class44.java b/runescape-client/src/main/java/class44.java new file mode 100644 index 0000000000..f715de0158 --- /dev/null +++ b/runescape-client/src/main/java/class44.java @@ -0,0 +1,80 @@ +import java.applet.Applet; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ab") +public class class44 { + @ObfuscatedName("f") + @Export("applet") + public static Applet applet; + @ObfuscatedName("o") + public static String field294; + + static { + applet = null; // L: 10 + field294 = ""; // L: 11 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1811738574" + ) + public static int method519(int var0) { + long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 61 + int var1 = (int)(var2 >>> 14 & 3L); // L: 63 + return var1; // L: 65 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIZI)Ljava/lang/String;", + garbageValue = "-1536836078" + ) + static String method521(int var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 140 + if (var2 && var0 >= 0) { // L: 141 + int var3 = 2; // L: 142 + + for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 143 144 146 + var4 /= var1; // L: 145 + } + + char[] var5 = new char[var3]; // L: 148 + var5[0] = '+'; // L: 149 + + for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 150 + int var7 = var0; // L: 151 + var0 /= var1; // L: 152 + int var8 = var7 - var0 * var1; // L: 153 + if (var8 >= 10) { // L: 154 + var5[var6] = (char)(var8 + 87); + } else { + var5[var6] = (char)(var8 + 48); // L: 155 + } + } + + return new String(var5); // L: 157 + } else { + return Integer.toString(var0, var1); + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1967957574" + ) + static int method520(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66 + if (var1 == null) { // L: 67 + return -1; + } else { + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69 + } + } +} diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 14b11bebf9..9ca716d4cd 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,30 +1,112 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") -public class class5 implements class12 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lkx;)Lkx;" +@ObfuscatedName("e") +public class class5 extends class16 { + @ObfuscatedName("re") + @ObfuscatedGetter( + intValue = 612354285 ) - public Buffer vmethod120(Buffer var1) { - Buffer var2 = new Buffer(100); // L: 9 - this.method63(var1, var2); // L: 10 - return var2; // L: 11 - } - - @ObfuscatedName("v") + static int field40; + @ObfuscatedName("o") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + @ObfuscatedName("dp") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;)V" + descriptor = "Lig;" ) - void method63(Buffer var1, Buffer var2) { - class10 var3 = new class10(var1); // L: 15 - class6 var4 = new class6(var3); // L: 16 + @Export("archive3") + static Archive archive3; + @ObfuscatedName("ef") + @ObfuscatedGetter( + intValue = 2112256777 + ) + @Export("currentPort") + static int currentPort; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = 1021832225 + ) + int field42; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lx;" + ) + final class19 this$0; - long var5; - for (var5 = 0L; !var4.method64(var3.method111(), var3.method115(), var5); ++var5) { // L: 17 18 19 + @ObfuscatedSignature( + descriptor = "(Lx;)V" + ) + class5(class19 var1) { + this.this$0 = var1; + this.field42 = -1; // L: 81 + } // L: 83 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1239860939" + ) + void vmethod356(Buffer var1) { + this.field42 = var1.readUnsignedShort(); // L: 86 + var1.readUnsignedByte(); // L: 87 + if (var1.readUnsignedByte() != 255) { // L: 88 + --var1.offset; // L: 89 + var1.readLong(); // L: 90 } - var2.writeLong(var5); // L: 21 - } // L: 22 + } // L: 92 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1583378087" + ) + void vmethod352(class3 var1) { + var1.method45(this.field42); // L: 95 + } // L: 96 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(ILlp;Lig;I)V", + garbageValue = "1497398389" + ) + static void method85(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 30 + var3.type = 1; // L: 31 + var3.key = (long)var0; // L: 32 + var3.archiveDisk = var1; // L: 33 + var3.archive = var2; // L: 34 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 35 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 36 + } // L: 37 + + ItemLayer.method3271(); // L: 38 + } // L: 39 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIB)I", + garbageValue = "74" + ) + static final int method83(int var0, int var1) { + int var2 = class312.method5606(var0 - 1, var1 - 1) + class312.method5606(1 + var0, var1 - 1) + class312.method5606(var0 - 1, var1 + 1) + class312.method5606(var0 + 1, 1 + var1); // L: 977 + int var3 = class312.method5606(var0 - 1, var1) + class312.method5606(1 + var0, var1) + class312.method5606(var0, var1 - 1) + class312.method5606(var0, var1 + 1); // L: 978 + int var4 = class312.method5606(var0, var1); // L: 979 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 980 + } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "52" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (class15.loadInterface(var0)) { // L: 10400 + GameObject.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10401 + } + } // L: 10402 } diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/class51.java deleted file mode 100644 index b8a1907b40..0000000000 --- a/runescape-client/src/main/java/class51.java +++ /dev/null @@ -1,214 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("ao") -public class class51 implements WorldMapSection { - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -154485521 - ) - int field393; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1795008419 - ) - int field386; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 318861515 - ) - int field387; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1934336547 - ) - int field388; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -1607101939 - ) - int field394; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 69269291 - ) - int field389; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -2008160761 - ) - int field391; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 294183149 - ) - int field392; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1713050183 - ) - int field385; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1407382949 - ) - int field390; - - class51() { - } // L: 18 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lar;B)V", - garbageValue = "112" - ) - @Export("expandBounds") - public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field394) { - var1.regionLowX = this.field394; - } - - if (var1.regionHighX < this.field394) { - var1.regionHighX = this.field394; - } - - if (var1.regionLowY > this.field389) { - var1.regionLowY = this.field389; - } - - if (var1.regionHighY < this.field389) { - var1.regionHighY = this.field389; - } - - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "-90" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field393 && var1 < this.field386 + this.field393) { - return var2 >= (this.field387 << 6) + (this.field391 << 3) && var2 <= (this.field387 << 6) + (this.field391 << 3) + 7 && var3 >= (this.field388 << 6) + (this.field392 << 3) && var3 <= (this.field388 << 6) + (this.field392 << 3) + 7; // L: 31 - } else { - return false; // L: 29 - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "-5" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field394 << 6) + (this.field385 << 3) && var1 <= (this.field394 << 6) + (this.field385 << 3) + 7 && var2 >= (this.field389 << 6) + (this.field390 << 3) && var2 <= (this.field389 << 6) + (this.field390 << 3) + 7; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIIB)[I", - garbageValue = "-76" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { // L: 39 - return null; // L: 40 - } else { - int[] var4 = new int[]{var2 + (this.field394 * 64 - this.field387 * 64) + (this.field385 * 8 - this.field391 * 8), var3 + (this.field389 * 64 - this.field388 * 64) + (this.field390 * 8 - this.field392 * 8)}; // L: 42 43 44 - return var4; // L: 45 - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "-1841969392" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { // L: 49 - return null; // L: 50 - } else { - int var3 = this.field387 * 64 - this.field394 * 64 + (this.field391 * 8 - this.field385 * 8) + var1; // L: 52 - int var4 = var2 + (this.field388 * 64 - this.field389 * 64) + (this.field392 * 8 - this.field390 * 8); // L: 53 - return new Coord(this.field393, var3, var4); // L: 54 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lkx;I)V", - garbageValue = "-489268143" - ) - @Export("read") - public void read(Buffer var1) { - this.field393 = var1.readUnsignedByte(); // L: 58 - this.field386 = var1.readUnsignedByte(); // L: 59 - this.field387 = var1.readUnsignedShort(); // L: 60 - this.field391 = var1.readUnsignedByte(); // L: 61 - this.field388 = var1.readUnsignedShort(); // L: 62 - this.field392 = var1.readUnsignedByte(); // L: 63 - this.field394 = var1.readUnsignedShort(); // L: 64 - this.field385 = var1.readUnsignedByte(); // L: 65 - this.field389 = var1.readUnsignedShort(); // L: 66 - this.field390 = var1.readUnsignedByte(); // L: 67 - this.method858(); // L: 68 - } // L: 69 - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" - ) - void method858() { - } // L: 71 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)[Lib;", - garbageValue = "410836037" - ) - static class238[] method872() { - return new class238[]{class238.field3123, class238.field3121}; // L: 35 - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Liw;", - garbageValue = "196588481" - ) - public static FloorUnderlayDefinition method876(int var0) { - FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 21 - if (var1 != null) { // L: 22 - return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 23 - var1 = new FloorUnderlayDefinition(); // L: 24 - if (var2 != null) { // L: 25 - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); // L: 26 - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 27 - return var1; // L: 28 - } - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - World.method1923(); // L: 11438 - if (WorldMapID.clanChat != null) { // L: 11439 - WorldMapID.clanChat.invalidateIgnoreds(); // L: 11440 - } - - } // L: 11442 -} diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java deleted file mode 100644 index f3fa2c8c19..0000000000 --- a/runescape-client/src/main/java/class52.java +++ /dev/null @@ -1,119 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bj") -public final class class52 { - @ObfuscatedName("su") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1687421711 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("dp") - @ObfuscatedSignature( - descriptor = "Liy;" - ) - @Export("archive0") - static Archive archive0; - - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1618970834" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { // L: 2462 - InvDefinition.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { // L: 2463 - InvDefinition.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { // L: 2464 - InvDefinition.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { // L: 2465 - Login.loginIndex = 3; // L: 2466 - Login.field1207 = 1; // L: 2467 - } else if (var0 == 4) { // L: 2469 - WorldMapDecoration.method406(0); // L: 2470 - } else if (var0 == 5) { // L: 2472 - Login.field1207 = 2; // L: 2473 - InvDefinition.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: 2474 - } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2476 - if (var0 == 7) { // L: 2479 - InvDefinition.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { // L: 2480 - InvDefinition.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { // L: 2481 - InvDefinition.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { // L: 2482 - InvDefinition.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { // L: 2483 - InvDefinition.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { // L: 2484 - InvDefinition.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { // L: 2485 - InvDefinition.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { // L: 2486 - InvDefinition.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { // L: 2487 - InvDefinition.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { // L: 2488 - InvDefinition.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: 2489 - WorldMapDecoration.method406(1); // L: 2490 - } else if (var0 == 19) { // L: 2492 - InvDefinition.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { // L: 2493 - InvDefinition.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { // L: 2494 - InvDefinition.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { // L: 2495 - InvDefinition.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { // L: 2496 - InvDefinition.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { // L: 2497 - InvDefinition.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { // L: 2498 - InvDefinition.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { // L: 2499 - InvDefinition.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { // L: 2500 - InvDefinition.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) { - InvDefinition.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2501 - } else if (var0 == 37) { // L: 2502 - InvDefinition.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { // L: 2503 - InvDefinition.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { // L: 2504 - Login.loginIndex = 8; // L: 2505 - } else { - if (var0 == 56) { // L: 2507 - InvDefinition.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2508 - ItemContainer.updateGameState(11); // L: 2509 - return; // L: 2510 - } - - if (var0 == 57) { // L: 2512 - InvDefinition.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2513 - ItemContainer.updateGameState(11); // L: 2514 - return; // L: 2515 - } - - if (var0 == 61) { // L: 2517 - Login.loginIndex = 7; // L: 2518 - } else { - InvDefinition.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2520 - } - } - } else { - InvDefinition.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2477 - } - - ItemContainer.updateGameState(10); // L: 2521 - } // L: 2522 -} diff --git a/runescape-client/src/main/java/class56.java b/runescape-client/src/main/java/class56.java deleted file mode 100644 index b553c55fcc..0000000000 --- a/runescape-client/src/main/java/class56.java +++ /dev/null @@ -1,25 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; - -@ObfuscatedName("br") -public class class56 { - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;B)V", - garbageValue = "1" - ) - public static void method928(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); // L: 13 - } // L: 14 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "1531534394" - ) - public static Object method923(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/class58.java b/runescape-client/src/main/java/class58.java deleted file mode 100644 index ab01b0436a..0000000000 --- a/runescape-client/src/main/java/class58.java +++ /dev/null @@ -1,249 +0,0 @@ -import javax.imageio.ImageIO; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bx") -public class class58 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -1266469825 - ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; - - static { - ImageIO.setUseCache(false); // L: 12 - } // L: 13 - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1558646174" - ) - static void method939() { - Tiles.Tiles_minPlane = 99; // L: 48 - Tiles.field517 = new byte[4][104][104]; // L: 49 - class200.field2399 = new byte[4][104][104]; // L: 50 - Tiles.field530 = new byte[4][104][104]; // L: 51 - class1.field1 = new byte[4][104][104]; // L: 52 - class2.field12 = new int[4][105][105]; // L: 53 - TaskHandler.field2045 = new byte[4][105][105]; // L: 54 - WorldMapSprite.field257 = new int[105][105]; // L: 55 - GrandExchangeOfferAgeComparator.Tiles_hue = new int[104]; // L: 56 - Tiles.Tiles_saturation = new int[104]; // L: 57 - WorldMapLabel.Tiles_lightness = new int[104]; // L: 58 - TaskHandler.Tiles_hueMultiplier = new int[104]; // L: 59 - WorldMapID.field292 = new int[104]; // L: 60 - } // L: 61 - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1370072473" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (WorldMapSectionType.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3374 - Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3375 - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3376 - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3377 - Client.soundEffects[Client.soundEffectCount] = null; // L: 3378 - Client.soundLocations[Client.soundEffectCount] = 0; // L: 3379 - ++Client.soundEffectCount; // L: 3380 - } - - } // L: 3382 - - @ObfuscatedName("jz") - @ObfuscatedSignature( - descriptor = "(Lhz;III)V", - garbageValue = "797800521" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { // L: 10183 - WorldMapManager.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10184 - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10187 - var3 = Player.Widget_getSpellActionName(var0); // L: 10188 - if (var3 != null) { // L: 10189 - WorldMapManager.insertMenuItemNoShift(var3, FileSystem.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10190 - } - } - - if (var0.buttonType == 3) { // L: 10194 - WorldMapManager.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10195 - } - - if (var0.buttonType == 4) { // L: 10198 - WorldMapManager.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10199 - } - - if (var0.buttonType == 5) { // L: 10202 - WorldMapManager.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10203 - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10206 - WorldMapManager.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10207 - } - - int var4; - int var5; - int var15; - if (var0.type == 2) { // L: 10210 - var15 = 0; // L: 10211 - - for (var4 = 0; var4 < var0.height; ++var4) { // L: 10212 - for (var5 = 0; var5 < var0.width; ++var5) { // L: 10213 - int var18 = (var0.paddingX + 32) * var5; // L: 10214 - int var7 = (var0.paddingY + 32) * var4; // L: 10215 - if (var15 < 20) { // L: 10216 - var18 += var0.inventoryXOffsets[var15]; // L: 10217 - var7 += var0.inventoryYOffsets[var15]; // L: 10218 - } - - if (var1 >= var18 && var2 >= var7 && var1 < var18 + 32 && var2 < var7 + 32) { // L: 10220 - Client.dragItemSlotDestination = var15; // L: 10221 - HorizontalAlignment.hoveredItemContainer = var0; // L: 10222 - if (var0.itemIds[var15] > 0) { // L: 10223 - ItemComposition var8 = class281.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 10224 - if (Client.isItemSelected == 1 && Login.method2244(class60.getWidgetFlags(var0))) { // L: 10225 - if (var0.id != ClientPacket.selectedItemWidget || var15 != class195.selectedItemSlot) { // L: 10226 - WorldMapManager.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + FileSystem.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 10227 - } - } else if (Client.isSpellSelected && Login.method2244(class60.getWidgetFlags(var0))) { // L: 10231 - if ((GrandExchangeOfferNameComparator.selectedSpellFlags & 16) == 16) { // L: 10232 - WorldMapManager.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + FileSystem.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); // L: 10233 - } - } else { - String[] var9 = var8.inventoryActions; // L: 10238 - int var10 = -1; // L: 10239 - if (Client.shiftClickDrop && ModeWhere.method3875()) { // L: 10240 - var10 = var8.getShiftClickIndex(); // L: 10241 - } - - if (Login.method2244(class60.getWidgetFlags(var0))) { // L: 10243 - for (int var11 = 4; var11 >= 3; --var11) { // L: 10244 - if (var10 != var11) { // L: 10245 - class204.addWidgetItemMenuItem(var0, var8, var15, var11, false); // L: 10246 - } - } - } - - int var12 = class60.getWidgetFlags(var0); // L: 10250 - boolean var20 = (var12 >> 31 & 1) != 0; // L: 10252 - if (var20) { // L: 10254 - WorldMapManager.insertMenuItemNoShift("Use", FileSystem.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); // L: 10255 - } - - Object var10000 = null; // L: 10258 - int var13; - if (Login.method2244(class60.getWidgetFlags(var0))) { - for (var13 = 2; var13 >= 0; --var13) { // L: 10259 - if (var10 != var13) { // L: 10260 - class204.addWidgetItemMenuItem(var0, var8, var15, var13, false); // L: 10261 - } - } - - if (var10 >= 0) { // L: 10263 - class204.addWidgetItemMenuItem(var0, var8, var15, var10, true); // L: 10264 - } - } - - var9 = var0.itemActions; // L: 10267 - if (var9 != null) { // L: 10268 - for (var13 = 4; var13 >= 0; --var13) { // L: 10269 - if (var9[var13] != null) { // L: 10270 - byte var14 = 0; // L: 10271 - if (var13 == 0) { // L: 10272 - var14 = 39; - } - - if (var13 == 1) { // L: 10273 - var14 = 40; - } - - if (var13 == 2) { // L: 10274 - var14 = 41; - } - - if (var13 == 3) { // L: 10275 - var14 = 42; - } - - if (var13 == 4) { // L: 10276 - var14 = 43; - } - - WorldMapManager.insertMenuItemNoShift(var9[var13], FileSystem.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); // L: 10277 - } - } - } - - WorldMapManager.insertMenuItemNoShift("Examine", FileSystem.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); // L: 10282 - } - } - } - - ++var15; // L: 10287 - } - } - } - - if (var0.isIf3) { // L: 10291 - if (Client.isSpellSelected) { // L: 10292 - var4 = class60.getWidgetFlags(var0); // L: 10294 - boolean var21 = (var4 >> 21 & 1) != 0; // L: 10296 - if (var21 && (GrandExchangeOfferNameComparator.selectedSpellFlags & 32) == 32) { // L: 10298 - WorldMapManager.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10299 - } - } else { - for (var15 = 9; var15 >= 5; --var15) { // L: 10304 - String var17; - if (!MidiPcmStream.method3972(class60.getWidgetFlags(var0), var15) && var0.onOp == null) { // L: 10307 - var17 = null; // L: 10308 - } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { // L: 10311 - var17 = var0.actions[var15]; // L: 10315 - } else { - var17 = null; // L: 10312 - } - - if (var17 != null) { // L: 10318 - WorldMapManager.insertMenuItemNoShift(var17, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); // L: 10319 - } - } - - var3 = Player.Widget_getSpellActionName(var0); // L: 10323 - if (var3 != null) { // L: 10324 - WorldMapManager.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10325 - } - - for (var4 = 4; var4 >= 0; --var4) { // L: 10328 - String var16; - if (!MidiPcmStream.method3972(class60.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10331 - var16 = null; // L: 10332 - } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10335 - var16 = var0.actions[var4]; // L: 10339 - } else { - var16 = null; // L: 10336 - } - - if (var16 != null) { // L: 10342 - WorldMapEvent.insertMenuItem(var16, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10343 - } - } - - var5 = class60.getWidgetFlags(var0); // L: 10348 - boolean var19 = (var5 & 1) != 0; // L: 10350 - if (var19) { // L: 10352 - WorldMapManager.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10353 - } - } - } - - } // L: 10358 -} diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 1108e1f12a..427bad32dc 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -1,80 +1,112 @@ -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; +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("z") -public class class6 implements class11 { - @ObfuscatedName("n") - final MessageDigest field34; +@ObfuscatedName("k") +public class class6 extends class14 { + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("ii") + @ObfuscatedGetter( + intValue = 1971024859 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -394718965 + ) + int field49; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1266108419 + ) + int field46; + // $FF: synthetic field + @ObfuscatedSignature( + descriptor = "Lu;" + ) + final class2 this$0; @ObfuscatedSignature( - descriptor = "(Ls;)V" + descriptor = "(Lu;)V" ) - class6(class10 var1) { - this.field34 = this.method70(); // L: 14 - } // L: 15 - - @ObfuscatedName("n") - boolean method64(int var1, String var2, long var3) { - byte[] var5 = this.method68(var2, var3); // L: 18 - return method65(var5) >= var1; // L: 19 + class6(class2 var1) { + this.this$0 = var1; // L: 271 } - @ObfuscatedName("c") - byte[] method68(String var1, long var2) { - StringBuilder var4 = new StringBuilder(); // L: 56 - var4.append(var1).append(Long.toHexString(var2)); // L: 57 - this.field34.reset(); // L: 58 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" + ) + void vmethod371(Buffer var1) { + this.field49 = var1.readInt(); // L: 274 + this.field46 = var1.readInt(); // L: 275 + } // L: 276 - try { - this.field34.update(var4.toString().getBytes("UTF-8")); // L: 60 - } catch (UnsupportedEncodingException var6) { // L: 62 - var6.printStackTrace(); // L: 63 - } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" + ) + void vmethod376(class11 var1) { + var1.method178(this.field49, this.field46); // L: 279 + } // L: 280 - return this.field34.digest(); // L: 65 - } + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(Lir;I)V", + garbageValue = "620748591" + ) + public static void method97(AbstractArchive var0) { + ParamComposition.ParamDefinition_archive = var0; // L: 21 + } // L: 22 - @ObfuscatedName("y") - MessageDigest method70() { - try { - return MessageDigest.getInstance("SHA-256"); // L: 70 - } catch (NoSuchAlgorithmException var2) { // L: 72 - var2.printStackTrace(); // L: 73 - return null; // L: 74 - } - } - - @ObfuscatedName("v") - static int method65(byte[] var0) { - int var1 = 0; // L: 23 - byte[] var2 = var0; // L: 25 - - for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 - byte var4 = var2[var3]; // L: 27 - int var5 = method66(var4); // L: 29 - var1 += var5; // L: 30 - if (var5 != 8) { // L: 31 - break; - } - } - - return var1; // L: 37 - } - - @ObfuscatedName("d") - static int method66(byte var0) { - int var1 = 0; // L: 41 - if (var0 == 0) { // L: 42 - var1 = 8; // L: 43 + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)Lgy;", + garbageValue = "629458679" + ) + public static PacketBufferNode method98() { + PacketBufferNode var0; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 44 + var0 = new PacketBufferNode(); // L: 45 } else { - for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { // L: 46 47 49 - ++var1; // L: 48 - } + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 48 } - return var1; // L: 52 + var0.clientPacket = null; // L: 51 + var0.clientPacketLength = 0; // L: 52 + var0.packetBuffer = new PacketBuffer(5000); // L: 53 + return var0; // L: 54 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(ILcc;ZB)I", + garbageValue = "1" + ) + static int method96(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3445 + Client.logoutTimer = 250; // L: 3446 + return 1; // L: 3447 + } else if (var0 != 5631 && var0 != 5633) { // L: 3449 + if (var0 == 5632) { // L: 3453 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 26; // L: 3454 + return 1; // L: 3455 + } else { + return 2; // L: 3457 + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; // L: 3450 + return 1; // L: 3451 + } } } diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java deleted file mode 100644 index f5907bf565..0000000000 --- a/runescape-client/src/main/java/class60.java +++ /dev/null @@ -1,84 +0,0 @@ -import java.applet.Applet; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("bw") -public class class60 { - @ObfuscatedName("n") - @Export("applet") - static Applet applet; - @ObfuscatedName("v") - static String field454; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1207214855 - ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("eb") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - - static { - applet = null; // L: 10 - field454 = ""; // L: 11 - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-125" - ) - public static void method967() { - synchronized(MouseHandler.MouseHandler_instance) { // L: 43 - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 44 - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 45 - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 46 - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 47 - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 48 - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 49 - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 50 - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 51 - MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 52 - } - } // L: 54 - - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-291804616" - ) - static final int method972(int var0, int var1, int var2) { - int var3 = var0 / var2; // L: 522 - int var4 = var0 & var2 - 1; // L: 523 - int var5 = var1 / var2; // L: 524 - int var6 = var1 & var2 - 1; // L: 525 - int var7 = class69.method1259(var3, var5); // L: 526 - int var8 = class69.method1259(var3 + 1, var5); // L: 527 - int var9 = class69.method1259(var3, var5 + 1); // L: 528 - int var10 = class69.method1259(var3 + 1, var5 + 1); // L: 529 - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 532 - int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 533 - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 538 - int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 539 - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 544 - int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 545 - return var15; // L: 547 - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - descriptor = "(Lhz;B)I", - garbageValue = "81" - ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11482 - return var1 != null ? var1.integer : var0.flags; // L: 11483 11484 - } -} diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index 134f73630d..607ea67fe5 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -1,144 +1,181 @@ 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("be") +@ObfuscatedName("bv") public class class69 { - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "Ljc;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; + @Export("reflectionChecks") + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("g") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("hz") + @ObfuscatedGetter( + intValue = -1660652965 + ) + @Export("cameraYaw") + static int cameraYaw; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)[Liv;", - garbageValue = "-52" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3132, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman}; // L: 20 + static { + reflectionChecks = new IterableNodeDeque(); // L: 17 } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Lig;Lig;Lig;Lgg;I)Z", - garbageValue = "1829730902" + descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-2099962248" ) - public static boolean method1256(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class206.musicPatchesArchive = var0; // L: 26 - class206.musicSamplesArchive = var1; // L: 27 - class206.soundEffectsArchive = var2; // L: 28 - VertexNormal.midiPcmStream = var3; // L: 29 - return true; // L: 30 - } + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + Projectile.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(Llg;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1852545433" + descriptor = "(I)V", + garbageValue = "-798312209" ) - static String method1258(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { // L: 33 - return var2; + static void method1166() { + class9.field69 = null; // L: 48 + Tiles.field1092 = null; // L: 49 + Tiles.field1091 = null; // L: 50 + class362.field4079 = null; // L: 51 + MidiPcmStream.field2489 = null; // L: 52 + SecureRandomCallable.field1106 = null; // L: 53 + WorldMapLabelSize.field1570 = null; // L: 54 + Tiles.Tiles_hue = null; // L: 55 + Tiles.Tiles_saturation = null; // L: 56 + Tiles.Tiles_lightness = null; // L: 57 + GrandExchangeOfferOwnWorldComparator.Tiles_hueMultiplier = null; // L: 58 + class375.field4136 = null; // L: 59 + } // L: 60 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-75599229" + ) + public static int method1168(CharSequence var0) { + boolean var2 = false; // L: 70 + boolean var3 = false; // L: 71 + int var4 = 0; // L: 72 + int var5 = var0.length(); // L: 73 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 74 + char var7 = var0.charAt(var6); // L: 75 + if (var6 == 0) { // L: 76 + if (var7 == '-') { // L: 77 + var2 = true; // L: 78 + continue; + } + + if (var7 == '+') { // L: 81 + continue; + } + } + + int var9; + if (var7 >= '0' && var7 <= '9') { // L: 83 + var9 = var7 - '0'; + } else if (var7 >= 'A' && var7 <= 'Z') { // L: 84 + var9 = var7 - '7'; + } else { + if (var7 < 'a' || var7 > 'z') { // L: 85 + throw new NumberFormatException(); // L: 86 + } + + var9 = var7 - 'W'; + } + + if (var9 >= 10) { // L: 87 + throw new NumberFormatException(); + } + + if (var2) { // L: 88 + var9 = -var9; + } + + int var8 = var9 + var4 * 10; // L: 89 + if (var4 != var8 / 10) { // L: 90 + throw new NumberFormatException(); + } + + var4 = var8; // L: 91 + var3 = true; // L: 92 + } + + if (!var3) { // L: 94 + throw new NumberFormatException(); } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 34 - return var3 == null ? var2 : (String)var3.obj; // L: 35 36 + return var4; // L: 97 } } - @ObfuscatedName("v") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lig;Lig;ZII)V", - garbageValue = "463524240" + descriptor = "(II)Z", + garbageValue = "-582278156" ) - static void method1255(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { // L: 128 - if (var3 == 4) { // L: 129 - Login.loginIndex = 4; // L: 130 - } + public static boolean method1165(int var0) { + return (var0 >> 29 & 1) != 0; // L: 33 + } - } else { - Login.loginIndex = var3; // L: 134 - Rasterizer2D.Rasterizer2D_clear(); // L: 135 - byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 136 - Login.leftTitleSprite = WorldMapRectangle.convertJpgToSprite(var4); // L: 137 - Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); // L: 138 - int var5 = Client.worldProperties; // L: 139 - if ((var5 & 536870912) != 0) { // L: 141 - Login.logoSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); // L: 142 - } else if ((var5 & 1073741824) != 0) { // L: 144 - Login.logoSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); // L: 145 - } else { - Login.logoSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 148 - } - - GrandExchangeOfferNameComparator.titleboxSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 151 - InterfaceParent.titlebuttonSprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 152 - Login.runesSprite = MilliClock.method3664(var1, "runes", ""); // L: 153 - Login.title_muteSprite = MilliClock.method3664(var1, "title_mute", ""); // L: 154 - options_buttons_0Sprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 155 - UrlRequester.field1956 = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 156 - Login.options_buttons_2Sprite = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 157 - WorldMapDecoration.field237 = ChatChannel.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 158 - WorldMapDecoration.field235 = options_buttons_0Sprite.subWidth; // L: 159 - MouseHandler.field512 = options_buttons_0Sprite.subHeight; // L: 160 - class9.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 161 - if (var2) { // L: 162 - Login.Login_username = ""; // L: 163 - Login.Login_password = ""; // L: 164 - } - - Canvas.field439 = 0; // L: 166 - class1.otp = ""; // L: 167 - Login.field1217 = true; // L: 168 - Login.worldSelectOpen = false; // L: 169 - if (!WorldMapSectionType.clientPreferences.titleMusicDisabled) { // L: 170 - Archive var6 = UrlRequester.archive6; // L: 171 - int var7 = var6.getGroupId("scape main"); // L: 173 - int var8 = var6.getFileId(var7, ""); // L: 174 - GrandExchangeOfferOwnWorldComparator.method1376(2, var6, var7, var8, 255, false); // L: 175 - } else { - class206.musicPlayerStatus = 1; // L: 179 - class206.musicTrackArchive = null; // L: 180 - class206.musicTrackGroupId = -1; // L: 181 - SoundSystem.musicTrackFileId = -1; // L: 182 - DevicePcmPlayerProvider.musicTrackVolume = 0; // L: 183 - class206.musicTrackBoolean = false; // L: 184 - class7.pcmSampleLength = 2; // L: 185 - } - - Actor.method1867(false); // L: 187 - Login.clearLoginScreen = true; // L: 188 - Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2; // L: 189 - Login.loginBoxX = Login.xPadding + 202; // L: 190 - GraphicsObject.loginBoxCenter = Login.loginBoxX + 180; // L: 191 - Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 192 - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 193 - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); // L: 194 - } - } // L: 132 195 - - @ObfuscatedName("z") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-912600065" + descriptor = "(CB)Z", + garbageValue = "-30" ) @Export("isCharAlphabetic") public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 147 + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 168 } - @ObfuscatedName("b") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "57" + descriptor = "(ILcc;ZI)I", + garbageValue = "1950994133" ) - static final int method1259(int var0, int var1) { - int var2 = WorldMapSectionType.method320(var0 - 1, var1 - 1) + WorldMapSectionType.method320(var0 + 1, var1 - 1) + WorldMapSectionType.method320(var0 - 1, 1 + var1) + WorldMapSectionType.method320(var0 + 1, 1 + var1); // L: 551 - int var3 = WorldMapSectionType.method320(var0 - 1, var1) + WorldMapSectionType.method320(1 + var0, var1) + WorldMapSectionType.method320(var0, var1 - 1) + WorldMapSectionType.method320(var0, var1 + 1); // L: 552 - int var4 = WorldMapSectionType.method320(var0, var1); // L: 553 - return var2 / 16 + var3 / 8 + var4 / 4; // L: 554 + static int method1169(int var0, Script var1, boolean var2) { + Widget var3 = class139.getWidget(Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]); // L: 1251 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1252 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.x; // L: 1253 + return 1; // L: 1254 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1256 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.y; // L: 1257 + return 1; // L: 1258 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1260 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.width; // L: 1261 + return 1; // L: 1262 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1264 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.height; // L: 1265 + return 1; // L: 1266 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1268 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1269 + return 1; // L: 1270 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1272 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.parentId; // L: 1273 + return 1; // L: 1274 + } else { + return 2; // L: 1276 + } + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1186664585" + ) + static String method1164(int var0) { + if (var0 < 0) { // L: 9049 + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 9050 9051 + } } } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 7f7f108e87..f9511e5e72 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -1,113 +1,589 @@ +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.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") -public enum class7 implements Enumerated { - @ObfuscatedName("n") +@ObfuscatedName("g") +public class class7 extends class16 { + @ObfuscatedName("f") + String field53; + @ObfuscatedName("o") + byte field54; + @ObfuscatedName("u") + byte field55; + // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Le;" + descriptor = "Lx;" ) - field41(0, 0); + final class19 this$0; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 324550527 - ) - @Export("pcmSampleLength") - public static int pcmSampleLength; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 501713391 - ) - static int field35; - @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Lly;" + descriptor = "(Lx;)V" ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -997715077 - ) - public final int field36; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -1130896925 - ) - final int field37; - - class7(int var3, int var4) { - this.field36 = var3; // L: 16 - this.field37 = var4; - } // L: 18 - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "63" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.field37; // L: 21 + class7(class19 var1) { + this.this$0 = var1; } - @ObfuscatedName("n") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)[Lgs;", - garbageValue = "2004297055" + descriptor = "(Lnu;I)V", + garbageValue = "-1239860939" ) - public static class194[] method85() { - return new class194[]{class194.field2348, class194.field2354, class194.field2347, class194.field2356, class194.field2350, class194.field2351, class194.field2352, class194.field2353, class194.field2346, class194.field2355}; // L: 17 + void vmethod356(Buffer var1) { + this.field53 = var1.readStringCp1252NullTerminatedOrNull(); + if (this.field53 != null) { + var1.readUnsignedByte(); // L: 159 + this.field54 = var1.readByte(); + this.field55 = var1.readByte(); + } + + } // L: 163 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lp;I)V", + garbageValue = "1583378087" + ) + void vmethod352(class3 var1) { + var1.field25 = this.field53; + if (this.field53 != null) { + var1.field31 = this.field54; + var1.field30 = this.field55; + } + } - @ObfuscatedName("hi") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "-63" + descriptor = "(ILjava/lang/String;Ljh;IB)Lgy;", + garbageValue = "-76" ) - static void method83(int var0, String var1) { - int var2 = Players.Players_count; // L: 8818 - int[] var3 = Players.Players_indices; // L: 8819 - boolean var4 = false; // L: 8820 - Username var5 = new Username(var1, Message.loginType); // L: 8821 - - for (int var6 = 0; var6 < var2; ++var6) { // L: 8822 - Player var7 = Client.players[var3[var6]]; // L: 8823 - if (var7 != null && var7 != UserComparator9.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8824 - PacketBufferNode var8; - if (var0 == 1) { // L: 8825 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 8827 - var8.packetBuffer.writeShortLE(var3[var6]); // L: 8828 - var8.packetBuffer.method5931(0); // L: 8829 - Client.packetWriter.addNode(var8); // L: 8830 - } else if (var0 == 4) { // L: 8832 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 8834 - var8.packetBuffer.writeShortLE(var3[var6]); // L: 8835 - var8.packetBuffer.method5931(0); // L: 8836 - Client.packetWriter.addNode(var8); // L: 8837 - } else if (var0 == 6) { // L: 8839 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); // L: 8841 - var8.packetBuffer.writeShort(var3[var6]); // L: 8842 - var8.packetBuffer.writeByte(0); // L: 8843 - Client.packetWriter.addNode(var8); // L: 8844 - } else if (var0 == 7) { // L: 8846 - var8 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); // L: 8848 - var8.packetBuffer.method5883(0); // L: 8849 - var8.packetBuffer.writeIntME(var3[var6]); // L: 8850 - Client.packetWriter.addNode(var8); // L: 8851 - } - - var4 = true; // L: 8853 - break; + public static PacketBufferNode method100(int var0, String var1, Language var2, int var3) { + PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(ClientPacket.field2235, 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:")) { + var7 = 11; + var1 = var1.substring("glow3:".length()); + } else if (var2 != Language.Language_EN) { // L: 71 + 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:")) { // L: 80 + 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:")) { // L: 92 + var7 = 5; + var1 = var1.substring("white:".length()); // L: 94 + } else if (var6.startsWith("flash1:")) { + var7 = 6; + var1 = var1.substring("flash1:".length()); + } else if (var6.startsWith("flash2:")) { + var7 = 7; + var1 = var1.substring("flash2:".length()); // L: 102 + } else if (var6.startsWith("flash3:")) { + var7 = 8; + var1 = var1.substring("flash3:".length()); // L: 106 + } else if (var6.startsWith("glow1:")) { + var7 = 9; + var1 = var1.substring("glow1:".length()); // L: 110 + } else if (var6.startsWith("glow2:")) { + var7 = 10; // L: 113 + var1 = var1.substring("glow2:".length()); + } else if (var6.startsWith("glow3:")) { + var7 = 11; // L: 117 + var1 = var1.substring("glow3:".length()); // L: 118 } } - if (!var4) { // L: 8857 - AbstractWorldMapData.addGameMessage(4, "", "Unable to find " + var1); + 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 + } } - } // L: 8858 + var4.packetBuffer.writeByte(var7); // L: 165 + var4.packetBuffer.writeByte(var8); // L: 166 + class2.method34(var4.packetBuffer, var1); // L: 167 + if (var0 == class232.field2808.rsOrdinal()) { // L: 168 + var4.packetBuffer.writeByte(var3); // L: 169 + } + + var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171 + return var4; // L: 172 + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "1261631339" + ) + static String method107(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { // L: 67 + RunException var2 = (RunException)var0; // L: 68 + var1 = var2.message + " | "; // L: 69 + var0 = var2.throwable; // L: 70 + } else { + var1 = ""; // L: 72 + } + + StringWriter var12 = new StringWriter(); // L: 73 + PrintWriter var3 = new PrintWriter(var12); // L: 74 + var0.printStackTrace(var3); // L: 75 + var3.close(); // L: 76 + String var4 = var12.toString(); // L: 77 + BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78 + String var6 = var5.readLine(); // L: 79 + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); // L: 84 + if (var8 >= 0 && var9 >= 0) { // L: 85 + 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; // L: 91 + } + + var7 = var7.substring(0, var8); // L: 93 + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97 + var1 = var1 + var7 + ' '; // L: 98 + } + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "([BIIIIIII[Lel;I)V", + garbageValue = "1168682149" + ) + static final void method104(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: 81 + for (var10 = 0; var10 < 8; ++var10) { // L: 82 + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { // L: 83 + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var10 + var3] &= -16777217; + } + } + } + + Buffer var20 = new Buffer(var0); // L: 86 + + for (var10 = 0; var10 < 4; ++var10) { // L: 87 + for (int var11 = 0; var11 < 64; ++var11) { // L: 88 + for (int var12 = 0; var12 < 64; ++var12) { // L: 89 + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 90 + int var17 = var11 & 7; // L: 95 + int var18 = var12 & 7; // L: 96 + int var19 = var7 & 3; // L: 99 + int var16; + if (var19 == 0) { // L: 100 + var16 = var17; // L: 101 + } else if (var19 == 1) { // L: 104 + var16 = var18; // L: 105 + } else if (var19 == 2) { // L: 108 + var16 = 7 - var17; // L: 109 + } else { + var16 = 7 - var18; // L: 112 + } + + WorldMapData_1.loadTerrain(var20, var1, var16 + var2, var3 + WorldMapSection0.method3058(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 114 + } else { + WorldMapData_1.loadTerrain(var20, 0, -1, -1, 0, 0, 0); // L: 116 + } + } + } + } + + } // L: 120 + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "875003793" + ) + @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: 6897 + if (Client.isLowDetail && var0 != class26.Client_plane) { // L: 6898 + return; + } + + long var7 = 0L; // L: 6899 + boolean var9 = true; // L: 6900 + boolean var10 = false; // L: 6901 + boolean var11 = false; // L: 6902 + if (var1 == 0) { // L: 6903 + var7 = WorldMapArea.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 6904 + var7 = WorldMapArea.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 6905 + var7 = WorldMapArea.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 6906 + var7 = WorldMapArea.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (0L != var7) { // L: 6907 + var12 = WorldMapArea.scene.getObjectFlags(var0, var2, var3, var7); // L: 6908 + int var38 = WorldMapSection1.Entity_unpackID(var7); // L: 6909 + int var39 = var12 & 31; // L: 6910 + int var40 = var12 >> 6 & 3; // L: 6911 + ObjectComposition var13; + if (var1 == 0) { // L: 6912 + WorldMapArea.scene.removeBoundaryObject(var0, var2, var3); // L: 6913 + var13 = class19.getObjectDefinition(var38); // L: 6914 + if (var13.interactType != 0) { // L: 6915 + Client.collisionMaps[var0].method2616(var2, var3, var39, var40, var13.boolean1); + } + } + + if (var1 == 1) { // L: 6917 + WorldMapArea.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 6918 + WorldMapArea.scene.removeGameObject(var0, var2, var3); // L: 6919 + var13 = class19.getObjectDefinition(var38); // L: 6920 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 6921 + return; + } + + if (var13.interactType != 0) { // L: 6922 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var40, var13.boolean1); + } + } + + if (var1 == 3) { // L: 6924 + WorldMapArea.scene.removeFloorDecoration(var0, var2, var3); // L: 6925 + var13 = class19.getObjectDefinition(var38); // L: 6926 + if (var13.interactType == 1) { // L: 6927 + Client.collisionMaps[var0].method2621(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 6930 + var12 = var0; // L: 6931 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 6932 + var12 = var0 + 1; + } + + Scene var41 = WorldMapArea.scene; // L: 6933 + CollisionMap var14 = Client.collisionMaps[var0]; // L: 6934 + ObjectComposition var15 = class19.getObjectDefinition(var4); // L: 6936 + int var16; + int var17; + if (var5 != 1 && var5 != 3) { // L: 6939 + var16 = var15.sizeX; // L: 6944 + var17 = var15.sizeY; // L: 6945 + } else { + var16 = var15.sizeY; // L: 6940 + var17 = var15.sizeX; // L: 6941 + } + + int var18; + int var19; + if (var16 + var2 <= 104) { // L: 6951 + var18 = (var16 >> 1) + var2; // L: 6952 + var19 = var2 + (var16 + 1 >> 1); // L: 6953 + } else { + var18 = var2; // L: 6956 + var19 = var2 + 1; // L: 6957 + } + + int var20; + int var21; + if (var3 + var17 <= 104) { // L: 6959 + var20 = var3 + (var17 >> 1); // L: 6960 + var21 = var3 + (var17 + 1 >> 1); // L: 6961 + } else { + var20 = var3; // L: 6964 + var21 = var3 + 1; // L: 6965 + } + + int[][] var22 = Tiles.Tiles_heights[var12]; // L: 6967 + int var23 = var22[var19][var21] + var22[var19][var20] + var22[var18][var20] + var22[var18][var21] >> 2; // L: 6968 + int var24 = (var2 << 7) + (var16 << 6); // L: 6969 + int var25 = (var3 << 7) + (var17 << 6); // L: 6970 + long var26 = AttackOption.calculateTag(var2, var3, 2, var15.int1 == 0, var4); // L: 6971 + int var28 = (var5 << 6) + var6; // L: 6972 + if (var15.int3 == 1) { // L: 6973 + var28 += 256; + } + + Object var36; + if (var6 == 22) { // L: 6974 + if (var15.animationId == -1 && var15.transforms == null) { // L: 6976 + var36 = var15.getModel(22, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 6977 + } + + var41.newFloorDecoration(var0, var2, var3, var23, (Renderable)var36, var26, var28); // L: 6978 + if (var15.interactType == 1) { // L: 6979 + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { // L: 6982 + if (var6 >= 12) { // L: 6990 + if (var15.animationId == -1 && var15.transforms == null) { // L: 6992 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 6993 + } + + var41.method3445(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 6994 + if (var15.interactType != 0) { // L: 6995 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { // L: 6998 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7000 + var36 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7001 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1094[var5], 0, var26, var28); // L: 7002 + if (var15.interactType != 0) { // L: 7003 + var14.method2613(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { // L: 7006 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7008 + var36 = var15.getModel(1, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7009 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1098[var5], 0, var26, var28); // L: 7010 + if (var15.interactType != 0) { // L: 7011 + var14.method2613(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var29; + if (var6 == 2) { // L: 7014 + var29 = var5 + 1 & 3; // L: 7015 + Object var31; + Object var37; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7018 + var37 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); // L: 7019 + var31 = var15.getModel(2, var29, var22, var24, var23, var25); // L: 7020 + } else { + var37 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7023 + var31 = new DynamicObject(var4, 2, var29, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7024 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var37, (Renderable)var31, Tiles.field1094[var5], Tiles.field1094[var29], var26, var28); // L: 7026 + if (var15.interactType != 0) { // L: 7027 + var14.method2613(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { // L: 7030 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7032 + var36 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7033 + } + + var41.newBoundaryObject(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1098[var5], 0, var26, var28); // L: 7034 + if (var15.interactType != 0) { // L: 7035 + var14.method2613(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { // L: 7038 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7040 + var36 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7041 + } + + var41.method3445(var0, var2, var3, var23, 1, 1, (Renderable)var36, 0, var26, var28); // L: 7042 + if (var15.interactType != 0) { // L: 7043 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { // L: 7046 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7048 + var36 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7049 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, Tiles.field1094[var5], 0, 0, 0, var26, var28); // L: 7050 + } else { + long var30; + Object var32; + if (var6 == 5) { // L: 7053 + var29 = 16; // L: 7054 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7055 + if (var30 != 0L) { // L: 7056 + var29 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var30)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7058 + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7059 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, Tiles.field1094[var5], 0, var29 * Tiles.field1097[var5], var29 * Tiles.field1100[var5], var26, var28); // L: 7060 + } else if (var6 == 6) { // L: 7063 + var29 = 8; // L: 7064 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7065 + if (0L != var30) { // L: 7066 + var29 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var30)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { // L: 7068 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7069 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)null, 256, var5, var29 * Tiles.field1101[var5], var29 * Tiles.field1099[var5], var26, var28); // L: 7070 + } else if (var6 == 7) { // L: 7073 + int var35 = var5 + 2 & 3; // L: 7075 + if (var15.animationId == -1 && var15.transforms == null) { // L: 7076 + var36 = var15.getModel(4, var35 + 4, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 4, var35 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7077 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var36, (Renderable)null, 256, var35, 0, 0, var26, var28); // L: 7078 + } else if (var6 == 8) { // L: 7081 + var29 = 8; // L: 7082 + var30 = var41.getBoundaryObjectTag(var0, var2, var3); // L: 7083 + if (var30 != 0L) { // L: 7084 + var29 = class19.getObjectDefinition(WorldMapSection1.Entity_unpackID(var30)).int2 / 2; + } + + int var34 = var5 + 2 & 3; // L: 7087 + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { // L: 7088 + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); // L: 7089 + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); // L: 7090 + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7093 + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 7094 + } + + var41.newWallDecoration(var0, var2, var3, var23, (Renderable)var32, (Renderable)var33, 256, var5, var29 * Tiles.field1101[var5], var29 * Tiles.field1099[var5], var26, var28); // L: 7096 + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { // L: 6984 + var36 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var36 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, var15.field3621, (Renderable)null); // L: 6985 + } + + if (var36 != null) { // L: 6986 + var41.method3445(var0, var2, var3, var23, var16, var17, (Renderable)var36, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { // L: 6987 + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } + } + } + + } // L: 7101 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 2151941165..a3436fda51 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,87 +1,58 @@ -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") -public class class8 implements Callable { - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 880738975 - ) - static int field45; - @ObfuscatedName("z") +@ObfuscatedName("h") +public class class8 extends class14 { + @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "Lig;" ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("du") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "Liy;" + @Export("archive6") + static Archive archive6; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = -996189269817114369L ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lkx;" - ) - final Buffer field48; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "La;" - ) - final class12 field44; + long field58; + @ObfuscatedName("o") + String field60; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Ll;" + descriptor = "Lu;" ) - final class9 this$0; + final class2 this$0; @ObfuscatedSignature( - descriptor = "(Ll;Lkx;La;)V" + descriptor = "(Lu;)V" ) - class8(class9 var1, Buffer var2, class12 var3) { - this.this$0 = var1; // L: 47 - this.field48 = var2; // L: 48 - this.field44 = var3; // L: 49 - } // L: 50 + class8(class2 var1) { + this.this$0 = var1; + this.field58 = -1L; // L: 74 + this.field60 = null; // L: 75 + } // L: 77 - public Object call() { - return this.field44.vmethod120(this.field48); // L: 53 - } - - @ObfuscatedName("z") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1606674389" + descriptor = "(Lnu;I)V", + garbageValue = "-1383981708" ) - static void method88() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 245 - Login.currentLoginField = 1; // L: 246 - } else { - Login.currentLoginField = 0; // L: 249 + void vmethod371(Buffer var1) { + if (var1.readUnsignedByte() != 255) { // L: 80 + --var1.offset; // L: 81 + this.field58 = var1.readLong(); // L: 82 } - } // L: 251 + this.field60 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84 + } // L: 85 - @ObfuscatedName("fc") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1683075564" + descriptor = "(Lm;I)V", + garbageValue = "-1475503816" ) - static final void method90() { - if (Client.logoutTimer > 0) { // L: 2639 - SecureRandomCallable.logOut(); // L: 2640 - } else { - Client.timer.method5206(); // L: 2643 - ItemContainer.updateGameState(40); // L: 2644 - UserComparator6.field2008 = Client.packetWriter.getSocket(); // L: 2645 - Client.packetWriter.removeSocket(); // L: 2646 - } - } // L: 2641 2647 + void vmethod376(class11 var1) { + var1.method146(this.field58, this.field60, 0); // L: 88 + } // L: 89 } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java new file mode 100644 index 0000000000..192a0277bb --- /dev/null +++ b/runescape-client/src/main/java/class80.java @@ -0,0 +1,62 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.math.BigInteger; +import java.util.Iterator; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("co") +public class class80 { + @ObfuscatedName("b") + static final BigInteger field965; + @ObfuscatedName("e") + static final BigInteger field964; + + static { + field965 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field964 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "1" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 547 + if (class21.garbageCollector == null || !class21.garbageCollector.isValid()) { // L: 548 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 550 + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 551 + if (var2.isValid()) { // L: 553 + class21.garbageCollector = var2; // L: 554 + GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 555 + GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 556 + } + } + } catch (Throwable var11) { // L: 561 + } + } + + if (class21.garbageCollector != null) { // L: 563 + long var9 = ObjectSound.currentTimeMillis(); // L: 564 + long var3 = class21.garbageCollector.getCollectionTime(); // L: 565 + if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 566 + long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 567 + long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 568 + if (var7 != 0L) { // L: 569 + var0 = (int)(var5 * 100L / var7); + } + } + + GameEngine.garbageCollectorLastCollectionTime = var3; // L: 571 + GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 572 + } + + return var0; // L: 574 + } +} diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java new file mode 100644 index 0000000000..1f74ea9516 --- /dev/null +++ b/runescape-client/src/main/java/class82.java @@ -0,0 +1,211 @@ +import java.math.BigInteger; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("cp") +public class class82 { + @ObfuscatedName("f") + static final BigInteger field983; + @ObfuscatedName("o") + static final BigInteger field982; + + static { + field983 = new BigInteger("10001", 16); // L: 6 + field982 = new BigInteger("db1dc3067a0e86b4ab98b9ac9b5b63c8c4981b479a87444e15b890655ad1aed0c16d9e923d9f8742cb779d26d01e9fc0335277a63f3d5d290b3197201f8da3a906a88e147cb818ce1712f76ba6cdd796c3802e14a2c7f7834391703c81e923733301425d60a1a972e72806439d82d77cf3cc274125e7046d41a25e2376cffb8f", 16); // L: 7 + } + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-489476877" + ) + static void method1924() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 + } + + } // L: 147 + + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "1857383054" + ) + static int method1923(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + } + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "1669467265" + ) + static int method1922(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.ADD) { // L: 2750 + class16.Interpreter_intStackSize -= 2; // L: 2751 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2752 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2753 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4 + var9; // L: 2754 + return 1; // L: 2755 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2757 + class16.Interpreter_intStackSize -= 2; // L: 2758 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2759 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2760 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 - var4; // L: 2761 + return 1; // L: 2762 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2764 + class16.Interpreter_intStackSize -= 2; // L: 2765 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2766 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2767 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var4 * var9; // L: 2768 + return 1; // L: 2769 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2771 + class16.Interpreter_intStackSize -= 2; // L: 2772 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2773 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2774 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 / var4; // L: 2775 + return 1; // L: 2776 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2778 + var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2779 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var9); // L: 2780 + return 1; // L: 2781 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2783 + var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2784 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var9 + 1)); // L: 2785 + return 1; // L: 2786 + } else if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2788 + class16.Interpreter_intStackSize -= 5; // L: 2789 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2790 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2791 + int var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2792 + int var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3]; // L: 2793 + int var11 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 4]; // L: 2794 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 + (var11 - var10) * (var4 - var9) / (var6 - var10); // L: 2795 + return 1; // L: 2796 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2798 + class16.Interpreter_intStackSize -= 2; // L: 2799 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2800 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2801 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 + var4 * var9 / 100; // L: 2802 + return 1; // L: 2803 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2805 + class16.Interpreter_intStackSize -= 2; // L: 2806 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2807 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2808 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 | 1 << var4; // L: 2809 + return 1; // L: 2810 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2812 + class16.Interpreter_intStackSize -= 2; // L: 2813 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2814 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2815 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 & -1 - (1 << var4); // L: 2816 + return 1; // L: 2817 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2819 + class16.Interpreter_intStackSize -= 2; // L: 2820 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2821 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2822 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (var9 & 1 << var4) != 0 ? 1 : 0; // L: 2823 + return 1; // L: 2824 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2826 + class16.Interpreter_intStackSize -= 2; // L: 2827 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2828 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2829 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 % var4; // L: 2830 + return 1; // L: 2831 + } else if (var0 == ScriptOpcodes.POW) { // L: 2833 + class16.Interpreter_intStackSize -= 2; // L: 2834 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2835 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2836 + if (var9 == 0) { // L: 2837 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, (double)var4); // L: 2838 + } + + return 1; // L: 2839 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2841 + class16.Interpreter_intStackSize -= 2; // L: 2842 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2843 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2844 + if (var9 == 0) { // L: 2845 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 2846 + return 1; // L: 2847 + } else { + switch(var4) { // L: 2849 + case 0: + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2862 + break; // L: 2863 + case 1: + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9; // L: 2857 + break; // L: 2858 + case 2: + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var9); // L: 2872 + break; // L: 2873 + case 3: + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var9); // L: 2867 + break; // L: 2868 + case 4: + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var9)); // L: 2852 + break; + default: + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, 1.0D / (double)var4); // L: 2877 + } + + return 1; // L: 2881 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 2883 + class16.Interpreter_intStackSize -= 2; // L: 2884 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2885 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2886 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 & var4; // L: 2887 + return 1; // L: 2888 + } else if (var0 == ScriptOpcodes.OR) { // L: 2890 + class16.Interpreter_intStackSize -= 2; // L: 2891 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2892 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2893 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9 | var4; // L: 2894 + return 1; // L: 2895 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2897 + class16.Interpreter_intStackSize -= 3; // L: 2898 + long var3 = (long)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2899 + long var5 = (long)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2900 + long var7 = (long)Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 2901 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = (int)(var7 * var3 / var5); // L: 2902 + return 1; // L: 2903 + } else { + return 2; // L: 2905 + } + } +} diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java deleted file mode 100644 index 30ecb32312..0000000000 --- a/runescape-client/src/main/java/class89.java +++ /dev/null @@ -1,28 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cz") -public class class89 { - @ObfuscatedName("y") - static final BigInteger field1155; - @ObfuscatedName("h") - static final BigInteger field1154; - - static { - field1155 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 - field1154 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(III)Lbd;", - garbageValue = "-1373661566" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 - return var2.getMessage(var1); // L: 36 - } -} diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index ac97d383cd..90d970e1a4 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -1,787 +1,509 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("l") +@ObfuscatedName("n") public class class9 { - @ObfuscatedName("sc") + @ObfuscatedName("p") + static byte[][][] field69; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "[Lbu;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("es") @ObfuscatedGetter( - longValue = 3250818225276468935L + intValue = 2080333627 ) - static long field57; - @ObfuscatedName("k") + static int field63; + @ObfuscatedName("or") @ObfuscatedSignature( - descriptor = "Lcb;" + descriptor = "Ldw;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("n") - ExecutorService field56; - @ObfuscatedName("v") - Future field53; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lkx;" + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("f") + public byte field66; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -580001667 ) - final Buffer field58; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "La;" - ) - final class12 field55; + public int field64; + @ObfuscatedName("u") + public String field65; - @ObfuscatedSignature( - descriptor = "(Lkx;La;)V" - ) - public class9(Buffer var1, class12 var2) { - this.field56 = Executors.newSingleThreadExecutor(); // L: 10 - this.field58 = var1; // L: 16 - this.field55 = var2; // L: 17 - this.method92(); // L: 18 - } // L: 19 + class9() { + } // L: 8 - @ObfuscatedName("n") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-807097054" + descriptor = "(B)I", + garbageValue = "-1" ) - public boolean method108() { - return this.field53.isDone(); // L: 22 + public static int method125() { + return KeyHandler.KeyHandler_idleCycles; // L: 187 } - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1213783874" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;S)V", + garbageValue = "-17407" ) - public void method93() { - this.field56.shutdown(); // L: 26 - this.field56 = null; // L: 27 - } // L: 28 + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1256 + Login.Login_response2 = var1; // L: 1257 + Login.Login_response3 = var2; // L: 1258 + } // L: 1259 - @ObfuscatedName("d") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(I)Lkx;", - garbageValue = "808914251" + descriptor = "(ILcc;ZI)I", + garbageValue = "1816679495" ) - public Buffer method94() { - try { - return (Buffer)this.field53.get(); // L: 32 - } catch (Exception var2) { // L: 34 - return null; // L: 35 - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2058592191" - ) - void method92() { - this.field53 = this.field56.submit(new class8(this, this.field58, this.field55)); // L: 40 - } // L: 41 - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lbt;I)V", - garbageValue = "-1405869501" - ) - @Export("doCycleTitle") - static void doCycleTitle(GameEngine var0) { - if (Login.worldSelectOpen) { // L: 254 - WorldMapID.method646(var0); // L: 255 + static int method120(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2909 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2910 + var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2911 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2912 + return 1; // L: 2913 } else { - int var3; - if ((MouseHandler.MouseHandler_lastButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 258 - WorldMapSectionType.clientPreferences.titleMusicDisabled = !WorldMapSectionType.clientPreferences.titleMusicDisabled; // L: 259 - class23.savePreferences(); // L: 260 - if (!WorldMapSectionType.clientPreferences.titleMusicDisabled) { // L: 261 - Archive var1 = UrlRequester.archive6; // L: 262 - int var2 = var1.getGroupId("scape main"); // L: 264 - var3 = var1.getFileId(var2, ""); // L: 265 - ReflectionCheck.method2450(var1, var2, var3, 255, false); // L: 266 - } else { - ScriptEvent.method1272(); // L: 269 - } - } - - if (Client.gameState != 5) { // L: 271 - if (-1L == Login.field1213) { // L: 272 - Login.field1213 = Tiles.currentTimeMillis() + 1000L; // L: 273 - } - - long var20 = Tiles.currentTimeMillis(); // L: 275 - if (VarpDefinition.method4552() && -1L == Login.field1226) { // L: 276 277 - Login.field1226 = var20; // L: 278 - if (Login.field1226 > Login.field1213) { // L: 279 - Login.field1213 = Login.field1226; // L: 280 - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { // L: 284 - if (Language.Language_EN == NPCComposition.clientLanguage) { // L: 285 - if (MouseHandler.MouseHandler_lastButton == 1 || !class8.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 286 - var3 = Login.xPadding + 5; // L: 287 - short var4 = 463; // L: 288 - byte var5 = 100; // L: 289 - byte var6 = 35; // L: 290 - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) { // L: 291 - Decimator.method2704(); // L: 292 - return; // L: 293 - } - } - - if (UserComparator9.World_request != null) { // L: 296 - Decimator.method2704(); - } - } - - var3 = MouseHandler.MouseHandler_lastButton; // L: 298 - int var30 = MouseHandler.MouseHandler_lastPressedX; // L: 299 - int var31 = MouseHandler.MouseHandler_lastPressedY; // L: 300 - if (var3 == 0) { // L: 301 - var30 = MouseHandler.MouseHandler_x; // L: 302 - var31 = MouseHandler.MouseHandler_y; // L: 303 - } - - if (!class8.mouseCam && var3 == 4) { // L: 305 - var3 = 1; - } - - short var34; - int var35; - if (Login.loginIndex == 0) { // L: 306 - boolean var39 = false; // L: 307 - - while (Varcs.isKeyDown()) { // L: 308 - if (ModeWhere.field2417 == 84) { // L: 309 - var39 = true; // L: 310 - } - } - - var35 = GraphicsObject.loginBoxCenter - 80; // L: 313 - var34 = 291; // L: 314 - if (var3 == 1 && var30 >= var35 - 75 && var30 <= var35 + 75 && var31 >= var34 - 20 && var31 <= var34 + 20) { // L: 315 - WorldMapRectangle.openURL(GrandExchangeOfferNameComparator.method209("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 316 - } - - var35 = GraphicsObject.loginBoxCenter + 80; // L: 318 - if (var3 == 1 && var30 >= var35 - 75 && var30 <= var35 + 75 && var31 >= var34 - 20 && var31 <= var34 + 20 || var39) { // L: 319 - if ((Client.worldProperties & 33554432) != 0) { // L: 320 - Login.Login_response0 = ""; // L: 321 - Login.Login_response1 = "This is a Beta world."; // L: 322 - Login.Login_response2 = "Your normal account will not be affected."; // L: 323 - Login.Login_response3 = ""; // L: 324 - Login.loginIndex = 1; // L: 325 - class8.method88(); // L: 326 - } else if ((Client.worldProperties & 4) != 0) { // L: 328 - if ((Client.worldProperties & 1024) != 0) { // L: 329 - Login.Login_response1 = "This is a High Risk PvP world."; // L: 330 - Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 331 - Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 332 - } else { - Login.Login_response1 = "This is a PvP world."; // L: 335 - Login.Login_response2 = "Players can attack each other"; // L: 336 - Login.Login_response3 = "almost everywhere."; // L: 337 - } - - Login.Login_response0 = "Warning!"; // L: 339 - Login.loginIndex = 1; // L: 340 - class8.method88(); // L: 341 - } else if ((Client.worldProperties & 1024) != 0) { // L: 343 - Login.Login_response1 = "This is a High Risk world."; // L: 344 - Login.Login_response2 = "The Protect Item prayer will"; // L: 345 - Login.Login_response3 = "not work on this world."; // L: 346 - Login.Login_response0 = "Warning!"; // L: 347 - Login.loginIndex = 1; // L: 348 - class8.method88(); // L: 349 - } else { - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 352 - } - } + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 2915 + Interpreter.Interpreter_stringStackSize -= 2; // L: 2916 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2917 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2918 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2919 + return 1; // L: 2920 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2922 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2923 + var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2924 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + WallDecoration.intToString(var9, true); // L: 2925 + return 1; // L: 2926 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2928 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2929 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2930 + return 1; // L: 2931 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 2933 + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2934 + long var13 = 86400000L * ((long)var10 + 11745L); // L: 2935 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2936 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 2937 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2938 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2939 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2940 + return 1; // L: 2941 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2943 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 2951 + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2952 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 2953 + return 1; // L: 2954 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 2956 + Interpreter.Interpreter_stringStackSize -= 2; // L: 2957 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = NetSocket.method2587(DirectByteArrayCopier.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class35.clientLanguage)); // L: 2958 + return 1; // L: 2959 } else { - short var7; - int var32; - if (Login.loginIndex == 1) { // L: 356 - while (true) { - if (!Varcs.isKeyDown()) { // L: 357 - var32 = GraphicsObject.loginBoxCenter - 80; // L: 365 - var7 = 321; // L: 366 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 367 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 368 - } - - var32 = GraphicsObject.loginBoxCenter + 80; // L: 370 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 371 - Login.loginIndex = 0; // L: 372 - } - break; - } - - if (ModeWhere.field2417 == 84) { // L: 358 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 359 - } else if (ModeWhere.field2417 == 13) { // L: 361 - Login.loginIndex = 0; // L: 362 - } - } - } else { - short var33; - boolean var36; - if (Login.loginIndex == 2) { // L: 375 - var33 = 201; // L: 376 - var32 = var33 + 52; // L: 377 - if (var3 == 1 && var31 >= var32 - 12 && var31 < var32 + 2) { // L: 378 - Login.currentLoginField = 0; - } - - var32 += 15; // L: 379 - if (var3 == 1 && var31 >= var32 - 12 && var31 < var32 + 2) { // L: 380 - Login.currentLoginField = 1; - } - - var32 += 15; // L: 381 - var33 = 361; // L: 382 - if (AttackOption.field1190 != null) { // L: 383 - var35 = AttackOption.field1190.highX / 2; // L: 384 - if (var3 == 1 && var30 >= AttackOption.field1190.lowX - var35 && var30 <= var35 + AttackOption.field1190.lowX && var31 >= var33 - 15 && var31 < var33) { // L: 385 - switch(Login.field1207) { // L: 386 - case 1: - InvDefinition.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 389 - Login.loginIndex = 5; // L: 390 - return; // L: 391 - case 2: - WorldMapRectangle.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 395 - } - } - } - - var35 = GraphicsObject.loginBoxCenter - 80; // L: 401 - var34 = 321; // L: 402 - if (var3 == 1 && var30 >= var35 - 75 && var30 <= var35 + 75 && var31 >= var34 - 20 && var31 <= var34 + 20) { // L: 403 - Login.Login_username = Login.Login_username.trim(); // L: 404 - if (Login.Login_username.length() == 0) { // L: 405 - InvDefinition.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 406 - return; // L: 407 - } - - if (Login.Login_password.length() == 0) { // L: 409 - InvDefinition.setLoginResponseString("", "Please enter your password.", ""); // L: 410 - return; // L: 411 - } - - InvDefinition.setLoginResponseString("", "Connecting to server...", ""); // L: 413 - class23.method234(false); // L: 414 - ItemContainer.updateGameState(20); // L: 415 - return; // L: 416 - } - - var35 = Login.loginBoxX + 180 + 80; // L: 418 - if (var3 == 1 && var30 >= var35 - 75 && var30 <= var35 + 75 && var31 >= var34 - 20 && var31 <= var34 + 20) { // L: 419 - Login.loginIndex = 0; // L: 420 - Login.Login_username = ""; // L: 421 - Login.Login_password = ""; // L: 422 - Canvas.field439 = 0; // L: 423 - class1.otp = ""; // L: 424 - Login.field1217 = true; // L: 425 - } - - var35 = GraphicsObject.loginBoxCenter + -117; // L: 427 - var34 = 277; // L: 428 - Login.field1222 = var30 >= var35 && var30 < var35 + WorldMapDecoration.field235 && var31 >= var34 && var31 < var34 + MouseHandler.field512; // L: 429 - if (var3 == 1 && Login.field1222) { // L: 430 - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 431 - if (!Client.Login_isUsernameRemembered && WorldMapSectionType.clientPreferences.rememberedUsername != null) { // L: 432 - WorldMapSectionType.clientPreferences.rememberedUsername = null; // L: 433 - class23.savePreferences(); // L: 434 - } - } - - var35 = GraphicsObject.loginBoxCenter + 24; // L: 437 - var34 = 277; // L: 438 - Login.field1216 = var30 >= var35 && var30 < var35 + WorldMapDecoration.field235 && var31 >= var34 && var31 < var34 + MouseHandler.field512; // L: 439 - if (var3 == 1 && Login.field1216) { // L: 440 - WorldMapSectionType.clientPreferences.hideUsername = !WorldMapSectionType.clientPreferences.hideUsername; // L: 441 - if (!WorldMapSectionType.clientPreferences.hideUsername) { // L: 442 - Login.Login_username = ""; // L: 443 - WorldMapSectionType.clientPreferences.rememberedUsername = null; // L: 444 - class8.method88(); // L: 445 - } - - class23.savePreferences(); // L: 447 - } - - label1002: - while (true) { - Transferable var23; - int var38; - do { - while (true) { - char var37; - label918: - do { - while (true) { - while (Varcs.isKeyDown()) { // L: 449 - if (ModeWhere.field2417 != 13) { // L: 450 - if (Login.currentLoginField != 0) { // L: 459 - continue label918; - } - - WorldMapSection1.method657(WorldMapID.field299); // L: 460 - if (ModeWhere.field2417 == 85 && Login.Login_username.length() > 0) { // L: 461 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (ModeWhere.field2417 == 84 || ModeWhere.field2417 == 80) { // L: 462 - Login.currentLoginField = 1; - } - - var37 = WorldMapID.field299; // L: 464 - var36 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var37) != -1; // L: 466 - if (var36 && Login.Login_username.length() < 320) { // L: 468 - Login.Login_username = Login.Login_username + WorldMapID.field299; - } - } else { - Login.loginIndex = 0; // L: 451 - Login.Login_username = ""; // L: 452 - Login.Login_password = ""; // L: 453 - Canvas.field439 = 0; // L: 454 - class1.otp = ""; // L: 455 - Login.field1217 = true; // L: 456 - } - } - - return; // L: 774 - } - } while(Login.currentLoginField != 1); // L: 470 - - if (ModeWhere.field2417 == 85 && Login.Login_password.length() > 0) { // L: 471 - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 472 - } else if (ModeWhere.field2417 == 84 || ModeWhere.field2417 == 80) { // L: 474 - Login.currentLoginField = 0; // L: 475 - if (ModeWhere.field2417 == 84) { // L: 476 - Login.Login_username = Login.Login_username.trim(); // L: 477 - if (Login.Login_username.length() == 0) { // L: 478 - InvDefinition.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 479 - return; // L: 480 - } - - if (Login.Login_password.length() == 0) { // L: 482 - InvDefinition.setLoginResponseString("", "Please enter your password.", ""); // L: 483 - return; // L: 484 - } - - InvDefinition.setLoginResponseString("", "Connecting to server...", ""); // L: 486 - class23.method234(false); // L: 487 - ItemContainer.updateGameState(20); // L: 488 - return; // L: 489 - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && ModeWhere.field2417 == 67) { // L: 492 - Clipboard var22 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 493 - var23 = var22.getContents(class1.client); // L: 494 - var38 = 20 - Login.Login_password.length(); // L: 495 - break; - } - - var37 = WorldMapID.field299; // L: 545 - if ((var37 < ' ' || var37 >= 127) && (var37 <= 127 || var37 >= 160) && (var37 <= 160 || var37 > 255)) { // L: 547 - label1113: { - if (var37 != 0) { // L: 551 - char[] var25 = class298.cp1252AsciiExtension; // L: 553 - - for (int var26 = 0; var26 < var25.length; ++var26) { // L: 554 - char var13 = var25[var26]; // L: 555 - if (var37 == var13) { // L: 557 - var36 = true; // L: 558 - break label1113; // L: 559 - } - } - } - - var36 = false; // L: 565 - } - } else { - var36 = true; // L: 548 - } - - if (var36) { // L: 567 - char var42 = WorldMapID.field299; // L: 569 - boolean var11 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var42) != -1; // L: 571 - if (var11 && Login.Login_password.length() < 20) { // L: 573 574 - Login.Login_password = Login.Login_password + WorldMapID.field299; // L: 575 - } - } - } - } while(var38 <= 0); // L: 496 - - try { - String var12 = (String)var23.getTransferData(DataFlavor.stringFlavor); // L: 498 - int var40 = Math.min(var38, var12.length()); // L: 499 - int var14 = 0; - - while (true) { - if (var14 >= var40) { - Login.Login_password = Login.Login_password + var12.substring(0, var40); // L: 537 - continue label1002; - } - - char var16 = var12.charAt(var14); // L: 503 - boolean var15; - if (var16 >= ' ' && var16 < 127 || var16 > 127 && var16 < 160 || var16 > 160 && var16 <= 255) { // L: 505 - var15 = true; // L: 506 - } else { - label1126: { - if (var16 != 0) { // L: 509 - char[] var17 = class298.cp1252AsciiExtension; // L: 511 - - for (int var18 = 0; var18 < var17.length; ++var18) { // L: 512 - char var19 = var17[var18]; // L: 513 - if (var19 == var16) { // L: 515 - var15 = true; // L: 516 - break label1126; // L: 517 - } - } - } - - var15 = false; // L: 523 - } - } - - if (!var15) { // L: 525 - break; - } - - char var41 = var12.charAt(var14); // L: 527 - boolean var24 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var41) != -1; // L: 529 - if (!var24) { // L: 531 - break; - } - - ++var14; // L: 500 - } - - Login.loginIndex = 3; // L: 533 - return; // L: 534 - } catch (UnsupportedFlavorException var28) { // L: 539 - } catch (IOException var29) { // L: 540 - } - } - } else if (Login.loginIndex == 3) { // L: 584 - var32 = Login.loginBoxX + 180; // L: 585 - var7 = 276; // L: 586 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 587 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 588 - } - - var32 = Login.loginBoxX + 180; // L: 590 - var7 = 326; // L: 591 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 592 - InvDefinition.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 593 - Login.loginIndex = 5; // L: 594 - return; // L: 595 - } + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 2961 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2962 + class16.Interpreter_intStackSize -= 2; // L: 2963 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2964 + var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2965 + var11 = MilliClock.archive13.takeFile(var5, 0); // L: 2966 + var12 = new Font(var11); // L: 2967 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 2968 + return 1; // L: 2969 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 2971 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2972 + class16.Interpreter_intStackSize -= 2; // L: 2973 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 2974 + var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 2975 + var11 = MilliClock.archive13.takeFile(var5, 0); // L: 2976 + var12 = new Font(var11); // L: 2977 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 2978 + return 1; // L: 2979 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 2981 + Interpreter.Interpreter_stringStackSize -= 2; // L: 2982 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2983 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2984 + if (Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1) { // L: 2985 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; } else { - int var9; - if (Login.loginIndex == 4) { // L: 598 - var32 = Login.loginBoxX + 180 - 80; // L: 599 - var7 = 321; // L: 600 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 601 - class1.otp.trim(); // L: 602 - if (class1.otp.length() != 6) { // L: 603 - InvDefinition.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 604 - return; // L: 605 - } + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; // L: 2986 + } - Canvas.field439 = Integer.parseInt(class1.otp); // L: 607 - class1.otp = ""; // L: 608 - class23.method234(true); // L: 609 - InvDefinition.setLoginResponseString("", "Connecting to server...", ""); // L: 610 - ItemContainer.updateGameState(20); // L: 611 - return; // L: 612 - } + return 1; // L: 2987 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 2989 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2990 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 2991 + return 1; // L: 2992 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 2994 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2995 + var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 2996 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 2997 + return 1; // L: 2998 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3000 + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3001 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = LoginScreenAnimation.isCharPrintable((char)var10) ? 1 : 0; // L: 3002 + return 1; // L: 3003 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3005 + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3006 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class238.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3007 + return 1; // L: 3008 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3010 + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3011 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class69.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3012 + return 1; // L: 3013 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3015 + var10 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3016 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = UserComparator4.isDigit((char)var10) ? 1 : 0; // L: 3017 + return 1; // L: 3018 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3020 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3021 + if (var3 != null) { // L: 3022 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3023 + } - if (var3 == 1 && var30 >= Login.loginBoxX + 180 - 9 && var30 <= Login.loginBoxX + 180 + 130 && var31 >= 263 && var31 <= 296) { // L: 614 - Login.field1217 = !Login.field1217; // L: 615 - } + return 1; // L: 3024 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3026 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3027 + class16.Interpreter_intStackSize -= 2; // L: 3028 + var9 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3029 + var5 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3030 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3031 + return 1; // L: 3032 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3034 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3035 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 3036 + boolean var16 = false; // L: 3037 - if (var3 == 1 && var30 >= Login.loginBoxX + 180 - 34 && var30 <= Login.loginBoxX + 34 + 180 && var31 >= 351 && var31 <= 363) { // L: 617 - WorldMapRectangle.openURL(GrandExchangeOfferNameComparator.method209("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 618 - } - - var32 = Login.loginBoxX + 180 + 80; // L: 620 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 621 - Login.loginIndex = 0; // L: 622 - Login.Login_username = ""; // L: 623 - Login.Login_password = ""; // L: 624 - Canvas.field439 = 0; // L: 625 - class1.otp = ""; // L: 626 - } - - while (Varcs.isKeyDown()) { // L: 628 - boolean var8 = false; // L: 629 - - for (var9 = 0; var9 < "1234567890".length(); ++var9) { // L: 630 - if (WorldMapID.field299 == "1234567890".charAt(var9)) { // L: 631 - var8 = true; // L: 632 - break; // L: 633 - } - } - - if (ModeWhere.field2417 == 13) { // L: 636 - Login.loginIndex = 0; // L: 637 - Login.Login_username = ""; // L: 638 - Login.Login_password = ""; // L: 639 - Canvas.field439 = 0; // L: 640 - class1.otp = ""; // L: 641 - } else { - if (ModeWhere.field2417 == 85 && class1.otp.length() > 0) { // L: 644 - class1.otp = class1.otp.substring(0, class1.otp.length() - 1); - } - - if (ModeWhere.field2417 == 84) { // L: 645 - class1.otp.trim(); // L: 646 - if (class1.otp.length() != 6) { // L: 647 - InvDefinition.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 648 - return; // L: 649 - } - - Canvas.field439 = Integer.parseInt(class1.otp); // L: 651 - class1.otp = ""; // L: 652 - class23.method234(true); // L: 653 - InvDefinition.setLoginResponseString("", "Connecting to server...", ""); // L: 654 - ItemContainer.updateGameState(20); // L: 655 - return; // L: 656 - } - - if (var8 && class1.otp.length() < 6) { // L: 658 - class1.otp = class1.otp + WorldMapID.field299; - } - } - } - } else if (Login.loginIndex == 5) { // L: 662 - var32 = Login.loginBoxX + 180 - 80; // L: 663 - var7 = 321; // L: 664 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 665 - WorldMapManager.method738(); // L: 666 - return; // L: 667 - } - - var32 = Login.loginBoxX + 180 + 80; // L: 669 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 670 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(true); // L: 671 - } - - var34 = 361; // L: 673 - if (KeyHandler.field409 != null) { // L: 674 - var9 = KeyHandler.field409.highX / 2; // L: 675 - if (var3 == 1 && var30 >= KeyHandler.field409.lowX - var9 && var30 <= var9 + KeyHandler.field409.lowX && var31 >= var34 - 15 && var31 < var34) { // L: 676 - WorldMapRectangle.openURL(GrandExchangeOfferNameComparator.method209("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 677 - } - } - - while (Varcs.isKeyDown()) { // L: 680 - var36 = false; // L: 681 - - for (int var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { // L: 682 - if (WorldMapID.field299 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { // L: 683 - var36 = true; // L: 684 - break; // L: 685 - } - } - - if (ModeWhere.field2417 == 13) { // L: 688 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(true); // L: 689 - } else { - if (ModeWhere.field2417 == 85 && Login.Login_username.length() > 0) { // L: 692 - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (ModeWhere.field2417 == 84) { // L: 693 - WorldMapManager.method738(); // L: 694 - return; // L: 695 - } - - if (var36 && Login.Login_username.length() < 320) { // L: 697 - Login.Login_username = Login.Login_username + WorldMapID.field299; - } - } - } - } else if (Login.loginIndex != 6) { // L: 701 - if (Login.loginIndex == 7) { // L: 712 - var32 = Login.loginBoxX + 180 - 80; // L: 713 - var7 = 321; // L: 714 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 715 - WorldMapRectangle.openURL(GrandExchangeOfferNameComparator.method209("secure", true) + "m=dob/set_dob.ws", true, false); // L: 716 - InvDefinition.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 717 - Login.loginIndex = 6; // L: 718 - return; // L: 719 - } - - var32 = Login.loginBoxX + 180 + 80; // L: 721 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 722 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(true); // L: 723 - } - } else if (Login.loginIndex == 8) { // L: 726 - var32 = Login.loginBoxX + 180 - 80; // L: 727 - var7 = 321; // L: 728 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 729 - WorldMapRectangle.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 730 - InvDefinition.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 731 - Login.loginIndex = 6; // L: 732 - return; // L: 733 - } - - var32 = Login.loginBoxX + 180 + 80; // L: 735 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 736 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(true); // L: 737 - } - } else if (Login.loginIndex == 12) { // L: 740 - String var27 = ""; // L: 741 - switch(Login.field1206) { // L: 742 - case 0: - var27 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 747 - break; // L: 748 - case 1: - var27 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 750 - break; - default: - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 744 - } - - var35 = Login.loginBoxX + 180; // L: 753 - var34 = 276; // L: 754 - if (var3 == 1 && var30 >= var35 - 75 && var30 <= var35 + 75 && var31 >= var34 - 20 && var31 <= var34 + 20) { // L: 755 - WorldMapRectangle.openURL(var27, true, false); // L: 756 - InvDefinition.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 757 - Login.loginIndex = 6; // L: 758 - return; // L: 759 - } - - var35 = Login.loginBoxX + 180; // L: 761 - var34 = 326; // L: 762 - if (var3 == 1 && var30 >= var35 - 75 && var30 <= var35 + 75 && var31 >= var34 - 20 && var31 <= var34 + 20) { // L: 763 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 764 - } - } else if (Login.loginIndex == 24) { // L: 767 - var32 = Login.loginBoxX + 180; // L: 768 - var7 = 301; // L: 769 - if (var3 == 1 && var30 >= var32 - 75 && var30 <= var32 + 75 && var31 >= var7 - 20 && var31 <= var7 + 20) { // L: 770 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(false); // L: 771 - } - } - } else { - while (true) { - do { - if (!Varcs.isKeyDown()) { // L: 702 - var33 = 321; // L: 707 - if (var3 == 1 && var31 >= var33 - 20 && var31 <= var33 + 20) { // L: 708 - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(true); // L: 709 - } - - return; - } - } while(ModeWhere.field2417 != 84 && ModeWhere.field2417 != 13); // L: 703 - - GrandExchangeOfferOwnWorldComparator.Login_promptCredentials(true); // L: 704 - } + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3038 + char var7 = var3.charAt(var6); // L: 3039 + if (var7 == '<') { // L: 3040 + var16 = true; + } else if (var7 == '>') { // L: 3041 + var16 = false; + } else if (!var16) { // L: 3042 + var15.append(var7); } } + + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3044 + return 1; // L: 3045 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3047 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3048 + var9 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3049 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3050 + return 1; // L: 3051 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3053 + Interpreter.Interpreter_stringStackSize -= 2; // L: 3054 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3055 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3056 + var5 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3057 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3058 + return 1; // L: 3059 + } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 3061 + var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3062 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3063 + return 1; // L: 3064 + } else { + return 2; // L: 3066 + } + } + } else { + Interpreter.Interpreter_stringStackSize -= 2; // L: 2944 + var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2945 + var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2946 + if (Varcs.localPlayer.appearance != null && Varcs.localPlayer.appearance.isFemale) { // L: 2947 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 2948 + } + + return 1; // L: 2949 + } + } + } + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "2074876999" + ) + static int method122(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3541 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = WorldMapAreaData.loadWorlds() ? 1 : 0; // L: 3542 + return 1; // L: 3543 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3545 + var9 = NPCComposition.worldListStart(); // L: 3546 + if (var9 != null) { // L: 3547 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.id; // L: 3548 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.properties; // L: 3549 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3550 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.location; // L: 3551 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.population; // L: 3552 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3553 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3556 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3557 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3558 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3559 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3560 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3561 + } + + return 1; // L: 3563 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3565 + var9 = ScriptFrame.getNextWorldListWorld(); // L: 3566 + if (var9 != null) { // L: 3567 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.id; // L: 3568 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.properties; // L: 3569 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3570 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.location; // L: 3571 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var9.population; // L: 3572 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3573 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3576 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3577 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3578 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3579 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3580 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3581 + } + + return 1; // L: 3583 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3585 + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3586 + var7 = null; // L: 3587 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3588 + if (var3 == World_worlds[var8].id) { // L: 3589 + var7 = World_worlds[var8]; // L: 3590 + break; } } - } - } - } - } // L: 256 - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "-1465568490" - ) - static int method98(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1042 - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1043 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1044 - return 1; // L: 1045 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1047 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1048 - return 1; // L: 1049 - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1051 - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1052 - return 1; // L: 1053 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1055 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1056 - return 1; // L: 1057 - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1059 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1060 - return 1; // L: 1061 - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1063 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1064 - return 1; // L: 1065 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1067 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1068 - return 1; // L: 1069 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1071 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1072 - return 1; // L: 1073 - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1075 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1076 - return 1; // L: 1077 - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1079 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1080 - return 1; // L: 1081 - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1083 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1084 - return 1; // L: 1085 - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1087 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1088 - return 1; // L: 1089 - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1091 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1092 - return 1; // L: 1093 - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1095 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1096 - return 1; // L: 1097 - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1099 - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1100 - return 1; // L: 1101 - } else { - return 2; // L: 1103 - } - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lhz;I)Ljava/lang/String;", - garbageValue = "16711935" - ) - static String method95(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { // L: 9891 - for (int var2 = 1; var2 <= 5; ++var2) { // L: 9892 - while (true) { - int var3 = var0.indexOf("%" + var2); // L: 9894 - if (var3 == -1) { // L: 9895 - break; + if (var7 != null) { // L: 3594 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.id; // L: 3595 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.properties; // L: 3596 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3597 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.location; // L: 3598 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.population; // L: 3599 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3600 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3603 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3604 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3605 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3606 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3607 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3608 } - var0 = var0.substring(0, var3) + GrandExchangeOffer.method187(HealthBar.method2168(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 9896 + return 1; // L: 3610 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3612 + class16.Interpreter_intStackSize -= 4; // L: 3613 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3614 + boolean var10 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1] == 1; // L: 3615 + var8 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 2]; // L: 3616 + boolean var6 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 3] == 1; // L: 3617 + WorldMapSectionType.sortWorldList(var3, var10, var8, var6); // L: 3618 + return 1; // L: 3619 + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3621 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3642 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize] == 1; // L: 3643 + return 1; // L: 3644 + } else { + int var4; + ParamComposition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3646 + class16.Interpreter_intStackSize -= 2; // L: 3647 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3648 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3649 + var5 = UserComparator3.getParamDefinition(var4); // L: 3650 + if (var5.isString()) { // L: 3651 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GraphicsObject.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3652 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = GraphicsObject.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3655 + } + + return 1; // L: 3657 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3659 + class16.Interpreter_intStackSize -= 2; // L: 3660 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3661 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3662 + var5 = UserComparator3.getParamDefinition(var4); // L: 3663 + if (var5.isString()) { // L: 3664 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class19.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3665 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class19.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3668 + } + + return 1; // L: 3670 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3672 + class16.Interpreter_intStackSize -= 2; // L: 3673 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3674 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3675 + var5 = UserComparator3.getParamDefinition(var4); // L: 3676 + if (var5.isString()) { // L: 3677 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class23.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3678 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = class23.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3681 + } + + return 1; // L: 3683 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3685 + class16.Interpreter_intStackSize -= 2; // L: 3686 + var3 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize]; // L: 3687 + var4 = Interpreter.Interpreter_intStack[class16.Interpreter_intStackSize + 1]; // L: 3688 + var5 = UserComparator3.getParamDefinition(var4); // L: 3689 + if (var5.isString()) { // L: 3690 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = LoginPacket.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3691 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = LoginPacket.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3694 + } + + return 1; // L: 3696 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3698 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3699 + return 1; // L: 3700 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3702 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3703 + return 1; // L: 3704 + } else if (var0 == 6520) { // L: 3706 + return 1; // L: 3707 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3709 + return 1; // L: 3710 + } else if (var0 == 6522) { // L: 3712 + --Interpreter.Interpreter_stringStackSize; // L: 3713 + --class16.Interpreter_intStackSize; // L: 3714 + return 1; // L: 3715 + } else if (var0 == 6523) { // L: 3717 + --Interpreter.Interpreter_stringStackSize; // L: 3718 + --class16.Interpreter_intStackSize; // L: 3719 + return 1; // L: 3720 + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3722 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3723 + return 1; // L: 3724 + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3726 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 3727 + return 1; // L: 3728 + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3730 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 1; // L: 3731 + return 1; // L: 3732 + } else if (var0 == 6527) { // L: 3734 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = Client.field605; // L: 3735 + return 1; // L: 3736 + } else { + return 2; // L: 3738 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class16.Interpreter_intStackSize]; // L: 3622 + if (var3 >= 0 && var3 < World.World_count) { // L: 3623 + var7 = World_worlds[var3]; // L: 3624 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.id; // L: 3625 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.properties; // L: 3626 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3627 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.location; // L: 3628 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var7.population; // L: 3629 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3630 + } else { + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = -1; // L: 3633 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3634 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3635 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3636 + Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = 0; // L: 3637 + Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3638 + } + + return 1; // L: 3640 } } } - - return var0; // L: 9900 } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILcc;ZI)I", + garbageValue = "616435049" + ) + static int method121(int var0, Script var1, boolean var2) { + if (var0 == 6800) { // L: 4135 + ++Interpreter.Interpreter_stringStackSize; // L: 4136 + return 1; // L: 4137 + } else if (var0 != 6801 && var0 != 6802) { // L: 4139 + if (var0 == 6850) { // L: 4143 + ++Interpreter.Interpreter_stringStackSize; // L: 4144 + return 1; // L: 4145 + } else if (var0 != 6851 && var0 != 6852) { // L: 4147 + return 2; // L: 4151 + } else { + ++class16.Interpreter_intStackSize; // L: 4148 + return 1; // L: 4149 + } + } else { + ++class16.Interpreter_intStackSize; // L: 4140 + return 1; // L: 4141 + } + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "785264167" + ) + static void method118(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11581 + if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11582 + var1.remove(); // L: 11583 + } + } + + } // L: 11586 + + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(IIIZI)V", + garbageValue = "1685412004" + ) + public static void method123(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = ObjectComposition.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); // L: 11687 + var4.packetBuffer.writeShortLE(var2); // L: 11688 + var4.packetBuffer.writeShort(var1); // L: 11689 + var4.packetBuffer.writeInt(var3 ? Client.field684 * -320583695 * 17549585 : 0); // L: 11690 + var4.packetBuffer.method6771(var0); // L: 11691 + Client.packetWriter.addNode(var4); // L: 11692 + } // L: 11693 + + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-118" + ) + static void method119() { + if (Client.oculusOrbState == 1) { // L: 11700 + Client.field685 = true; // L: 11701 + } + + } // L: 11703 } diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java deleted file mode 100644 index b9ba253ad9..0000000000 --- a/runescape-client/src/main/java/class90.java +++ /dev/null @@ -1,243 +0,0 @@ -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("cs") -public class class90 { - @ObfuscatedName("ke") - @ObfuscatedGetter( - intValue = -944892435 - ) - @Export("Client_plane") - static int Client_plane; - - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "(IB)Ljy;", - garbageValue = "52" - ) - @Export("getNpcDefinition") - public static NPCComposition getNpcDefinition(int var0) { - NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 62 - if (var1 != null) { // L: 63 - return var1; - } else { - byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 64 - var1 = new NPCComposition(); // L: 65 - var1.id = var0; // L: 66 - if (var2 != null) { // L: 67 - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); // L: 68 - NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 69 - return var1; // L: 70 - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(ILcl;ZI)I", - garbageValue = "630017" - ) - static int method2193(int var0, Script var1, boolean var2) { - int var4 = -1; // L: 551 - Widget var3; - if (var0 >= 2000) { // L: 552 - var0 -= 1000; // L: 553 - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 554 - var3 = class237.getWidget(var4); // L: 555 - } else { - var3 = var2 ? class277.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 557 - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 558 - Interpreter.Interpreter_intStackSize -= 2; // L: 559 - var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 560 - if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 561 - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { // L: 562 - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 563 - if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 564 - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { // L: 565 - var3.scrollY = 0; - } - - IsaacCipher.invalidateWidget(var3); // L: 566 - return 1; // L: 567 - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 569 - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 570 - IsaacCipher.invalidateWidget(var3); // L: 571 - return 1; // L: 572 - } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 574 - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 575 - IsaacCipher.invalidateWidget(var3); // L: 576 - return 1; // L: 577 - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 579 - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 580 - IsaacCipher.invalidateWidget(var3); // L: 581 - return 1; // L: 582 - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 584 - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 585 - IsaacCipher.invalidateWidget(var3); // L: 586 - return 1; // L: 587 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 589 - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 590 - IsaacCipher.invalidateWidget(var3); // L: 591 - return 1; // L: 592 - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 594 - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 595 - IsaacCipher.invalidateWidget(var3); // L: 596 - return 1; // L: 597 - } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 599 - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 600 - IsaacCipher.invalidateWidget(var3); // L: 601 - return 1; // L: 602 - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 604 - var3.modelType = 1; // L: 605 - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 606 - IsaacCipher.invalidateWidget(var3); // L: 607 - return 1; // L: 608 - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 610 - Interpreter.Interpreter_intStackSize -= 6; // L: 611 - var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 612 - var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 613 - var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 614 - var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 615 - var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 616 - var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; // L: 617 - IsaacCipher.invalidateWidget(var3); // L: 618 - return 1; // L: 619 - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; // L: 624 - var3.modelFrame = 0; - var3.modelFrameCycle = 0; // L: 626 - IsaacCipher.invalidateWidget(var3); // L: 627 - } - - return 1; // L: 629 - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 631 - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 632 - IsaacCipher.invalidateWidget(var3); // L: 633 - return 1; // L: 634 - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 636 - String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 637 - if (!var7.equals(var3.text)) { // L: 638 - var3.text = var7; // L: 639 - IsaacCipher.invalidateWidget(var3); // L: 640 - } - - return 1; // L: 642 - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 644 - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 645 - IsaacCipher.invalidateWidget(var3); // L: 646 - return 1; // L: 647 - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 649 - Interpreter.Interpreter_intStackSize -= 3; // L: 650 - var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 651 - var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 652 - var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 653 - IsaacCipher.invalidateWidget(var3); // L: 654 - return 1; // L: 655 - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 657 - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 658 - IsaacCipher.invalidateWidget(var3); // L: 659 - return 1; // L: 660 - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 662 - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 663 - IsaacCipher.invalidateWidget(var3); // L: 664 - return 1; // L: 665 - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 667 - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 668 - IsaacCipher.invalidateWidget(var3); // L: 669 - return 1; // L: 670 - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 672 - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 673 - IsaacCipher.invalidateWidget(var3); // L: 674 - return 1; // L: 675 - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 677 - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 678 - IsaacCipher.invalidateWidget(var3); // L: 679 - return 1; // L: 680 - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 682 - Interpreter.Interpreter_intStackSize -= 2; // L: 683 - var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 684 - var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 685 - IsaacCipher.invalidateWidget(var3); // L: 686 - if (var4 != -1 && var3.type == 0) { // L: 687 - class182.revalidateWidgetScroll(DefaultsGroup.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; // L: 688 - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 690 - class25.resumePauseWidget(var3.id, var3.childIndex); // L: 691 - Client.meslayerContinueWidget = var3; // L: 692 - IsaacCipher.invalidateWidget(var3); // L: 693 - return 1; // L: 694 - } else if (var0 == 1122) { // L: 696 - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 697 - IsaacCipher.invalidateWidget(var3); // L: 698 - return 1; // L: 699 - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 701 - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 702 - IsaacCipher.invalidateWidget(var3); // L: 703 - return 1; // L: 704 - } else if (var0 == 1124) { // L: 706 - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 707 - IsaacCipher.invalidateWidget(var3); // L: 708 - return 1; // L: 709 - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 711 - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 712 - FillMode var6 = (FillMode)InterfaceParent.findEnumerated(class307.FillMode_values(), var8); // L: 713 - if (var6 != null) { // L: 714 - var3.fillMode = var6; // L: 715 - IsaacCipher.invalidateWidget(var3); // L: 716 - } - - return 1; // L: 718 - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 720 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 721 - var3.field2627 = var5; // L: 722 - return 1; // L: 723 - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 725 - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 726 - var3.modelTransparency = var5; // L: 727 - return 1; // L: 728 - } else { - return 2; // L: 730 - } - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2128979355" - ) - static void method2191() { - Players.Players_count = 0; // L: 620 - - for (int var0 = 0; var0 < 2048; ++var0) { // L: 621 - Players.field1269[var0] = null; // L: 622 - Players.field1274[var0] = 1; // L: 623 - } - - } // L: 625 -} diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java deleted file mode 100644 index 3dcfb310b7..0000000000 --- a/runescape-client/src/main/java/class92.java +++ /dev/null @@ -1,37 +0,0 @@ -import java.math.BigInteger; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("cu") -public class class92 { - @ObfuscatedName("n") - static final BigInteger field1184; - @ObfuscatedName("v") - static final BigInteger field1177; - @ObfuscatedName("gd") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - - static { - field1184 = new BigInteger("10001", 16); // L: 6 - field1177 = new BigInteger("b86386fafabb20bd78c0e5781c43f01792afb1811072a0927a86b2c060909e11def31c8145178d8e18079e9b7200a42bc81f0acd93da0c99c2d892add24ced64d66d75b89088142c4a1045f82b3c9f445bb54cddeb2b6b3771a9cb2d247a69dbd6facc6be331020f34dffd4b3417a5eefc9526e1db8ac97eabddbc50b48a760f", 16); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "([BZB)Ljava/lang/Object;", - garbageValue = "8" - ) - public static Object method2195(byte[] var0, boolean var1) { - if (var0 == null) { // L: 7 - return null; - } else if (var0.length > 136) { // L: 8 - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 - var2.set(var0); // L: 11 - return var2; // L: 12 - } else { - return var0; // L: 16 - } - } -} diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java new file mode 100644 index 0000000000..ea216a65f7 --- /dev/null +++ b/runescape-client/src/main/java/class93.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("cb") +public class class93 { + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "[Low;" + ) + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; +}