From 39a4cb2266b529abd5366886cdb96952ddde4b24 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Wed, 26 Jun 2019 01:01:21 +0200 Subject: [PATCH] Rework clanmanmode attack option hiding (#746) * A whole bunch of refactoring * Api/mixins/injector additions for hiding attack options * Rework clanmanmode attack hiding * Update Client.java --- .../instruction/types/LVTInstructionType.java | 2 +- .../java/net/runelite/injector/Inject.java | 3 + .../net/runelite/injector/InjectUtil.java | 22 + .../injector/raw/HidePlayerAttacks.java | 131 ++++++ .../main/java/net/runelite/api/Client.java | 6 + .../clanmanmode/ClanManModePlugin.java | 145 +------ .../net/runelite/mixins/RSClientMixin.java | 16 + .../net/runelite/mixins/RSPlayerMixin.java | 17 + .../java/net/runelite/rs/api/RSPlayer.java | 2 + .../main/java/AbstractByteArrayCopier.java | 8 +- .../src/main/java/AbstractFont.java | 4 +- .../src/main/java/AbstractRasterProvider.java | 4 +- .../src/main/java/AccessFile.java | 40 +- runescape-client/src/main/java/Actor.java | 2 +- .../src/main/java/AttackOption.java | 4 +- .../src/main/java/BoundaryObject.java | 4 +- runescape-client/src/main/java/Buddy.java | 2 +- runescape-client/src/main/java/Buffer.java | 2 +- .../src/main/java/ByteArrayPool.java | 6 +- runescape-client/src/main/java/Canvas.java | 26 +- .../src/main/java/ChatChannel.java | 36 +- runescape-client/src/main/java/ClanChat.java | 2 +- runescape-client/src/main/java/Client.java | 20 +- .../src/main/java/ClientParameter.java | 2 +- runescape-client/src/main/java/Decimator.java | 28 +- .../main/java/DevicePcmPlayerProvider.java | 2 +- .../src/main/java/DynamicObject.java | 70 +-- runescape-client/src/main/java/FontName.java | 136 +++--- runescape-client/src/main/java/Fonts.java | 4 +- .../src/main/java/Formatting.java | 34 +- runescape-client/src/main/java/Frames.java | 4 +- .../src/main/java/FriendSystem.java | 12 +- .../src/main/java/FriendsList.java | 2 +- .../src/main/java/GrandExchangeEvent.java | 64 +-- .../src/main/java/GrandExchangeEvents.java | 30 +- .../src/main/java/GraphicsObject.java | 4 +- .../src/main/java/GroundItemPile.java | 4 +- .../src/main/java/HitSplatDefinition.java | 2 +- .../src/main/java/IndexCacheLoader.java | 410 +++++++++--------- .../src/main/java/IndexStore.java | 96 ++-- .../src/main/java/IndexedSprite.java | 30 +- .../src/main/java/Interpreter.java | 14 +- .../src/main/java/KeyHandler.java | 8 +- runescape-client/src/main/java/Login.java | 48 +- ...class72.java => LoginScreenAnimation.java} | 49 ++- .../src/main/java/MenuAction.java | 8 +- runescape-client/src/main/java/Message.java | 2 +- .../src/main/java/MilliClock.java | 8 +- .../src/main/java/MouseRecorder.java | 6 +- runescape-client/src/main/java/NetSocket.java | 308 ++++++------- .../src/main/java/NpcDefinition.java | 2 +- .../src/main/java/OwnWorldComparator.java | 14 +- runescape-client/src/main/java/Player.java | 2 +- .../src/main/java/PlayerType.java | 2 +- .../src/main/java/Rasterizer3D.java | 8 +- .../{class179.java => RouteStrategy.java} | 13 +- .../src/main/java/ScriptEvent.java | 140 +++--- .../src/main/java/SecureRandomCallable.java | 2 +- .../src/main/java/SecureRandomFuture.java | 4 +- .../src/main/java/ServerPacket.java | 2 +- runescape-client/src/main/java/Sprite.java | 4 +- runescape-client/src/main/java/SpriteIds.java | 2 +- .../src/main/java/SpriteMask.java | 2 +- .../src/main/java/StructDefinition.java | 80 ++-- .../src/main/java/TextureProvider.java | 150 +++---- runescape-client/src/main/java/Tile.java | 12 +- runescape-client/src/main/java/Tiles.java | 2 +- .../main/java/TotalQuantityComparator.java | 6 +- .../src/main/java/UrlRequest.java | 4 +- .../src/main/java/UserComparator4.java | 12 +- .../src/main/java/UserComparator9.java | 2 +- runescape-client/src/main/java/Username.java | 4 +- runescape-client/src/main/java/VarcInt.java | 8 +- runescape-client/src/main/java/Varcs.java | 4 +- runescape-client/src/main/java/Varps.java | 4 +- .../src/main/java/VertexNormal.java | 6 +- .../src/main/java/ViewportMouse.java | 14 +- runescape-client/src/main/java/World.java | 32 +- .../src/main/java/WorldComparator.java | 10 +- runescape-client/src/main/java/WorldMap.java | 2 +- .../src/main/java/WorldMapAreaData.java | 56 +-- .../src/main/java/WorldMapCacheName.java | 6 +- .../src/main/java/WorldMapEvent.java | 24 +- .../src/main/java/WorldMapIcon2.java | 10 +- .../src/main/java/WorldMapLabel.java | 4 +- .../src/main/java/WorldMapManager.java | 2 +- .../src/main/java/WorldMapRegion.java | 2 +- .../src/main/java/WorldMapSection0.java | 4 +- .../src/main/java/WorldMapSection1.java | 2 +- .../src/main/java/WorldMapSection2.java | 118 ++--- .../src/main/java/WorldMapSectionType.java | 16 +- runescape-client/src/main/java/class1.java | 86 ++-- runescape-client/src/main/java/class11.java | 32 +- runescape-client/src/main/java/class13.java | 4 +- runescape-client/src/main/java/class15.java | 6 +- runescape-client/src/main/java/class16.java | 6 +- runescape-client/src/main/java/class168.java | 4 +- runescape-client/src/main/java/class171.java | 36 +- runescape-client/src/main/java/class178.java | 24 +- runescape-client/src/main/java/class2.java | 60 +-- runescape-client/src/main/java/class211.java | 64 +-- runescape-client/src/main/java/class229.java | 38 +- runescape-client/src/main/java/class238.java | 4 +- runescape-client/src/main/java/class248.java | 78 ++-- runescape-client/src/main/java/class27.java | 2 +- runescape-client/src/main/java/class3.java | 6 +- runescape-client/src/main/java/class30.java | 4 +- runescape-client/src/main/java/class308.java | 4 +- runescape-client/src/main/java/class31.java | 136 +++--- runescape-client/src/main/java/class32.java | 10 +- runescape-client/src/main/java/class322.java | 2 +- runescape-client/src/main/java/class39.java | 8 +- runescape-client/src/main/java/class4.java | 108 ++--- runescape-client/src/main/java/class54.java | 358 +++++++-------- runescape-client/src/main/java/class65.java | 199 ++++----- runescape-client/src/main/java/class80.java | 28 +- runescape-client/src/main/java/class83.java | 2 +- runescape-client/src/main/java/class98.java | 2 +- 118 files changed, 2038 insertions(+), 1955 deletions(-) create mode 100644 injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java rename runescape-client/src/main/java/{class72.java => LoginScreenAnimation.java} (92%) rename runescape-client/src/main/java/{class179.java => RouteStrategy.java} (87%) diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java index d6b4d9c0e7..07c5f17d92 100644 --- a/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java +++ b/deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstructionType.java @@ -34,7 +34,7 @@ public enum LVTInstructionType private final int slots; - private LVTInstructionType(int slots) + LVTInstructionType(int slots) { this.slots = slots; } diff --git a/injector-plugin/src/main/java/net/runelite/injector/Inject.java b/injector-plugin/src/main/java/net/runelite/injector/Inject.java index b228e55e5e..ad0e2a61ae 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/Inject.java +++ b/injector-plugin/src/main/java/net/runelite/injector/Inject.java @@ -48,6 +48,7 @@ import net.runelite.deob.deobfuscators.arithmetic.DMath; import net.runelite.injector.raw.ClearColorBuffer; import net.runelite.injector.raw.DrawAfterWidgets; import net.runelite.injector.raw.DrawMenu; +import net.runelite.injector.raw.HidePlayerAttacks; import net.runelite.injector.raw.Occluder; import net.runelite.injector.raw.RasterizerHook; import net.runelite.injector.raw.RenderDraw; @@ -78,6 +79,7 @@ public class Inject private final ClearColorBuffer clearColorBuffer = new ClearColorBuffer(this); private final RenderDraw renderDraw = new RenderDraw(this); private final Occluder occluder = new Occluder(this); + private final HidePlayerAttacks hidePlayerAttacks = new HidePlayerAttacks(this); // deobfuscated contains exports etc to apply to vanilla private final ClassGroup deobfuscated, vanilla; @@ -337,6 +339,7 @@ public class Inject renderDraw.inject(); drawMenu.inject(); occluder.inject(); + hidePlayerAttacks.inject(); } private java.lang.Class injectInterface(ClassFile cf, ClassFile other) diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java index e9a32a0bb0..d9680d1fed 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java +++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java @@ -91,6 +91,28 @@ public class InjectUtil public static Field findDeobField(Inject inject, String name) throws InjectionException { + return findDeobField(inject, name, null); + } + + public static Field findDeobField(Inject inject, String name, String hint) throws InjectionException + { + if (hint != null) + { + ClassFile c = inject.getDeobfuscated().findClass(hint); + for (Field f : c.getFields()) + { + if (!f.getName().equals(name)) + { + continue; + } + + String obfuscatedName = DeobAnnotations.getObfuscatedName(f.getAnnotations()); + + ClassFile c2 = inject.toObClass(c); + return c2.findField(obfuscatedName); + } + } + for (ClassFile c : inject.getDeobfuscated().getClasses()) { for (Field f : c.getFields()) diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java b/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java new file mode 100644 index 0000000000..249d1e4774 --- /dev/null +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java @@ -0,0 +1,131 @@ +package net.runelite.injector.raw; + +import com.google.common.base.Stopwatch; +import java.util.Iterator; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.Label; +import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.code.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.IfACmpEq; +import net.runelite.asm.attributes.code.instructions.IfACmpNe; +import net.runelite.asm.attributes.code.instructions.IfNe; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.pool.Field; +import net.runelite.injector.Inject; +import net.runelite.injector.InjectUtil; +import net.runelite.injector.InjectionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class HidePlayerAttacks +{ + private final Logger log = LoggerFactory.getLogger(HidePlayerAttacks.class); + private final Inject inject; + + public HidePlayerAttacks(Inject inject) + { + this.inject = inject; + } + + public void inject() throws InjectionException + { + Stopwatch stopwatch = Stopwatch.createStarted(); + + final Method addPlayerOptions = InjectUtil.findStaticMethod(inject, "addPlayerToMenu"); + final Field AttackOption_hidden = InjectUtil.findDeobField(inject, "AttackOption_hidden", "AttackOption").getPoolField(); + final Field attackOption = InjectUtil.findDeobField(inject, "playerAttackOption", "Client").getPoolField(); + final net.runelite.asm.pool.Method shouldHideAttackOptionFor = inject.getVanilla().findClass("client").findMethod("shouldHideAttackOptionFor").getPoolMethod(); + + // GETSTATIC GETSTATIC + // GETSTATIC GETSTATIC + // IFACMPEQ -> label continue IFACMPNE -> label whatever lets carry on + // MORE OBFUSCATION + + int injectIdx = -1; + Instruction labelIns = null; + Label label = null; + + Instructions ins = addPlayerOptions.getCode().getInstructions(); + Iterator iterator = ins.getInstructions().iterator(); + while (iterator.hasNext()) + { + Instruction i = iterator.next(); + if (!(i instanceof GetStatic)) + { + continue; + } + + Field field = ((GetStatic) i).getField(); + if (!field.equals(AttackOption_hidden) && !field.equals(attackOption)) + { + continue; + } + + i = iterator.next(); + if (!(i instanceof GetStatic)) + { + continue; + } + + field = ((GetStatic) i).getField(); + if (!field.equals(AttackOption_hidden) && !field.equals(attackOption)) + { + continue; + } + + i = iterator.next(); + if (!(i instanceof ComparisonInstruction && i instanceof JumpingInstruction)) + { + log.info("You're not supposed to see this lol"); + continue; + } + + if (i instanceof IfACmpEq) + { + injectIdx = ins.getInstructions().indexOf(i) + 1; + label = ((IfACmpEq) i).getJumps().get(0); + } + else if (i instanceof IfACmpNe) + { + injectIdx = ins.getInstructions().indexOf(((IfACmpNe) i).getJumps().get(0)) + 1; + // We're gonna have to inject a extra label + labelIns = iterator.next(); + } + + break; + } + + if (injectIdx <= 0 || label == null && labelIns == null) + { + throw new InjectionException("HidePlayerAttacks failed"); + } + + // Load the player + ALoad i1 = new ALoad(ins, 0); + // Get the boolean + InvokeStatic i2 = new InvokeStatic(ins, shouldHideAttackOptionFor); + + ins.addInstruction(injectIdx, i1); + ins.addInstruction(injectIdx + 1, i2); + + if (label == null) + { + label = ins.createLabelFor(labelIns); + ins.rebuildLabels(); + injectIdx = ins.getInstructions().indexOf(i2) + 1; + } + + // Compare n such + IfNe i3 = new IfNe(ins, label); + + ins.addInstruction(injectIdx, i3); + + stopwatch.stop(); + + log.info("HidePlayerAttacks took {}", stopwatch.toString()); + } +} 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 a470f0ceca..fee8165680 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1670,9 +1670,15 @@ public interface Client extends GameShell boolean getIsSpellSelected(); + /** + * Set whether or not player attack options will be hidden for clanmembers/friends + */ + void setHideFriendAttackOptions(boolean yes); + /** * Sorts the current menu entries in the same way the client does this. * The last entry will be the left click one after this. */ void sortMenuEntries(); + } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java index e5e82c8477..65f6bbe8a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java @@ -3,29 +3,22 @@ package net.runelite.client.plugins.clanmanmode; import com.google.inject.Provides; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.api.MenuEntry; import net.runelite.api.Player; import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.MenuEntryAdded; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.game.ClanManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; -import net.runelite.client.util.Text; -import org.apache.commons.lang3.ArrayUtils; @PluginDescriptor( name = "Clan Man Mode", @@ -37,10 +30,6 @@ import org.apache.commons.lang3.ArrayUtils; public class ClanManModePlugin extends Plugin { - - private static final String WALK_HERE = "WALK HERE"; - private static final String CANCEL = "CANCEL"; - @Inject private OverlayManager overlayManager; @@ -59,18 +48,6 @@ public class ClanManModePlugin extends Plugin @Inject private Client client; - @Inject - private ClanManager clanManager; - - private static final String CAST = "CAST"; - private static final String ATTACK_OPTIONS_ATTACK = "ATTACK"; - public static final HashSet ATTACK_OPTIONS_KEYWORDS = new HashSet<>(); - static - { - ATTACK_OPTIONS_KEYWORDS.add(CAST); - ATTACK_OPTIONS_KEYWORDS.add(ATTACK_OPTIONS_ATTACK); - } - @Provides ClanManModeConfig provideConfig(ConfigManager configManager) { @@ -90,6 +67,7 @@ public class ClanManModePlugin extends Plugin overlayManager.add(ClanManModeOverlay); overlayManager.add(ClanManModeTileOverlay); overlayManager.add(ClanManModeMinimapOverlay); + client.setHideFriendAttackOptions(config.hideAtkOpt()); } @Override @@ -98,6 +76,7 @@ public class ClanManModePlugin extends Plugin overlayManager.remove(ClanManModeOverlay); overlayManager.remove(ClanManModeTileOverlay); overlayManager.remove(ClanManModeMinimapOverlay); + client.setHideFriendAttackOptions(false); clan.clear(); ticks = 0; wildernessLevel = 0; @@ -106,6 +85,17 @@ public class ClanManModePlugin extends Plugin inwildy = 0; } + @Subscribe + private void onConfigChanged(ConfigChanged event) + { + if (!"clanmanmode".equals(event.getGroup())) + { + return; + } + + client.setHideFriendAttackOptions(config.hideAtkOpt()); + } + @Subscribe public void onGameStateChanged(GameStateChanged gameStateChanged) { @@ -135,111 +125,4 @@ public class ClanManModePlugin extends Plugin clanmax = Collections.max(clan.values()); } } - - @Subscribe - public void onMenuEntryAdded(MenuEntryAdded event) - { - - if (client.getGameState() != GameState.LOGGED_IN) - { - return; - } - - Player[] players = client.getCachedPlayers(); - Player player = null; - int identifier = event.getIdentifier(); - - if (identifier >= 0 && identifier < players.length) - { - player = players[identifier]; - } - - if (player == null) - { - return; - } - - final String pOptionToReplace = Text.removeTags(event.getOption()).toUpperCase(); - - //If the option is already to walk there, or cancel we don't need to swap it with anything - if (pOptionToReplace.equals(CANCEL) || pOptionToReplace.equals(WALK_HERE)) - { - return; - } - - if (config.hideAtkOpt() - && ATTACK_OPTIONS_KEYWORDS.contains(pOptionToReplace) - && (player.isFriend() || player.isClanMember())) - { - swap(pOptionToReplace); - } - else if (!config.hideAtkOpt()) - { - return; - } - - final String option = Text.removeTags(event.getOption()).toLowerCase(); - - if (option.equals("attack")) - { - final Pattern ppattern = Pattern.compile("(.+?)= 0) { - HitSplatDefinition var12 = class72.getHitSplatDefinition(var1); + HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(var1); var10 = var12.__c; var11 = var12.__i; } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 3395856851..699c61117b 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -43,8 +43,8 @@ public enum AttackOption implements Enumerated { @ObfuscatedSignature( signature = "[Llq;" ) - @Export("__cj_bo") - static IndexedSprite[] __cj_bo; + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; @ObfuscatedName("o") @ObfuscatedGetter( intValue = -1461217963 diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index cb0e1ffa1e..659c924834 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -78,10 +78,10 @@ public final class BoundaryObject { signature = "(Ljava/lang/String;B)V", garbageValue = "103" ) - static final void method3235(String var0) { + static final void doCheat(String var0) { if(var0.equalsIgnoreCase("toggleroof")) { ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); if(ReflectionCheck.clientPreferences.roofsHidden) { WorldMapIcon1.method219(99, "", "Roofs are now all hidden"); } else { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 12b1fe48b4..4e643dadd2 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -66,7 +66,7 @@ public class Buddy extends User { signature = "(I)V", garbageValue = "1868787018" ) - static final void method5554() { + static final void processOverheadText() { int[] var0 = Players.Players_indices; int var1; diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index a278f911ea..834f7c642d 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -1091,7 +1091,7 @@ public class Buffer extends Node { signature = "(B)V", garbageValue = "1" ) - public static void method3915() { + public static void clearHealthbarCaches() { HealthBarDefinition.HealthBarDefinition_cached.clear(); HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 97268c74fd..edbac8c291 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -91,15 +91,15 @@ public class ByteArrayPool { return var2; } - if(class179.__fe_e != null) { + if(RouteStrategy.__fe_e != null) { for(int var4 = 0; var4 < __gi_g.length; ++var4) { if(__gi_g[var4] != var0) { if(var0 < __gi_g[var4]) { ; } } else if(WorldMapSection2.__ah_l[var4] > 0) { - byte[] var3 = class179.__fe_e[var4][--WorldMapSection2.__ah_l[var4]]; - class179.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null; + byte[] var3 = RouteStrategy.__fe_e[var4][--WorldMapSection2.__ah_l[var4]]; + RouteStrategy.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null; return var3; } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 80de74600b..758b6637d0 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -120,10 +120,10 @@ public final class Canvas extends java.awt.Canvas { int var3; int var4; if(var0 == 100) { - class179.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; + RouteStrategy.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; if(var4 == 0) { throw new RuntimeException(); } else { @@ -170,22 +170,22 @@ public final class Canvas extends java.awt.Canvas { class22.method295(var10); return 1; } else if(var0 == 102) { - var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var9.children = null; class22.method295(var9); return 1; } else if(var0 != 200) { if(var0 == 201) { - var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if(var9 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; if(var2) { WorldMapIcon1.__t_i = var9; } else { class12.__n_n = var9; } } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; @@ -193,19 +193,19 @@ public final class Canvas extends java.awt.Canvas { return 2; } } else { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Widget var11 = class204.getWidgetChild(var3, var4); if(var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; if(var2) { WorldMapIcon1.__t_i = var11; } else { class12.__n_n = var11; } } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 662bf6a8b3..66e6aaea2f 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -188,31 +188,31 @@ public class ChatChannel { ) static final void method2237(Widget var0, int var1, int var2) { if(var0.buttonType == 1) { - Tiles.method1106(var0.buttonText, "", 24, 0, 0, var0.id); + Tiles.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); } String var3; if(var0.buttonType == 2 && !Client.isSpellSelected) { var3 = class198.method3745(var0); if(var3 != null) { - Tiles.method1106(var3, BufferedFile.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + Tiles.insertMenuItemNoShift(var3, BufferedFile.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); } } if(var0.buttonType == 3) { - Tiles.method1106("Close", "", 26, 0, 0, var0.id); + Tiles.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); } if(var0.buttonType == 4) { - Tiles.method1106(var0.buttonText, "", 28, 0, 0, var0.id); + Tiles.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); } if(var0.buttonType == 5) { - Tiles.method1106(var0.buttonText, "", 29, 0, 0, var0.id); + Tiles.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); } if(var0.buttonType == 6 && Client.__client_mo == null) { - Tiles.method1106(var0.buttonText, "", 30, 0, -1, var0.id); + Tiles.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); } int var4; @@ -237,11 +237,11 @@ public class ChatChannel { ItemDefinition var8 = Skills.getItemDefinition(var0.itemIds[var13] - 1); if(Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { if(var0.id != ServerPacket.selectedItemWidget || var13 != HealthBarDefinition.selectedItemSlot) { - Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); } } else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { if((FloorDecoration.selectedSpellFlags & 16) == 16) { - Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); } } else { String[] var9 = var8.inventoryActions; @@ -254,24 +254,24 @@ public class ChatChannel { if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { for(var11 = 4; var11 >= 3; --var11) { if(var10 != var11) { - AccessFile.method2726(var0, var8, var13, var11, false); + AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false); } } } if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) { - Tiles.method1106("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); } if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) { for(var11 = 2; var11 >= 0; --var11) { if(var11 != var10) { - AccessFile.method2726(var0, var8, var13, var11, false); + AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false); } } if(var10 >= 0) { - AccessFile.method2726(var0, var8, var13, var10, true); + AccessFile.addWidgetItemMenuItem(var0, var8, var13, var10, true); } } @@ -300,12 +300,12 @@ public class ChatChannel { var12 = 43; } - Tiles.method1106(var9[var11], BufferedFile.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift(var9[var11], BufferedFile.colorStartTag(0xff9040) + var8.name, var12, var8.id, var13, var0.id); } } } - Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(0xff9040) + var8.name, 1005, var8.id, var13, var0.id); } } } @@ -318,19 +318,19 @@ public class ChatChannel { if(var0.isIf3) { if(Client.isSpellSelected) { if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) { - Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); } } else { for(var13 = 9; var13 >= 5; --var13) { String var14 = GameShell.method1060(var0, var13); if(var14 != null) { - Tiles.method1106(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + Tiles.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); } } var3 = class198.method3745(var0); if(var3 != null) { - Tiles.method1106(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + Tiles.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); } for(var4 = 4; var4 >= 0; --var4) { @@ -343,7 +343,7 @@ public class ChatChannel { var5 = class1.getWidgetClickMask(var0); boolean var16 = (var5 & 1) != 0; if(var16) { - Tiles.method1106("Continue", "", 30, 0, var0.childIndex, var0.id); + Tiles.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); } } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index a0871d5700..5b004c23d7 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -221,7 +221,7 @@ public class ClanChat extends UserList { ) @Export("__cp_475") final void __cp_475(ClanMate var1) { - if(var1.username().__equals_466(this.localUser.username())) { + if(var1.username().equals(this.localUser.username())) { this.rank = var1.rank; } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 4e37d7317f..983ef4e176 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -3641,7 +3641,7 @@ public final class Client extends GameShell implements Usernamed { switch(field658.field1984) { case 0: case 3: - var3.writeMedium(class13.__i_af); + var3.writeMedium(class13.otpInt); ++var3.index; break; case 1: @@ -3808,7 +3808,7 @@ public final class Client extends GameShell implements Usernamed { ReflectionCheck.clientPreferences.rememberedUsername = null; } - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); rights = ((AbstractSocket)var1).readUnsignedByte(); __client_mn = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); @@ -4127,7 +4127,7 @@ public final class Client extends GameShell implements Usernamed { } PacketBufferNode var18; - if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; if(var16 > 4095L) { var16 = 4095L; @@ -4244,7 +4244,7 @@ public final class Client extends GameShell implements Usernamed { } } - Buddy.method5554(); + Buddy.processOverheadText(); ++__client_gy; if(mouseCrossColor != 0) { mouseCrossState += 20; @@ -5054,7 +5054,7 @@ public final class Client extends GameShell implements Usernamed { } } - PlayerType.method4547(var5); + PlayerType.clearItemContainer(var5); var7 = var3.__ag_302(); for(var8 = 0; var8 < var7; ++var8) { @@ -6269,7 +6269,7 @@ public final class Client extends GameShell implements Usernamed { int var13; if(isMenuOpen) { int var12; - if(var15 != 1 && (AbstractRasterProvider.__lp_ca || var15 != 4)) { + if(var15 != 1 && (AbstractRasterProvider.mouseCam || var15 != 4)) { var2 = MouseHandler.MouseHandler_x; var12 = MouseHandler.MouseHandler_y; if(var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var12 < GameShell.menuY - 10 || var12 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) { @@ -6278,7 +6278,7 @@ public final class Client extends GameShell implements Usernamed { } } - if(var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) { + if(var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) { var2 = class25.menuX; var12 = GameShell.menuY; var13 = class214.menuWidth; @@ -6302,7 +6302,7 @@ public final class Client extends GameShell implements Usernamed { } } else { var2 = menuOptionsCount - 1; - if((var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) && var2 >= 0) { + if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && var2 >= 0) { var13 = menuOpcodes[var2]; if(var13 == 39 || var13 == 40 || var13 == 41 || var13 == 42 || var13 == 43 || var13 == 33 || var13 == 34 || var13 == 35 || var13 == 36 || var13 == 37 || var13 == 38 || var13 == 1005) { var5 = menuArguments1[var2]; @@ -6321,11 +6321,11 @@ public final class Client extends GameShell implements Usernamed { } } - if((var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) && this.shouldLeftClickOpenMenu()) { + if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && this.shouldLeftClickOpenMenu()) { var15 = 2; } - if((var15 == 1 || !AbstractRasterProvider.__lp_ca && var15 == 4) && menuOptionsCount > 0) { + if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && menuOptionsCount > 0) { WorldMapSection0.method245(var2); } diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java index 2023de1536..6ca10198ab 100644 --- a/runescape-client/src/main/java/ClientParameter.java +++ b/runescape-client/src/main/java/ClientParameter.java @@ -190,7 +190,7 @@ public class ClientParameter { var3.population = var1.__aq_303(); } - MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l); + MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); FriendLoginUpdate.__kn_x = null; return true; } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 339f08741d..1d376b3d10 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -189,23 +189,23 @@ public class Decimator { var6 = Scene.Scene_cameraPitchCosine; var7 = Scene.Scene_cameraYawSine; var8 = Scene.Scene_cameraYawCosine; - byte var9 = 50; - short var10 = 3500; - var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var15 = Rasterizer3D.method3007(var12, var9, var6, var5); - var16 = Rasterizer3D.method3008(var12, var9, var6, var5); + byte clickboxClose = 50; + short clickboxFar = 3500; + var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * clickboxClose / Rasterizer3D.Rasterizer3D_zoom; + var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * clickboxClose / Rasterizer3D.Rasterizer3D_zoom; + var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * clickboxFar / Rasterizer3D.Rasterizer3D_zoom; + int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * clickboxFar / Rasterizer3D.Rasterizer3D_zoom; + int var15 = Rasterizer3D.rot1(var12, clickboxClose, var6, var5); + var16 = Rasterizer3D.rot2(var12, clickboxClose, var6, var5); var12 = var15; - var15 = Rasterizer3D.method3007(var14, var10, var6, var5); - var17 = Rasterizer3D.method3008(var14, var10, var6, var5); + var15 = Rasterizer3D.rot1(var14, clickboxFar, var6, var5); + var17 = Rasterizer3D.rot2(var14, clickboxFar, var6, var5); var14 = var15; - var15 = Rasterizer3D.method3005(var11, var16, var8, var7); - var16 = Rasterizer3D.method3006(var11, var16, var8, var7); + var15 = Rasterizer3D.rot3(var11, var16, var8, var7); + var16 = Rasterizer3D.rot4(var11, var16, var8, var7); var11 = var15; - var15 = Rasterizer3D.method3005(var13, var17, var8, var7); - var17 = Rasterizer3D.method3006(var13, var17, var8, var7); + var15 = Rasterizer3D.rot3(var13, var17, var8, var7); + var17 = Rasterizer3D.rot4(var13, var17, var8, var7); AccessFile.__dk_o = (var11 + var15) / 2; ViewportMouse.__dm_u = (var14 + var12) / 2; ViewportMouse.__dm_g = (var17 + var16) / 2; diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index dd7a71cf5d..35d3383bd7 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -308,7 +308,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { } if(var10.contentType == 1402) { - class16.field85.method1782(var12, Client.cycle); + class16.loginScreenRunesAnimation.method1782(var12, Client.cycle); } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 95d3a17dae..98cfafac12 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -208,17 +208,17 @@ public class DynamicObject extends Entity { ) static int method2223(int var0, Script var1, boolean var2) { if(var0 == 5000) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.publicChatMode; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.publicChatMode; return 1; } else if(var0 == 5001) { - class179.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); if(IndexCacheLoader.field512 == null) { IndexCacheLoader.field512 = class310.field3805; } - Client.__client_pl = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; + Client.__client_pl = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; PacketBufferNode var18 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher); var18.packetBuffer.writeByte(Client.publicChatMode); var18.packetBuffer.writeByte(IndexCacheLoader.field512.field3804); @@ -230,9 +230,9 @@ public class DynamicObject extends Entity { int var4; if(var0 == 5002) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class179.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher); var6.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2); var6.packetBuffer.writeStringCp1252NullTerminated(var3); @@ -243,58 +243,58 @@ public class DynamicObject extends Entity { } else { int var10; if(var0 == 5003) { - class179.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Message var15 = Message.method1226(var10, var4); if(var15 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.cycle; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null?var15.sender:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null?var15.prefix:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null?var15.text:""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 5004) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Message var16 = NetCache.method4708(var10); if(var16 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.cycle; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null?var16.sender:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null?var16.prefix:""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null?var16.text:""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 5005) { if(IndexCacheLoader.field512 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804; } return 1; } else if(var0 == 5008) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; String var14 = var3.toLowerCase(); byte var17 = 0; if(var14.startsWith("yellow:")) { @@ -433,23 +433,23 @@ public class DynamicObject extends Entity { return 1; } else if(var0 != 5015) { if(var0 == 5016) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_pl; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_pl; return 1; } else if(var0 == 5017) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var10); + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var10); return 1; } else if(var0 == 5018) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class12.method161(var10); + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var10); return 1; } else if(var0 == 5019) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SpriteMask.method4391(var10); + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var10); return 1; } else if(var0 == 5020) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - BoundaryObject.method3235(var3); + BoundaryObject.doCheat(var3); return 1; } else if(var0 == 5021) { Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 749e57c1b8..e6996f3685 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -78,11 +78,11 @@ public class FontName { signature = "(I)V", garbageValue = "-1587423260" ) - static void method5636() { - Login.__cu_bk = false; - Login.__cu_g.drawAt(Login.__cu_q, 0); - Fonts.__kz_l.drawAt(Login.__cu_q + 382, 0); - WorldMapSectionType.__h_e.__q_496(Login.__cu_q + 382 - WorldMapSectionType.__h_e.subWidth / 2, 18); + static void closeWorldSelect() { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18); } @ObfuscatedName("s") @@ -106,18 +106,18 @@ public class FontName { static int method5639(int var0, Script var1, boolean var2) { if(var0 == 3600) { if(WorldMapArea.friendSystem.__g == 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -2; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -2; } else if(WorldMapArea.friendSystem.__g == 1) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.friendsList.size(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.friendsList.size(); } return 1; } else { int var3; if(var0 == 3601) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { Friend var8 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.name(); @@ -129,20 +129,20 @@ public class FontName { return 1; } else if(var0 == 3602) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 3603) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; @@ -150,7 +150,7 @@ public class FontName { String var5; if(var0 == 3604) { var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; method5638(var5, var6); return 1; } else if(var0 == 3605) { @@ -172,7 +172,7 @@ public class FontName { } else if(var0 == 3609) { var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = NpcDefinition.method5161(var5); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0; return 1; } else if(var0 == 3611) { if(PacketWriter.clanChat != null) { @@ -184,14 +184,14 @@ public class FontName { return 1; } else if(var0 == 3612) { if(PacketWriter.clanChat != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size(); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 3613) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).username().getName(); } else { @@ -200,32 +200,32 @@ public class FontName { return 1; } else if(var0 == 3614) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world(); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 3615) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 3616) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0; return 1; } else if(var0 == 3617) { var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; IndexStoreActionHandler.method4655(var5); return 1; } else if(var0 == 3618) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0; return 1; } else if(var0 == 3619) { var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; @@ -236,14 +236,14 @@ public class FontName { return 1; } else if(var0 == 3621) { if(!WorldMapArea.friendSystem.__m_151()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.ignoreList.size(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.ignoreList.size(); } return 1; } else if(var0 == 3622) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) { Ignored var4 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name(); @@ -257,14 +257,14 @@ public class FontName { } else if(var0 == 3623) { var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; var5 = NpcDefinition.method5161(var5); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0; return 1; } else if(var0 == 3624) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().__equals_466(Canvas.localPlayer.username)) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) { + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; @@ -277,11 +277,11 @@ public class FontName { return 1; } else if(var0 == 3626) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; @@ -292,43 +292,43 @@ public class FontName { } else { boolean var7; if(var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var7)); return 1; } else if(var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var7)); return 1; } else if(var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var7)); return 1; } else if(var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var7)); return 1; } else if(var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var7)); return 1; } else if(var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var7)); return 1; } else if(var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var7)); return 1; } else if(var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var7)); return 1; } else if(var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var7)); return 1; } else if(var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var7)); return 1; } else if(var0 == 3639) { @@ -338,11 +338,11 @@ public class FontName { WorldMapArea.friendSystem.ignoreList.removeComparator(); return 1; } else if(var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); return 1; } else if(var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); return 1; } else if(var0 == 3643) { @@ -355,70 +355,70 @@ public class FontName { return 1; } else if(var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator1(var7)); } return 1; } else if(var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator2(var7)); } return 1; } else if(var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator3(var7)); } return 1; } else if(var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator4(var7)); } return 1; } else if(var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator5(var7)); } return 1; } else if(var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator6(var7)); } return 1; } else if(var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator7(var7)); } return 1; } else if(var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator8(var7)); } return 1; } else if(var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator9(var7)); } return 1; } else if(var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new UserComparator10(var7)); } @@ -431,11 +431,11 @@ public class FontName { return 1; } else if(var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapArea.friendSystem.friendsList.addComparator(new class157(var7)); return 1; } else if(var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(PacketWriter.clanChat != null) { PacketWriter.clanChat.addComparator(new class157(var7)); } @@ -446,11 +446,11 @@ public class FontName { } } } else { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; @@ -470,14 +470,14 @@ public class FontName { DevicePcmPlayerProvider.method841(); WorldMapManager.method673(); WorldMapLabel.method440(); - class72.method1780(); + LoginScreenAnimation.method1780(); SequenceDefinition.SequenceDefinition_cached.clear(); SequenceDefinition.__jh_o.clear(); UserComparator3.method3379(); VarbitDefinition.VarbitDefinition_cached.clear(); VarpDefinition.VarpDefinition_cached.clear(); GrandExchangeEvents.method69(); - Buffer.method3915(); + Buffer.clearHealthbarCaches(); StructDefinition.__jq_f.clear(); InvDefinition.method4754(); Projectile.method2089(); diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 0da8788136..fcb36dfb17 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -20,8 +20,8 @@ public class Fonts { @ObfuscatedSignature( signature = "Lln;" ) - @Export("__kz_l") - static Sprite __kz_l; + @Export("rightTitleSprite") + static Sprite rightTitleSprite; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lir;" diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java index 7c021f1425..554a403061 100644 --- a/runescape-client/src/main/java/Formatting.java +++ b/runescape-client/src/main/java/Formatting.java @@ -24,18 +24,18 @@ public class Formatting { static int method2023(int var0, Script var1, boolean var2) { Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; if(var0 == 1700) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.itemId; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; } else if(var0 == 1701) { if(var3.itemId != -1) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.itemQuantity; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 1702) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.childIndex; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex; return 1; } else { return 2; @@ -52,9 +52,9 @@ public class Formatting { int var4; int var6; if(var0 == 3400) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; EnumDefinition var5 = Interpreter.getEnum(var3); if(var5.valType != 's') { ; @@ -75,19 +75,19 @@ public class Formatting { return 1; } else if(var0 != 3408) { if(var0 == 3411) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; EnumDefinition var10 = Interpreter.getEnum(var3); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var10.size(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.size(); return 1; } else { return 2; } } else { - class179.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; + RouteStrategy.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; EnumDefinition var7 = Interpreter.getEnum(var9); if(var3 == var7.keyType && var4 == var7.valType) { for(int var8 = 0; var8 < var7.size0; ++var8) { @@ -95,7 +95,7 @@ public class Formatting { if(var4 == 115) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8]; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var7.intVals[var8]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8]; } var7 = null; @@ -107,7 +107,7 @@ public class Formatting { if(var4 == 115) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var7.defaultInt; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt; } } @@ -116,7 +116,7 @@ public class Formatting { if(var4 == 115) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 30895668fb..cca71579cf 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -13,8 +13,8 @@ public class Frames extends DualNode { @ObfuscatedSignature( signature = "[Llq;" ) - @Export("__en_bc") - static IndexedSprite[] __en_bc; + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; @ObfuscatedName("m") @ObfuscatedSignature( signature = "[Ldz;" diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 00d9abd408..eddea33e3f 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -116,7 +116,7 @@ public class FriendSystem { ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - return var1 != null && (var1.__equals_466(Canvas.localPlayer.username) || this.friendsList.isFriended(var1, var2)); + return var1 != null && (var1.equals(Canvas.localPlayer.username) || this.friendsList.isFriended(var1, var2)); } @ObfuscatedName("g") @@ -145,7 +145,7 @@ public class FriendSystem { var10000 = null; var4 = "Your friend list is full. Max of 200 for free users, and 400 for members"; WorldMapIcon1.method219(30, "", var4); - } else if(Canvas.localPlayer.username.__equals_466(var2)) { + } else if(Canvas.localPlayer.username.equals(var2)) { var10000 = null; var4 = "You can\'t add yourself to your own friend list"; WorldMapIcon1.method219(30, "", var4); @@ -200,7 +200,7 @@ public class FriendSystem { var10000 = null; var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; WorldMapIcon1.method219(30, "", var4); - } else if(Canvas.localPlayer.username.__equals_466(var2)) { + } else if(Canvas.localPlayer.username.equals(var2)) { var10000 = null; var4 = "You can\'t add yourself to your own ignore list"; WorldMapIcon1.method219(30, "", var4); @@ -284,8 +284,8 @@ public class FriendSystem { signature = "(Lkp;S)Z", garbageValue = "-543" ) - @Export("__t_161") - final boolean __t_161(Username var1) { + @Export("isFriendAndHasWorld") + final boolean isFriendAndHasWorld(Username var1) { Friend var2 = (Friend)this.friendsList.getByUsername(var1); return var2 != null && var2.hasWorld(); } @@ -299,7 +299,7 @@ public class FriendSystem { Widget var3; if(var0 >= 2000) { var0 -= 1000; - var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index dd2ac0d342..e8832d1c43 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -108,7 +108,7 @@ public class FriendsList extends UserList { boolean var14 = true; for(FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.__f_438(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.__q_439()) { - if(var13.username.__equals_466(var4)) { + if(var13.username.equals(var4)) { if(var6 != 0 && var13.world == 0) { var13.remove(); var14 = false; diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index 77af9c38ae..023a265615 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -92,7 +92,7 @@ public class GrandExchangeEvent { } if(var3 != null) { - class179.Interpreter_intStackSize = 0; + RouteStrategy.Interpreter_intStackSize = 0; Interpreter.Interpreter_stringStackSize = 0; var17 = -1; int[] var5 = var3.opcodes; @@ -192,36 +192,36 @@ public class GrandExchangeEvent { throw new IllegalStateException(); } } else if(var29 == 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6[var17]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var17]; } else if(var29 == 1) { var11 = var6[var17]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; } else if(var29 == 2) { var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; IndexCache.method4703(var11); } else if(var29 == 3) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; } else if(var29 == 6) { var17 += var6[var17]; } else if(var29 == 7) { - class179.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { + RouteStrategy.Interpreter_intStackSize -= 2; + if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var17 += var6[var17]; } } else if(var29 == 8) { - class179.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { + RouteStrategy.Interpreter_intStackSize -= 2; + if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var17 += var6[var17]; } } else if(var29 == 9) { - class179.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { + RouteStrategy.Interpreter_intStackSize -= 2; + if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var17 += var6[var17]; } } else if(var29 == 10) { - class179.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { + RouteStrategy.Interpreter_intStackSize -= 2; + if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var17 += var6[var17]; } } else if(var29 == 21) { @@ -238,24 +238,24 @@ public class GrandExchangeEvent { Interpreter.Interpreter_stringLocals = var34.stringLocals; } else if(var29 == 25) { var11 = var6[var17]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11); } else if(var29 == 27) { var11 = var6[var17]; - class68.method1695(var11, Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + class68.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else if(var29 == 31) { - class179.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { + RouteStrategy.Interpreter_intStackSize -= 2; + if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var17 += var6[var17]; } } else if(var29 == 32) { - class179.Interpreter_intStackSize -= 2; - if(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]) { + RouteStrategy.Interpreter_intStackSize -= 2; + if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) { var17 += var6[var17]; } } else if(var29 == 33) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]]; } else if(var29 == 34) { - Username.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + Username.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; } else if(var29 == 35) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; } else if(var29 == 36) { @@ -266,20 +266,20 @@ public class GrandExchangeEvent { String var31 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31; } else if(var29 == 38) { - --class179.Interpreter_intStackSize; + --RouteStrategy.Interpreter_intStackSize; } else if(var29 == 39) { --Interpreter.Interpreter_stringStackSize; } else { int var15; if(var29 != 40) { if(var29 == 42) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]); } else if(var29 == 43) { - class196.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + class196.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else if(var29 == 44) { var11 = var6[var17] >> 16; var20 = var6[var17] & 65535; - int var21 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + int var21 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var21 < 0 || var21 > 5000) { throw new RuntimeException(); } @@ -295,21 +295,21 @@ public class GrandExchangeEvent { } } else if(var29 == 45) { var11 = var6[var17]; - var20 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var20 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { throw new RuntimeException(); } - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; } else if(var29 == 46) { var11 = var6[var17]; - class179.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; + RouteStrategy.Interpreter_intStackSize -= 2; + var20 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { throw new RuntimeException(); } - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; } else if(var29 == 47) { var18 = class196.varcs.getStringOld(var6[var17]); if(var18 == null) { @@ -330,7 +330,7 @@ public class GrandExchangeEvent { } IterableNodeHashTable var33 = var3.switches[var6[var17]]; - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if(var30 != null) { var17 += var30.integer; } @@ -342,14 +342,14 @@ public class GrandExchangeEvent { String[] var14 = new String[var12.localStringCount]; for(var15 = 0; var15 < var12.intArgumentCount; ++var15) { - var13[var15] = Interpreter.Interpreter_intStack[var15 + (class179.Interpreter_intStackSize - var12.intArgumentCount)]; + var13[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var12.intArgumentCount)]; } for(var15 = 0; var15 < var12.stringArgumentCount; ++var15) { var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)]; } - class179.Interpreter_intStackSize -= var12.intArgumentCount; + RouteStrategy.Interpreter_intStackSize -= var12.intArgumentCount; Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount; ScriptFrame var19 = new ScriptFrame(); var19.script = var3; diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index f23a12fa99..456dcb0691 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -121,51 +121,51 @@ public class GrandExchangeEvents { garbageValue = "620886402" ) static int method75(int var0, Script var1, boolean var2) { - Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if(var0 == 2600) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollX; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; } else if(var0 == 2601) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollY; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; } else if(var0 == 2602) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; } else if(var0 == 2603) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollWidth; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; } else if(var0 == 2604) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollHeight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; } else if(var0 == 2605) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelZoom; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; } else if(var0 == 2606) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelAngleX; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; } else if(var0 == 2607) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelAngleZ; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; } else if(var0 == 2608) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelAngleY; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; } else if(var0 == 2609) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.transparency; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; } else if(var0 == 2610) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__af; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af; return 1; } else if(var0 == 2611) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; } else if(var0 == 2612) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; } else if(var0 == 2613) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; } else if(var0 == 2614) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index a9152aa015..19433596b2 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -17,8 +17,8 @@ public final class GraphicsObject extends Entity { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__bw_k") - static IndexedSprite __bw_k; + @Export("options_buttons_4Sprite") + static IndexedSprite options_buttons_4Sprite; @ObfuscatedName("fr") @ObfuscatedGetter( intValue = -438288575 diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java index 1f5d488216..4b9c5708bd 100644 --- a/runescape-client/src/main/java/GroundItemPile.java +++ b/runescape-client/src/main/java/GroundItemPile.java @@ -11,8 +11,8 @@ public final class GroundItemPile { @ObfuscatedGetter( intValue = -704675849 ) - @Export("__dr_ao") - static int __dr_ao; + @Export("optionButtonSpriteSubHeight") + static int optionButtonSpriteSubHeight; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lex;" diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 80ade46bc1..50370c62b4 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -265,7 +265,7 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1?class72.getHitSplatDefinition(var2):null; + return var2 != -1? LoginScreenAnimation.getHitSplatDefinition(var2):null; } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java index d623810bfd..9003278964 100644 --- a/runescape-client/src/main/java/IndexCacheLoader.java +++ b/runescape-client/src/main/java/IndexCacheLoader.java @@ -16,8 +16,8 @@ public class IndexCacheLoader { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__bd_u") - static IndexedSprite __bd_u; + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; @ObfuscatedName("x") @Export("__bd_x") public static short[][] __bd_x; @@ -83,9 +83,9 @@ public class IndexCacheLoader { ) @Export("drawTitle") static void drawTitle(Font var0, Font var1, Font var2) { - Login.__cu_q = (SoundCache.canvasWidth - 765) / 2; - Login.__cu_y = Login.__cu_q + 202; - Varps.__hv_h = Login.__cu_y + 180; + Login.xPadding = (SoundCache.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Varps.loginBoxCenter = Login.loginBoxX + 180; int var9; int var11; int var19; @@ -94,136 +94,136 @@ public class IndexCacheLoader { int var27; int var28; int var48; - if(Login.__cu_bk) { - if(class30.__ar_bd == null) { - class30.__ar_bd = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); + if(Login.worldSelectOpen) { + if(class30.worldSelectBackSprites == null) { + class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", ""); } IndexCache var36; int var37; int var39; IndexedSprite[] var40; - if(Frames.__en_bc == null) { + if(Frames.worldSelectFlagSprites == null) { var36 = WorldMapSection3.indexCache8; var39 = var36.getArchiveId("sl_flags"); var37 = var36.getRecordId(var39, ""); - if(!SpriteMask.method4392(var36, var39, var37)) { + if(!SpriteMask.loadSprite(var36, var39, var37)) { var40 = null; } else { - var40 = WorldMapLabel.method444(); + var40 = WorldMapLabel.createIndexedSpriteArray(); } - Frames.__en_bc = var40; + Frames.worldSelectFlagSprites = var40; } - if(AttackOption.__cj_bo == null) { + if(AttackOption.worldSelectArrows == null) { var36 = WorldMapSection3.indexCache8; var39 = var36.getArchiveId("sl_arrows"); var37 = var36.getRecordId(var39, ""); - if(!SpriteMask.method4392(var36, var39, var37)) { + if(!SpriteMask.loadSprite(var36, var39, var37)) { var40 = null; } else { - var40 = WorldMapLabel.method444(); + var40 = WorldMapLabel.createIndexedSpriteArray(); } - AttackOption.__cj_bo = var40; + AttackOption.worldSelectArrows = var40; } - if(UrlRequest.__ey_bx == null) { + if(UrlRequest.worldSelectStars == null) { var36 = WorldMapSection3.indexCache8; var39 = var36.getArchiveId("sl_stars"); var37 = var36.getRecordId(var39, ""); - if(!SpriteMask.method4392(var36, var39, var37)) { + if(!SpriteMask.loadSprite(var36, var39, var37)) { var40 = null; } else { - var40 = WorldMapLabel.method444(); + var40 = WorldMapLabel.createIndexedSpriteArray(); } - UrlRequest.__ey_bx = var40; + UrlRequest.worldSelectStars = var40; } - if(SecureRandomFuture.__cn_bu == null) { - SecureRandomFuture.__cn_bu = MenuAction.method2025(WorldMapSection3.indexCache8, "leftarrow", ""); + if(SecureRandomFuture.worldSelectLeftSprite == null) { + SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", ""); } - if(NetSocket.__fb_bm == null) { - NetSocket.__fb_bm = MenuAction.method2025(WorldMapSection3.indexCache8, "rightarrow", ""); + if(NetSocket.worldSelectRightSprite == null) { + NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", ""); } - Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_q, 23, 765, 480, 0); - Rasterizer2D.drawGradient(Login.__cu_q, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.drawGradient(Login.__cu_q + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.__cu_q + 62, 15, 0, -1); - if(UrlRequest.__ey_bx != null) { - UrlRequest.__ey_bx[1].__q_496(Login.__cu_q + 140, 1); - var1.draw("Members only world", Login.__cu_q + 152, 10, 16777215, -1); - UrlRequest.__ey_bx[0].__q_496(Login.__cu_q + 140, 12); - var1.draw("Free world", Login.__cu_q + 152, 21, 16777215, -1); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); + Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); + Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); + if(UrlRequest.worldSelectStars != null) { + UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + UrlRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); } - if(AttackOption.__cj_bo != null) { - var48 = Login.__cu_q + 280; - if(World.__bt_e[0] == 0 && World.__bt_l[0] == 0) { - AttackOption.__cj_bo[2].__q_496(var48, 4); + if(AttackOption.worldSelectArrows != null) { + var48 = Login.xPadding + 280; + if(World.sortOption1[0] == 0 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var48, 4); } else { - AttackOption.__cj_bo[0].__q_496(var48, 4); + AttackOption.worldSelectArrows[0].drawAt(var48, 4); } - if(World.__bt_e[0] == 0 && World.__bt_l[0] == 1) { - AttackOption.__cj_bo[3].__q_496(var48 + 15, 4); + if(World.sortOption1[0] == 0 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var48 + 15, 4); } else { - AttackOption.__cj_bo[1].__q_496(var48 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var48 + 15, 4); } var0.draw("World", var48 + 32, 17, 16777215, -1); - var24 = Login.__cu_q + 390; - if(World.__bt_e[0] == 1 && World.__bt_l[0] == 0) { - AttackOption.__cj_bo[2].__q_496(var24, 4); + var24 = Login.xPadding + 390; + if(World.sortOption1[0] == 1 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var24, 4); } else { - AttackOption.__cj_bo[0].__q_496(var24, 4); + AttackOption.worldSelectArrows[0].drawAt(var24, 4); } - if(World.__bt_e[0] == 1 && World.__bt_l[0] == 1) { - AttackOption.__cj_bo[3].__q_496(var24 + 15, 4); + if(World.sortOption1[0] == 1 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var24 + 15, 4); } else { - AttackOption.__cj_bo[1].__q_496(var24 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var24 + 15, 4); } var0.draw("Players", var24 + 32, 17, 16777215, -1); - var39 = Login.__cu_q + 500; - if(World.__bt_e[0] == 2 && World.__bt_l[0] == 0) { - AttackOption.__cj_bo[2].__q_496(var39, 4); + var39 = Login.xPadding + 500; + if(World.sortOption1[0] == 2 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var39, 4); } else { - AttackOption.__cj_bo[0].__q_496(var39, 4); + AttackOption.worldSelectArrows[0].drawAt(var39, 4); } - if(World.__bt_e[0] == 2 && World.__bt_l[0] == 1) { - AttackOption.__cj_bo[3].__q_496(var39 + 15, 4); + if(World.sortOption1[0] == 2 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var39 + 15, 4); } else { - AttackOption.__cj_bo[1].__q_496(var39 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var39 + 15, 4); } var0.draw("Location", var39 + 32, 17, 16777215, -1); - var37 = Login.__cu_q + 610; - if(World.__bt_e[0] == 3 && World.__bt_l[0] == 0) { - AttackOption.__cj_bo[2].__q_496(var37, 4); + var37 = Login.xPadding + 610; + if(World.sortOption1[0] == 3 && World.sortOption2[0] == 0) { + AttackOption.worldSelectArrows[2].drawAt(var37, 4); } else { - AttackOption.__cj_bo[0].__q_496(var37, 4); + AttackOption.worldSelectArrows[0].drawAt(var37, 4); } - if(World.__bt_e[0] == 3 && World.__bt_l[0] == 1) { - AttackOption.__cj_bo[3].__q_496(var37 + 15, 4); + if(World.sortOption1[0] == 3 && World.sortOption2[0] == 1) { + AttackOption.worldSelectArrows[3].drawAt(var37 + 15, 4); } else { - AttackOption.__cj_bo[1].__q_496(var37 + 15, 4); + AttackOption.worldSelectArrows[1].drawAt(var37 + 15, 4); } var0.draw("Type", var37 + 32, 17, 16777215, -1); } - Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_q + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.__cu_q + 708 + 25, 16, 16777215, -1); - Login.__cu_bl = -1; - if(class30.__ar_bd != null) { + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if(class30.worldSelectBackSprites != null) { var23 = 88; byte var51 = 19; var39 = 765 / (var23 + 1) - 1; @@ -258,23 +258,23 @@ public class IndexCacheLoader { var9 = (765 - var39 * var23 - var27 * (var39 - 1)) / 2; int var10 = (480 - var37 * var51 - var28 * (var37 - 1)) / 2; var11 = (var37 + World.worldsCount - 1) / var37; - Login.__cu_bj = var11 - var39; - if(SecureRandomFuture.__cn_bu != null && Login.__cu_br > 0) { - SecureRandomFuture.__cn_bu.__q_496(8, Huffman.canvasHeight / 2 - SecureRandomFuture.__cn_bu.subHeight / 2); + Login.worldSelectPagesCount = var11 - var39; + if(SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2); } - if(NetSocket.__fb_bm != null && Login.__cu_br < Login.__cu_bj) { - NetSocket.__fb_bm.__q_496(SoundCache.canvasWidth - NetSocket.__fb_bm.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.__fb_bm.subHeight / 2); + if(NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2); } int var41 = var10 + 23; - int var42 = var9 + Login.__cu_q; + int var42 = var9 + Login.xPadding; int var43 = 0; boolean var15 = false; - int var16 = Login.__cu_br; + int var16 = Login.worldSelectPage; int var44; - for(var44 = var37 * var16; var44 < World.worldsCount && var16 - Login.__cu_br < var39; ++var44) { + for(var44 = var37 * var16; var44 < World.worldsCount && var16 - Login.worldSelectPage < var39; ++var44) { World var29 = ItemContainer.worlds[var44]; boolean var46 = true; String var20 = Integer.toString(var29.population); @@ -288,41 +288,41 @@ public class IndexCacheLoader { int var22 = 0; byte var21; - if(var29.__j_149()) { - if(var29.__e_144()) { + if(var29.isBeta()) { + if(var29.isMembersOnly()) { var21 = 7; } else { var21 = 6; } - } else if(var29.__z_148()) { - var22 = 16711680; - if(var29.__e_144()) { + } else if(var29.isDeadman()) { + var22 = 0xff0000; + if(var29.isMembersOnly()) { var21 = 5; } else { var21 = 4; } - } else if(var29.__d_146()) { - if(var29.__e_144()) { + } else if(var29.isPvp()) { + if(var29.isMembersOnly()) { var21 = 3; } else { var21 = 2; } - } else if(var29.__e_144()) { + } else if(var29.isMembersOnly()) { var21 = 1; } else { var21 = 0; } if(MouseHandler.MouseHandler_x >= var42 && MouseHandler.MouseHandler_y >= var41 && MouseHandler.MouseHandler_x < var42 + var23 && MouseHandler.MouseHandler_y < var51 + var41 && var46) { - Login.__cu_bl = var44; - class30.__ar_bd[var21].__t_507(var42, var41, 128, 16777215); + Login.hoveredWorldIndex = var44; + class30.worldSelectBackSprites[var21].drawAtTransOverlay(var42, var41, 128, 0xffffff); var15 = true; } else { - class30.__ar_bd[var21].drawAt(var42, var41); + class30.worldSelectBackSprites[var21].drawAt(var42, var41); } - if(Frames.__en_bc != null) { - Frames.__en_bc[(var29.__e_144()?8:0) + var29.location].__q_496(var42 + 29, var41); + if(Frames.worldSelectFlagSprites != null) { + Frames.worldSelectFlagSprites[(var29.isMembersOnly()?8:0) + var29.location].drawAt(var42 + 29, var41); } var0.drawCentered(Integer.toString(var29.id), var42 + 15, var51 / 2 + var41 + 5, var22, -1); @@ -338,7 +338,7 @@ public class IndexCacheLoader { } if(var15) { - var44 = var1.stringWidth(ItemContainer.worlds[Login.__cu_bl].activity) + 6; + var44 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6; int var45 = var1.ascent + 8; var19 = MouseHandler.MouseHandler_y + 25; if(var45 + var19 > 480) { @@ -347,24 +347,24 @@ public class IndexCacheLoader { Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 16777120); Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 0); - var1.drawCentered(ItemContainer.worlds[Login.__cu_bl].activity, MouseHandler.MouseHandler_x, var19 + var1.ascent + 4, 0, -1); + var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var19 + var1.ascent + 4, 0, -1); } } class197.rasterProvider.drawFull(0, 0); } else { - Login.__cu_g.drawAt(Login.__cu_q, 0); - Fonts.__kz_l.drawAt(Login.__cu_q + 382, 0); - WorldMapSectionType.__h_e.__q_496(Login.__cu_q + 382 - WorldMapSectionType.__h_e.subWidth / 2, 18); + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18); if(Client.gameState == 0 || Client.gameState == 5) { var23 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.__cu_y + 180, 245 - var23, 16777215, -1); + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1); var24 = 253 - var23; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.__cu_y + 180 - 152, var24, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.__cu_y + 180 - 151, var24 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_y + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.__cu_y + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.__cu_y + 180, 276 - var23, 16777215, -1); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1); } String var7; @@ -375,17 +375,17 @@ public class IndexCacheLoader { short var47; short var49; if(Client.gameState == 20) { - Login.__cu_o.__q_496(Login.__cu_y + 180 - Login.__cu_o.subWidth / 2, 271 - Login.__cu_o.subHeight / 2); + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); var47 = 201; - var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16776960, 0); + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0); + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; var48 += 7; if(Login.loginIndex != 4) { - var0.draw("Login: ", Login.__cu_y + 180 - 110, var48, 16777215, 0); + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var48, 16777215, 0); var49 = 200; if(ReflectionCheck.clientPreferences.hideUsername) { var8 = Login.Login_username; @@ -399,56 +399,56 @@ public class IndexCacheLoader { ; } - var0.draw(AbstractFont.escapeBrackets(var25), Login.__cu_y + 180 - 70, var48, 16777215, 0); + var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var48, 16777215, 0); var48 += 15; var8 = "Password: "; var30 = Login.Login_password; var31 = class168.method3450('*', var30.length()); - var0.draw(var8 + var31, Login.__cu_y + 180 - 108, var48, 16777215, 0); + var0.draw(var8 + var31, Login.loginBoxX + 180 - 108, var48, 16777215, 0); var48 += 15; } } if(Client.gameState == 10 || Client.gameState == 11) { - Login.__cu_o.__q_496(Login.__cu_y, 171); + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); short var5; if(Login.loginIndex == 0) { var47 = 251; - var0.drawCentered("Welcome to RuneScape", Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 30; - var24 = Login.__cu_y + 180 - 80; + var24 = Login.loginBoxX + 180 - 80; var5 = 291; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var24 = Login.__cu_y + 180 + 80; - __bd_u.__q_496(var24 - 73, var5 - 20); + var24 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); } else if(Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.__cu_y + 180, 201, 16776960, 0); + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); var47 = 236; - var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16777215, 0); + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16777215, 0); + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); var48 += 15; - var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16777215, 0); + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0); var48 += 15; - var24 = Login.__cu_y + 180 - 80; + var24 = Login.loginBoxX + 180 - 80; var5 = 321; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); - var24 = Login.__cu_y + 180 + 80; - __bd_u.__q_496(var24 - 73, var5 - 20); + var24 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0); } else if(Login.loginIndex == 2) { var47 = 201; - var0.drawCentered(Login.Login_response1, Varps.__hv_h, var47, 16776960, 0); + var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var47, 16776960, 0); var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Varps.__hv_h, var48, 16776960, 0); + var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var48, 16776960, 0); var48 += 15; - var0.drawCentered(Login.Login_response3, Varps.__hv_h, var48, 16776960, 0); + var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var48, 16776960, 0); var48 += 15; var48 += 7; - var0.draw("Login: ", Varps.__hv_h - 110, var48, 16777215, 0); + var0.draw("Login: ", Varps.loginBoxCenter - 110, var48, 16777215, 0); var49 = 200; if(ReflectionCheck.clientPreferences.hideUsername) { var8 = Login.Login_username; @@ -462,35 +462,35 @@ public class IndexCacheLoader { ; } - var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.__hv_h - 70, var48, 16777215, 0); + var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.loginBoxCenter - 70, var48, 16777215, 0); var48 += 15; var8 = "Password: "; var30 = Login.Login_password; var31 = class168.method3450('*', var30.length()); - var0.draw(var8 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.__hv_h - 108, var48, 16777215, 0); + var0.draw(var8 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.loginBoxCenter - 108, var48, 16777215, 0); var48 += 15; var47 = 277; - var11 = Varps.__hv_h + -117; + var11 = Varps.loginBoxCenter + -117; boolean var13 = Client.Login_isUsernameRemembered; boolean var14 = Login.__cu_aa; - IndexedSprite var32 = var13?(var14?KeyHandler.__an_i:class308.__kw_n):(var14?GraphicsObject.__bw_k:Login.__cu_d); - var32.__q_496(var11, var47); + IndexedSprite var32 = var13?(var14?KeyHandler.options_buttons_6Sprite :class308.options_buttons_2Sprite):(var14?GraphicsObject.options_buttons_4Sprite :Login.options_buttons_0Sprite); + var32.drawAt(var11, var47); var11 = var11 + var32.subWidth + 5; var1.draw("Remember username", var11, var47 + 13, 16776960, 0); - var11 = Varps.__hv_h + 24; + var11 = Varps.loginBoxCenter + 24; boolean var17 = ReflectionCheck.clientPreferences.hideUsername; boolean var18 = Login.__cu_ax; - IndexedSprite var34 = var17?(var18?KeyHandler.__an_i:class308.__kw_n):(var18?GraphicsObject.__bw_k:Login.__cu_d); - var34.__q_496(var11, var47); + IndexedSprite var34 = var17?(var18?KeyHandler.options_buttons_6Sprite :class308.options_buttons_2Sprite):(var18?GraphicsObject.options_buttons_4Sprite :Login.options_buttons_0Sprite); + var34.drawAt(var11, var47); var11 = var11 + var34.subWidth + 5; var1.draw("Hide username", var11, var47 + 13, 16776960, 0); var48 = var47 + 15; - var19 = Varps.__hv_h - 80; + var19 = Varps.loginBoxCenter - 80; short var35 = 321; - __bd_u.__q_496(var19 - 73, var35 - 20); + titlebuttonSprite.drawAt(var19 - 73, var35 - 20); var0.drawCentered("Login", var19, var35 + 5, 16777215, 0); - var19 = Varps.__hv_h + 80; - __bd_u.__q_496(var19 - 73, var35 - 20); + var19 = Varps.loginBoxCenter + 80; + titlebuttonSprite.drawAt(var19 - 73, var35 - 20); var0.drawCentered("Cancel", var19, var35 + 5, 16777215, 0); var47 = 357; switch(Login.__cu_ac) { @@ -501,76 +501,76 @@ public class IndexCacheLoader { AttackOption.__cj_ay = "Can\'t login? Click here."; } - TilePaint.__eb_ah = new Bounds(Varps.__hv_h, var47, var1.stringWidth(AttackOption.__cj_ay), 11); - UrlRequester.__eo_ak = new Bounds(Varps.__hv_h, var47, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(AttackOption.__cj_ay, Varps.__hv_h, var47, 16777215, 0); + TilePaint.__eb_ah = new Bounds(Varps.loginBoxCenter, var47, var1.stringWidth(AttackOption.__cj_ay), 11); + UrlRequester.__eo_ak = new Bounds(Varps.loginBoxCenter, var47, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(AttackOption.__cj_ay, Varps.loginBoxCenter, var47, 16777215, 0); } else if(Login.loginIndex == 3) { var47 = 201; - var0.drawCentered("Invalid credentials.", Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.__cu_y + 180, var48, 16776960, 0); + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.__cu_y + 180, var48, 16776960, 0); + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var24 = Login.__cu_y + 180; + var24 = Login.loginBoxX + 180; var5 = 276; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); - var24 = Login.__cu_y + 180; + var24 = Login.loginBoxX + 180; var5 = 326; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); } else { String var26; if(Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.__cu_y + 180, 201, 16776960, 0); + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); var47 = 236; - var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16777215, 0); + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16777215, 0); + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); var48 += 15; - var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16777215, 0); + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0); var48 += 15; var26 = "PIN: "; var7 = Login.otp; var25 = class168.method3450('*', var7.length()); - var0.draw(var26 + var25 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 108, var48, 16777215, 0); + var0.draw(var26 + var25 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 108, var48, 16777215, 0); var48 -= 8; - var0.draw("Trust this computer", Login.__cu_y + 180 - 9, var48, 16776960, 0); + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var48, 16776960, 0); var48 += 15; - var0.draw("for 30 days: ", Login.__cu_y + 180 - 9, var48, 16776960, 0); - var28 = Login.__cu_y + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var48, 16776960, 0); + var28 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; var9 = var48 - var0.ascent; IndexedSprite var52; if(Login.__cu_ba) { - var52 = class308.__kw_n; + var52 = class308.options_buttons_2Sprite; } else { - var52 = Login.__cu_d; + var52 = Login.options_buttons_0Sprite; } - var52.__q_496(var28, var9); + var52.drawAt(var28, var9); var48 += 15; - var11 = Login.__cu_y + 180 - 80; + var11 = Login.loginBoxX + 180 - 80; short var12 = 321; - __bd_u.__q_496(var11 - 73, var12 - 20); + titlebuttonSprite.drawAt(var11 - 73, var12 - 20); var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0); - var11 = Login.__cu_y + 180 + 80; - __bd_u.__q_496(var11 - 73, var12 - 20); + var11 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var11 - 73, var12 - 20); var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0); - var1.drawCentered("Can\'t Log In?", Login.__cu_y + 180, var12 + 36, 255, 0); + var1.drawCentered("Can\'t Log In?", Login.loginBoxX + 180, var12 + 36, 255, 0); } else { short var50; if(Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.__cu_y + 180, 201, 16776960, 0); + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); var47 = 221; - var2.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0); + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 15; - var2.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var2.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; var48 += 14; - var0.draw("Username/email: ", Login.__cu_y + 180 - 145, var48, 16777215, 0); + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var48, 16777215, 0); var49 = 174; if(ReflectionCheck.clientPreferences.hideUsername) { var8 = Login.Login_username; @@ -584,58 +584,58 @@ public class IndexCacheLoader { ; } - var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 34, var48, 16777215, 0); + var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 34, var48, 16777215, 0); var48 += 15; - var27 = Login.__cu_y + 180 - 80; + var27 = Login.loginBoxX + 180 - 80; var50 = 321; - __bd_u.__q_496(var27 - 73, var50 - 20); + titlebuttonSprite.drawAt(var27 - 73, var50 - 20); var0.drawCentered("Recover", var27, var50 + 5, 16777215, 0); - var27 = Login.__cu_y + 180 + 80; - __bd_u.__q_496(var27 - 73, var50 - 20); + var27 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var27 - 73, var50 - 20); var0.drawCentered("Back", var27, var50 + 5, 16777215, 0); var50 = 356; - var1.drawCentered("Still having trouble logging in?", Varps.__hv_h, var50, 268435455, 0); + var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var50, 268435455, 0); } else if(Login.loginIndex == 6) { var47 = 201; - var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 15; - var0.drawCentered(Login.Login_response2, Login.__cu_y + 180, var48, 16776960, 0); + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0); + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var24 = Login.__cu_y + 180; + var24 = Login.loginBoxX + 180; var5 = 321; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); } else if(Login.loginIndex == 7) { var47 = 216; - var0.drawCentered("Your date of birth isn\'t set.", Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered("Your date of birth isn\'t set.", Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 15; - var2.drawCentered("Please verify your account status by", Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var2.drawCentered("setting your date of birth.", Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var24 = Login.__cu_y + 180 - 80; + var24 = Login.loginBoxX + 180 - 80; var5 = 321; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); - var24 = Login.__cu_y + 180 + 80; - __bd_u.__q_496(var24 - 73, var5 - 20); + var24 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); } else if(Login.loginIndex == 8) { var47 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 15; - var2.drawCentered("For more information, please take a look at", Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var2.drawCentered("our privacy policy.", Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var24 = Login.__cu_y + 180 - 80; + var24 = Login.loginBoxX + 180 - 80; var5 = 321; - __bd_u.__q_496(var24 - 73, var5 - 20); + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); - var24 = Login.__cu_y + 180 + 80; - __bd_u.__q_496(var24 - 73, var5 - 20); + var24 = Login.loginBoxX + 180 + 80; + titlebuttonSprite.drawAt(var24 - 73, var5 - 20); var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); } else if(Login.loginIndex == 12) { var47 = 201; @@ -657,19 +657,19 @@ public class IndexCacheLoader { MouseHandler.method1084(false); } - var0.drawCentered(var4, Login.__cu_y + 180, var47, 16776960, 0); + var0.drawCentered(var4, Login.loginBoxX + 180, var47, 16776960, 0); var48 = var47 + 15; - var2.drawCentered(var26, Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered(var26, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var2.drawCentered(var25, Login.__cu_y + 180, var48, 16776960, 0); + var2.drawCentered(var25, Login.loginBoxX + 180, var48, 16776960, 0); var48 += 15; - var27 = Login.__cu_y + 180; + var27 = Login.loginBoxX + 180; var50 = 276; - __bd_u.__q_496(var27 - 73, var50 - 20); + titlebuttonSprite.drawAt(var27 - 73, var50 - 20); var0.drawCentered("Support Page", var27, var50 + 5, 16777215, 0); - var27 = Login.__cu_y + 180; + var27 = Login.loginBoxX + 180; var50 = 326; - __bd_u.__q_496(var27 - 73, var50 - 20); + titlebuttonSprite.drawAt(var27 - 73, var50 - 20); var0.drawCentered("Back", var27, var50 + 5, 16777215, 0); } } @@ -679,20 +679,20 @@ public class IndexCacheLoader { if(Client.gameState >= 10) { int[] var3 = new int[4]; Rasterizer2D.Rasterizer2D_getClipArray(var3); - Rasterizer2D.Rasterizer2D_setClip(Login.__cu_q, 0, Login.__cu_q + 765, Huffman.canvasHeight); - class16.field85.method1782(Login.__cu_q - 22, Client.cycle); - class16.field85.method1782(Login.__cu_q + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Huffman.canvasHeight); + class16.loginScreenRunesAnimation.method1782(Login.xPadding - 22, Client.cycle); + class16.loginScreenRunesAnimation.method1782(Login.xPadding + 22 + 765 - 128, Client.cycle); Rasterizer2D.Rasterizer2D_setClipArray(var3); } - KeyHandler.__an_x[ReflectionCheck.clientPreferences.titleMusicDisabled?1:0].__q_496(Login.__cu_q + 765 - 40, 463); + KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled?1:0].drawAt(Login.xPadding + 765 - 40, 463); if(Client.gameState > 5 && Client.language == 0) { if(class277.__jn_by != null) { - var48 = Login.__cu_q + 5; + var48 = Login.xPadding + 5; var49 = 463; byte var38 = 100; byte var6 = 35; - class277.__jn_by.__q_496(var48, var49); + class277.__jn_by.drawAt(var48, var49); var0.drawCentered("World" + " " + Client.worldId, var38 / 2 + var48, var6 / 2 + var49 - 2, 16777215, 0); if(FriendLoginUpdate.__kn_x != null) { var1.drawCentered("Loading...", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0); @@ -700,7 +700,7 @@ public class IndexCacheLoader { var1.drawCentered("Click to switch", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0); } } else { - class277.__jn_by = MenuAction.method2025(WorldMapSection3.indexCache8, "sl_button", ""); + class277.__jn_by = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", ""); } } diff --git a/runescape-client/src/main/java/IndexStore.java b/runescape-client/src/main/java/IndexStore.java index ab9552b2f2..c17efeb20a 100644 --- a/runescape-client/src/main/java/IndexStore.java +++ b/runescape-client/src/main/java/IndexStore.java @@ -277,20 +277,20 @@ public final class IndexStore { signature = "(IIILfe;Lfy;B)Z", garbageValue = "1" ) - static final boolean method3585(int var0, int var1, int var2, class179 var3, CollisionMap var4) { + static final boolean method3585(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { int var5 = var0; int var6 = var1; byte var7 = 64; byte var8 = 64; int var9 = var0 - var7; int var10 = var1 - var8; - class178.__fi_q[var7][var8] = 99; - class178.__fi_w[var7][var8] = 0; + class178.directions[var7][var8] = 99; + class178.distances[var7][var8] = 0; byte var11 = 0; int var12 = 0; - class178.__fi_l[var11] = var0; + class178.bufferX[var11] = var0; int var20 = var11 + 1; - class178.__fi_e[var11] = var1; + class178.bufferY[var11] = var1; int[][] var13 = var4.flags; while(true) { @@ -313,8 +313,8 @@ public final class IndexStore { return false; } - var5 = class178.__fi_l[var12]; - var6 = class178.__fi_e[var12]; + var5 = class178.bufferX[var12]; + var6 = class178.bufferY[var12]; var12 = var12 + 1 & 4095; var18 = var5 - var9; var19 = var6 - var10; @@ -326,17 +326,17 @@ public final class IndexStore { return true; } - var16 = class178.__fi_w[var18][var19] + 1; - if(var18 > 0 && class178.__fi_q[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { + var16 = class178.distances[var18][var19] + 1; + if(var18 > 0 && class178.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { var17 = 1; while(true) { if(var17 >= var2 - 1) { - class178.__fi_l[var20] = var5 - 1; - class178.__fi_e[var20] = var6; + class178.bufferX[var20] = var5 - 1; + class178.bufferY[var20] = var6; var20 = var20 + 1 & 4095; - class178.__fi_q[var18 - 1][var19] = 2; - class178.__fi_w[var18 - 1][var19] = var16; + class178.directions[var18 - 1][var19] = 2; + class178.distances[var18 - 1][var19] = var16; break; } @@ -348,16 +348,16 @@ public final class IndexStore { } } - if(var18 < 128 - var2 && class178.__fi_q[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { + if(var18 < 128 - var2 && class178.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { var17 = 1; while(true) { if(var17 >= var2 - 1) { - class178.__fi_l[var20] = var5 + 1; - class178.__fi_e[var20] = var6; + class178.bufferX[var20] = var5 + 1; + class178.bufferY[var20] = var6; var20 = var20 + 1 & 4095; - class178.__fi_q[var18 + 1][var19] = 8; - class178.__fi_w[var18 + 1][var19] = var16; + class178.directions[var18 + 1][var19] = 8; + class178.distances[var18 + 1][var19] = var16; break; } @@ -369,16 +369,16 @@ public final class IndexStore { } } - if(var19 > 0 && class178.__fi_q[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { + if(var19 > 0 && class178.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { var17 = 1; while(true) { if(var17 >= var2 - 1) { - class178.__fi_l[var20] = var5; - class178.__fi_e[var20] = var6 - 1; + class178.bufferX[var20] = var5; + class178.bufferY[var20] = var6 - 1; var20 = var20 + 1 & 4095; - class178.__fi_q[var18][var19 - 1] = 1; - class178.__fi_w[var18][var19 - 1] = var16; + class178.directions[var18][var19 - 1] = 1; + class178.distances[var18][var19 - 1] = var16; break; } @@ -390,16 +390,16 @@ public final class IndexStore { } } - if(var19 < 128 - var2 && class178.__fi_q[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { + if(var19 < 128 - var2 && class178.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { var17 = 1; while(true) { if(var17 >= var2 - 1) { - class178.__fi_l[var20] = var5; - class178.__fi_e[var20] = var6 + 1; + class178.bufferX[var20] = var5; + class178.bufferY[var20] = var6 + 1; var20 = var20 + 1 & 4095; - class178.__fi_q[var18][var19 + 1] = 4; - class178.__fi_w[var18][var19 + 1] = var16; + class178.directions[var18][var19 + 1] = 4; + class178.distances[var18][var19 + 1] = var16; break; } @@ -411,16 +411,16 @@ public final class IndexStore { } } - if(var18 > 0 && var19 > 0 && class178.__fi_q[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { + if(var18 > 0 && var19 > 0 && class178.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { var17 = 1; while(true) { if(var17 >= var2) { - class178.__fi_l[var20] = var5 - 1; - class178.__fi_e[var20] = var6 - 1; + class178.bufferX[var20] = var5 - 1; + class178.bufferY[var20] = var6 - 1; var20 = var20 + 1 & 4095; - class178.__fi_q[var18 - 1][var19 - 1] = 3; - class178.__fi_w[var18 - 1][var19 - 1] = var16; + class178.directions[var18 - 1][var19 - 1] = 3; + class178.distances[var18 - 1][var19 - 1] = var16; break; } @@ -432,16 +432,16 @@ public final class IndexStore { } } - if(var18 < 128 - var2 && var19 > 0 && class178.__fi_q[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { + if(var18 < 128 - var2 && var19 > 0 && class178.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { var17 = 1; while(true) { if(var17 >= var2) { - class178.__fi_l[var20] = var5 + 1; - class178.__fi_e[var20] = var6 - 1; + class178.bufferX[var20] = var5 + 1; + class178.bufferY[var20] = var6 - 1; var20 = var20 + 1 & 4095; - class178.__fi_q[var18 + 1][var19 - 1] = 9; - class178.__fi_w[var18 + 1][var19 - 1] = var16; + class178.directions[var18 + 1][var19 - 1] = 9; + class178.distances[var18 + 1][var19 - 1] = var16; break; } @@ -453,22 +453,22 @@ public final class IndexStore { } } - if(var18 > 0 && var19 < 128 - var2 && class178.__fi_q[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { + if(var18 > 0 && var19 < 128 - var2 && class178.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { for(var17 = 1; var17 < var2; ++var17) { if((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { continue label277; } } - class178.__fi_l[var20] = var5 - 1; - class178.__fi_e[var20] = var6 + 1; + class178.bufferX[var20] = var5 - 1; + class178.bufferY[var20] = var6 + 1; var20 = var20 + 1 & 4095; - class178.__fi_q[var18 - 1][var19 + 1] = 6; - class178.__fi_w[var18 - 1][var19 + 1] = var16; + class178.directions[var18 - 1][var19 + 1] = 6; + class178.distances[var18 - 1][var19 + 1] = var16; } } while(var18 >= 128 - var2); } while(var19 >= 128 - var2); - } while(class178.__fi_q[var18 + 1][var19 + 1] != 0); + } while(class178.directions[var18 + 1][var19 + 1] != 0); } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); for(var17 = 1; var17 < var2; ++var17) { @@ -477,11 +477,11 @@ public final class IndexStore { } } - class178.__fi_l[var20] = var5 + 1; - class178.__fi_e[var20] = var6 + 1; + class178.bufferX[var20] = var5 + 1; + class178.bufferY[var20] = var6 + 1; var20 = var20 + 1 & 4095; - class178.__fi_q[var18 + 1][var19 + 1] = 12; - class178.__fi_w[var18 + 1][var19 + 1] = var16; + class178.directions[var18 + 1][var19 + 1] = 12; + class178.distances[var18 + 1][var19 + 1] = var16; } } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index e85171962f..67fb180a08 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -85,41 +85,41 @@ public final class IndexedSprite extends Rasterizer2D { } @ObfuscatedName("q") - @Export("__q_496") - public void __q_496(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + @Export("drawAt") + public void drawAt(int x, int y) { + x += this.xOffset; + y += this.yOffset; + int var3 = x + y * Rasterizer2D.Rasterizer2D_width; int var4 = 0; int var5 = this.subHeight; int var6 = this.subWidth; int var7 = Rasterizer2D.Rasterizer2D_width - var6; int var8 = 0; int var9; - if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; + if(y < Rasterizer2D.Rasterizer2D_yClipStart) { + var9 = Rasterizer2D.Rasterizer2D_yClipStart - y; var5 -= var9; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; + y = Rasterizer2D.Rasterizer2D_yClipStart; var4 += var9 * var6; var3 += var9 * Rasterizer2D.Rasterizer2D_width; } - if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { - var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; + if(var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) { + var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd; } - if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; + if(x < Rasterizer2D.Rasterizer2D_xClipStart) { + var9 = Rasterizer2D.Rasterizer2D_xClipStart - x; var6 -= var9; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; + x = Rasterizer2D.Rasterizer2D_xClipStart; var4 += var9; var3 += var9; var8 += var9; var7 += var9; } - if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; + if(var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) { + var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd; var6 -= var9; var8 += var9; var7 += var9; diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 126aba22f8..20baed429f 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -141,7 +141,7 @@ public class Interpreter { signature = "(IIB)V", garbageValue = "76" ) - static void method1975(int var0, int var1) { + static void changeWorldSelectSorting(int var0, int var1) { int[] var2 = new int[4]; int[] var3 = new int[4]; var2[0] = var0; @@ -149,16 +149,16 @@ public class Interpreter { int var4 = 1; for(int var5 = 0; var5 < 4; ++var5) { - if(World.__bt_e[var5] != var0) { - var2[var4] = World.__bt_e[var5]; - var3[var4] = World.__bt_l[var5]; + if(World.sortOption1[var5] != var0) { + var2[var4] = World.sortOption1[var5]; + var3[var4] = World.sortOption2[var5]; ++var4; } } - World.__bt_e = var2; - World.__bt_l = var3; - MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l); + World.sortOption1 = var2; + World.sortOption2 = var3; + MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2); } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index e7322e5206..48c3679ba0 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -28,14 +28,14 @@ public final class KeyHandler implements KeyListener, FocusListener { @ObfuscatedSignature( signature = "[Llq;" ) - @Export("__an_x") - static IndexedSprite[] __an_x; + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; @ObfuscatedName("i") @ObfuscatedSignature( signature = "Llq;" ) - @Export("__an_i") - static IndexedSprite __an_i; + @Export("options_buttons_6Sprite") + static IndexedSprite options_buttons_6Sprite; @ObfuscatedName("bk") @ObfuscatedSignature( signature = "Llx;" diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index ea3111c177..33c3638dcf 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -15,20 +15,20 @@ public class Login { @ObfuscatedGetter( intValue = 1606541885 ) - @Export("__cu_q") - static int __cu_q; + @Export("xPadding") + static int xPadding; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Llq;" ) - @Export("__cu_o") - static IndexedSprite __cu_o; + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; @ObfuscatedName("g") @ObfuscatedSignature( signature = "Lln;" ) - @Export("__cu_g") - static Sprite __cu_g; + @Export("leftTitleSprite") + static Sprite leftTitleSprite; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -184301597 @@ -39,14 +39,14 @@ public class Login { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__cu_d") - static IndexedSprite __cu_d; + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; @ObfuscatedName("y") @ObfuscatedGetter( intValue = 932541923 ) - @Export("__cu_y") - static int __cu_y; + @Export("loginBoxX") + static int loginBoxX; @ObfuscatedName("b") @ObfuscatedGetter( intValue = -504870061 @@ -111,26 +111,26 @@ public class Login { @Export("currentLoginField") static int currentLoginField; @ObfuscatedName("bk") - @Export("__cu_bk") - static boolean __cu_bk; + @Export("worldSelectOpen") + static boolean worldSelectOpen; @ObfuscatedName("bl") @ObfuscatedGetter( intValue = 1431381579 ) - @Export("__cu_bl") - static int __cu_bl; + @Export("hoveredWorldIndex") + static int hoveredWorldIndex; @ObfuscatedName("br") @ObfuscatedGetter( intValue = -376233039 ) - @Export("__cu_br") - static int __cu_br; + @Export("worldSelectPage") + static int worldSelectPage; @ObfuscatedName("bj") @ObfuscatedGetter( intValue = 1548722671 ) - @Export("__cu_bj") - static int __cu_bj; + @Export("worldSelectPagesCount") + static int worldSelectPagesCount; @ObfuscatedName("bi") @ObfuscatedGetter( longValue = 803647694904294325L @@ -151,8 +151,8 @@ public class Login { static IndexCache indexCache11; static { - __cu_q = 0; - __cu_y = __cu_q + 202; + xPadding = 0; + loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; __cu_aj = -1; @@ -168,10 +168,10 @@ public class Login { __cu_ax = false; __cu_ba = true; currentLoginField = 0; - __cu_bk = false; - __cu_bl = -1; - __cu_br = 0; - __cu_bj = 0; + worldSelectOpen = false; + hoveredWorldIndex = -1; + worldSelectPage = 0; + worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class161(); __cu_bi = -1L; diff --git a/runescape-client/src/main/java/class72.java b/runescape-client/src/main/java/LoginScreenAnimation.java similarity index 92% rename from runescape-client/src/main/java/class72.java rename to runescape-client/src/main/java/LoginScreenAnimation.java index e93de12f7d..5d2dae8ae1 100644 --- a/runescape-client/src/main/java/class72.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -9,12 +9,13 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bp") -public class class72 { +public class LoginScreenAnimation +{ @ObfuscatedName("m") @ObfuscatedSignature( signature = "[Llq;" ) - IndexedSprite[] field998; + IndexedSprite[] sprites; @ObfuscatedName("g") int[] field1015; @ObfuscatedName("l") @@ -67,7 +68,7 @@ public class class72 { @ObfuscatedSignature( signature = "([Llq;)V" ) - class72(IndexedSprite[] var1) { + LoginScreenAnimation(IndexedSprite[] var1) { this.field1015 = new int[256]; this.field1008 = 0; this.field1009 = 0; @@ -75,7 +76,7 @@ public class class72 { this.field1010 = 0; this.field1016 = 0; this.field1017 = 0; - this.field998 = var1; + this.sprites = var1; this.method1772(); } @@ -89,55 +90,55 @@ public class class72 { int var1; for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1] = var1 * 262144; + this.field1006[var1] = var1 * 0x40000; } for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1 + 64] = var1 * 1024 + 16711680; + this.field1006[var1 + 64] = var1 * 0x400 + 0xff0000; } for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1 + 128] = var1 * 4 + 16776960; + this.field1006[var1 + 128] = var1 * 0x4 + 0xffff00; } for(var1 = 0; var1 < 64; ++var1) { - this.field1006[var1 + 192] = 16777215; + this.field1006[var1 + 192] = 0xffffff; } this.field1007 = new int[256]; for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1] = var1 * 1024; + this.field1007[var1] = var1 * 0x400; } for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1 + 64] = var1 * 4 + 65280; + this.field1007[var1 + 64] = var1 * 0x4 + 0xff00; } for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1 + 128] = var1 * 262144 + 65535; + this.field1007[var1 + 128] = var1 * 0x40000 + 0xffff; } for(var1 = 0; var1 < 64; ++var1) { - this.field1007[var1 + 192] = 16777215; + this.field1007[var1 + 192] = 0xffffff; } this.field1014 = new int[256]; for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1] = var1 * 4; + this.field1014[var1] = var1 * 0x4; } for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 64] = var1 * 262144 + 255; + this.field1014[var1 + 64] = var1 * 0x40000 + 0xff; } for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 128] = var1 * 1024 + 16711935; + this.field1014[var1 + 128] = var1 * 0x400 + 0xff00ff; } for(var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 192] = 16777215; + this.field1014[var1 + 192] = 0xffffff; } this.field1013 = new int[256]; @@ -172,26 +173,26 @@ public class class72 { signature = "(III)V", garbageValue = "-1684910110" ) - void method1782(int var1, int var2) { + void method1782(int x, int cycle) { if(this.field1011 == null) { this.method1772(); } if(this.field1017 == 0) { - this.field1017 = var2; + this.field1017 = cycle; } - int var3 = var2 - this.field1017; + int var3 = cycle - this.field1017; if(var3 >= 256) { var3 = 0; } - this.field1017 = var2; + this.field1017 = cycle; if(var3 > 0) { this.method1791(var3); } - this.method1787(var1); + this.method1787(x); } @ObfuscatedName("w") @@ -205,7 +206,7 @@ public class class72 { if(this.field1010 > this.field1004.length) { this.field1010 -= this.field1004.length; var2 = (int)(Math.random() * 12.0D); - this.method1779(this.field998[var2]); + this.method1779(this.sprites[var2]); } var2 = 0; @@ -335,7 +336,7 @@ public class class72 { ) final int method1765(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; + return (var4 * (var1 & 0xff00) + var3 * (var2 & 0xff00) & 0xff0000) + (var4 * (var1 & 0xff00ff) + var3 * (var2 & 0xff00ff) & 0xff00ff00) >> 8; } @ObfuscatedName("u") @@ -411,7 +412,7 @@ public class class72 { int var13 = 256 - var10; var10 = this.field1013[var10]; int var14 = class197.rasterProvider.pixels[var8]; - class197.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; + class197.rasterProvider.pixels[var8++] = 0xff000000 | ((var10 & 0xff00ff) * var12 + (var14 & 0xff00ff) * var13 & 0xff00ff00) + (var12 * (var10 & 0xff00) + var13 * (var14 & 0xff00) & 0xff0000) >> 8; } else { ++var8; } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index c24cae8d6b..657f52fcbb 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -46,14 +46,14 @@ public class MenuAction { signature = "(Lir;Ljava/lang/String;Ljava/lang/String;B)Llq;", garbageValue = "0" ) - public static IndexedSprite method2025(AbstractIndexCache var0, String var1, String var2) { + public static IndexedSprite loadIndexedSpriteByName(AbstractIndexCache var0, String var1, String var2) { int var3 = var0.getArchiveId(var1); int var4 = var0.getRecordId(var3, var2); IndexedSprite var5; - if(!SpriteMask.method4392(var0, var3, var4)) { + if(!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; } else { - var5 = ServerPacket.method3663(); + var5 = ServerPacket.createIndexedSprite(); } return var5; @@ -70,7 +70,7 @@ public class MenuAction { int var3 = (int)var0.key; var0.remove(); if(var1) { - AbstractByteArrayCopier.method4023(var2); + AbstractByteArrayCopier.unloadWidgetGroup(var2); } for(IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 5b875921da..d4992e3b60 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -219,7 +219,7 @@ public class Message extends DualNode { boolean var8; if(Character.isISOControl(var7)) { var8 = false; - } else if(VarcInt.method4807(var7)) { + } else if(VarcInt.isAlphaNumeric(var7)) { var8 = true; } else { char[] var13 = class305.__kb_q; diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 146e626362..256c297e67 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -166,8 +166,8 @@ public class MilliClock extends Clock { var12 = 2001; } } else if(var3[var10] == 3) { - var11 = var0[var6].__e_144()?1:0; - var12 = var8.__e_144()?1:0; + var11 = var0[var6].isMembersOnly()?1:0; + var12 = var8.isMembersOnly()?1:0; } else { var11 = var0[var6].id; var12 = var8.id; @@ -206,8 +206,8 @@ public class MilliClock extends Clock { var12 = 2001; } } else if(var3[var10] == 3) { - var11 = var0[var5].__e_144()?1:0; - var12 = var8.__e_144()?1:0; + var11 = var0[var5].isMembersOnly()?1:0; + var12 = var8.isMembersOnly()?1:0; } else { var11 = var0[var5].id; var12 = var8.id; diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 24c1743159..c5860d85e0 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -105,7 +105,7 @@ public class MouseRecorder implements Runnable { if(var16 != null) { int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.__q_496(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); + var16.drawAt(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); } } else { if(var9 == 0 || var9 == 2) { @@ -182,7 +182,7 @@ public class MouseRecorder implements Runnable { if(var28 != null) { var26 = (var20.sizeX * 4 - var28.subWidth) / 2; var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.__q_496(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); + var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); } } else if(var9 == 9) { int var25 = 15658734; @@ -221,7 +221,7 @@ public class MouseRecorder implements Runnable { if(var22 != null) { var10 = (var21.sizeX * 4 - var22.subWidth) / 2; int var11 = (var21.sizeY * 4 - var22.subHeight) / 2; - var22.__q_496(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48); + var22.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48); } } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 14900a4d47..fa0ad800ee 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -16,8 +16,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__fb_bm") - static IndexedSprite __fb_bm; + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; @ObfuscatedName("m") @Export("inputStream") InputStream inputStream; @@ -305,227 +305,227 @@ public final class NetSocket extends AbstractSocket implements Runnable { signature = "(IIILfe;Lfy;Z[I[IB)I", garbageValue = "-98" ) - public static int method3571(int var0, int var1, int var2, class179 var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { - int var9; + public static int calculateRoute(int srcX, int srcY, int srcSize, RouteStrategy strategy, CollisionMap collisionMap, boolean var5, int[] bufferX, int[] bufferY) { + int graphBaseX; for(int var8 = 0; var8 < 128; ++var8) { - for(var9 = 0; var9 < 128; ++var9) { - class178.__fi_q[var8][var9] = 0; - class178.__fi_w[var8][var9] = 99999999; + for(graphBaseX = 0; graphBaseX < 128; ++graphBaseX) { + class178.directions[var8][graphBaseX] = 0; + class178.distances[var8][graphBaseX] = 99999999; } } - int var10; - int var11; + int graphBaseY; + int endX; byte var13; - int var14; + int lowestDistance; int var15; - int var17; - int var19; - int var20; - int var21; - boolean var28; - int var30; - int var31; - int var33; - if(var2 == 1) { - var10 = var0; - var11 = var1; + int approxDestY; + int approxDestSizeY; + int checkX; + int checkY; + boolean found; + int endY; + int lowestCost; + int approxDestX; + if(srcSize == 1) { + graphBaseY = srcX; + endX = srcY; byte var12 = 64; var13 = 64; - var14 = var0 - var12; - var15 = var1 - var13; - class178.__fi_q[var12][var13] = 99; - class178.__fi_w[var12][var13] = 0; + lowestDistance = srcX - var12; + var15 = srcY - var13; + class178.directions[var12][var13] = 99; + class178.distances[var12][var13] = 0; byte var16 = 0; - var17 = 0; - class178.__fi_l[var16] = var0; - var33 = var16 + 1; - class178.__fi_e[var16] = var1; - int[][] var18 = var4.flags; + approxDestY = 0; + class178.bufferX[var16] = srcX; + approxDestX = var16 + 1; + class178.bufferY[var16] = srcY; + int[][] var18 = collisionMap.flags; boolean var29; while(true) { - if(var33 == var17) { - WidgetGroupParent.__bx_o = var10; - UrlRequester.__eo_u = var11; + if(approxDestX == approxDestY) { + WidgetGroupParent.__bx_o = graphBaseY; + UrlRequester.__eo_u = endX; var29 = false; break; } - var10 = class178.__fi_l[var17]; - var11 = class178.__fi_e[var17]; - var17 = var17 + 1 & 4095; - var30 = var10 - var14; - var31 = var11 - var15; - var19 = var10 - var4.xInset; - var20 = var11 - var4.yInset; - if(var3.vmethod3644(1, var10, var11, var4)) { - WidgetGroupParent.__bx_o = var10; - UrlRequester.__eo_u = var11; + graphBaseY = class178.bufferX[approxDestY]; + endX = class178.bufferY[approxDestY]; + approxDestY = approxDestY + 1 & 4095; + endY = graphBaseY - lowestDistance; + lowestCost = endX - var15; + approxDestSizeY = graphBaseY - collisionMap.xInset; + checkX = endX - collisionMap.yInset; + if(strategy.vmethod3644(1, graphBaseY, endX, collisionMap)) { + WidgetGroupParent.__bx_o = graphBaseY; + UrlRequester.__eo_u = endX; var29 = true; break; } - var21 = class178.__fi_w[var30][var31] + 1; - if(var30 > 0 && class178.__fi_q[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) { - class178.__fi_l[var33] = var10 - 1; - class178.__fi_e[var33] = var11; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30 - 1][var31] = 2; - class178.__fi_w[var30 - 1][var31] = var21; + checkY = class178.distances[endY][lowestCost] + 1; + if(endY > 0 && class178.directions[endY - 1][lowestCost] == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0) { + class178.bufferX[approxDestX] = graphBaseY - 1; + class178.bufferY[approxDestX] = endX; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY - 1][lowestCost] = 2; + class178.distances[endY - 1][lowestCost] = checkY; } - if(var30 < 127 && class178.__fi_q[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { - class178.__fi_l[var33] = var10 + 1; - class178.__fi_e[var33] = var11; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30 + 1][var31] = 8; - class178.__fi_w[var30 + 1][var31] = var21; + if(endY < 127 && class178.directions[endY + 1][lowestCost] == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0) { + class178.bufferX[approxDestX] = graphBaseY + 1; + class178.bufferY[approxDestX] = endX; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY + 1][lowestCost] = 8; + class178.distances[endY + 1][lowestCost] = checkY; } - if(var31 > 0 && class178.__fi_q[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { - class178.__fi_l[var33] = var10; - class178.__fi_e[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30][var31 - 1] = 1; - class178.__fi_w[var30][var31 - 1] = var21; + if(lowestCost > 0 && class178.directions[endY][lowestCost - 1] == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) { + class178.bufferX[approxDestX] = graphBaseY; + class178.bufferY[approxDestX] = endX - 1; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY][lowestCost - 1] = 1; + class178.distances[endY][lowestCost - 1] = checkY; } - if(var31 < 127 && class178.__fi_q[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { - class178.__fi_l[var33] = var10; - class178.__fi_e[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30][var31 + 1] = 4; - class178.__fi_w[var30][var31 + 1] = var21; + if(lowestCost < 127 && class178.directions[endY][lowestCost + 1] == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) { + class178.bufferX[approxDestX] = graphBaseY; + class178.bufferY[approxDestX] = endX + 1; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY][lowestCost + 1] = 4; + class178.distances[endY][lowestCost + 1] = checkY; } - if(var30 > 0 && var31 > 0 && class178.__fi_q[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { - class178.__fi_l[var33] = var10 - 1; - class178.__fi_e[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30 - 1][var31 - 1] = 3; - class178.__fi_w[var30 - 1][var31 - 1] = var21; + if(endY > 0 && lowestCost > 0 && class178.directions[endY - 1][lowestCost - 1] == 0 && (var18[approxDestSizeY - 1][checkX - 1] & 19136782) == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) { + class178.bufferX[approxDestX] = graphBaseY - 1; + class178.bufferY[approxDestX] = endX - 1; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY - 1][lowestCost - 1] = 3; + class178.distances[endY - 1][lowestCost - 1] = checkY; } - if(var30 < 127 && var31 > 0 && class178.__fi_q[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { - class178.__fi_l[var33] = var10 + 1; - class178.__fi_e[var33] = var11 - 1; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30 + 1][var31 - 1] = 9; - class178.__fi_w[var30 + 1][var31 - 1] = var21; + if(endY < 127 && lowestCost > 0 && class178.directions[endY + 1][lowestCost - 1] == 0 && (var18[approxDestSizeY + 1][checkX - 1] & 19136899) == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) { + class178.bufferX[approxDestX] = graphBaseY + 1; + class178.bufferY[approxDestX] = endX - 1; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY + 1][lowestCost - 1] = 9; + class178.distances[endY + 1][lowestCost - 1] = checkY; } - if(var30 > 0 && var31 < 127 && class178.__fi_q[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { - class178.__fi_l[var33] = var10 - 1; - class178.__fi_e[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30 - 1][var31 + 1] = 6; - class178.__fi_w[var30 - 1][var31 + 1] = var21; + if(endY > 0 && lowestCost < 127 && class178.directions[endY - 1][lowestCost + 1] == 0 && (var18[approxDestSizeY - 1][checkX + 1] & 19136824) == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) { + class178.bufferX[approxDestX] = graphBaseY - 1; + class178.bufferY[approxDestX] = endX + 1; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY - 1][lowestCost + 1] = 6; + class178.distances[endY - 1][lowestCost + 1] = checkY; } - if(var30 < 127 && var31 < 127 && class178.__fi_q[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { - class178.__fi_l[var33] = var10 + 1; - class178.__fi_e[var33] = var11 + 1; - var33 = var33 + 1 & 4095; - class178.__fi_q[var30 + 1][var31 + 1] = 12; - class178.__fi_w[var30 + 1][var31 + 1] = var21; + if(endY < 127 && lowestCost < 127 && class178.directions[endY + 1][lowestCost + 1] == 0 && (var18[approxDestSizeY + 1][checkX + 1] & 19136992) == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) { + class178.bufferX[approxDestX] = graphBaseY + 1; + class178.bufferY[approxDestX] = endX + 1; + approxDestX = approxDestX + 1 & 4095; + class178.directions[endY + 1][lowestCost + 1] = 12; + class178.distances[endY + 1][lowestCost + 1] = checkY; } } - var28 = var29; - } else if(var2 == 2) { - var28 = WorldMapSection2.method593(var0, var1, var3, var4); + found = var29; // Vars are weird above here cause that's an inlined method + } else if(srcSize == 2) { + found = WorldMapSection2.method593(srcX, srcY, strategy, collisionMap); } else { - var28 = IndexStore.method3585(var0, var1, var2, var3, var4); + found = IndexStore.method3585(srcX, srcY, srcSize, strategy, collisionMap); } - var9 = var0 - 64; - var10 = var1 - 64; - var11 = WidgetGroupParent.__bx_o; - var30 = UrlRequester.__eo_u; - if(!var28) { - var31 = Integer.MAX_VALUE; - var14 = Integer.MAX_VALUE; - byte var32 = 10; - var33 = var3.field2120; - var17 = var3.field2121; - int var27 = var3.field2122; - var19 = var3.field2123; + graphBaseX = srcX - 64; + graphBaseY = srcY - 64; + endX = WidgetGroupParent.__bx_o; + endY = UrlRequester.__eo_u; + if(!found) { + lowestCost = Integer.MAX_VALUE; + lowestDistance = Integer.MAX_VALUE; + byte alternativeRouteRange = 10; + approxDestX = strategy.approxDestinationX; + approxDestY = strategy.approxDestinationY; + int approxDestSizeX = strategy.approxDestinationSizeX; + approxDestSizeY = strategy.approxDestinationSizeY; - for(var20 = var33 - var32; var20 <= var32 + var33; ++var20) { - for(var21 = var17 - var32; var21 <= var17 + var32; ++var21) { - int var22 = var20 - var9; - int var23 = var21 - var10; - if(var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class178.__fi_w[var22][var23] < 100) { - int var24 = 0; - if(var20 < var33) { - var24 = var33 - var20; - } else if(var20 > var27 + var33 - 1) { - var24 = var20 - (var27 + var33 - 1); + for(checkX = approxDestX - alternativeRouteRange; checkX <= alternativeRouteRange + approxDestX; ++checkX) { + for(checkY = approxDestY - alternativeRouteRange; checkY <= approxDestY + alternativeRouteRange; ++checkY) { + int graphX = checkX - graphBaseX; + int graphY = checkY - graphBaseY; + if(graphX >= 0 && graphY >= 0 && graphX < 128 && graphY < 128 && class178.distances[graphX][graphY] < 100) { + int deltaX = 0; + if(checkX < approxDestX) { + deltaX = approxDestX - checkX; + } else if(checkX > approxDestSizeX + approxDestX - 1) { + deltaX = checkX - (approxDestSizeX + approxDestX - 1); } - int var25 = 0; - if(var21 < var17) { - var25 = var17 - var21; - } else if(var21 > var19 + var17 - 1) { - var25 = var21 - (var19 + var17 - 1); + int deltaY = 0; + if(checkY < approxDestY) { + deltaY = approxDestY - checkY; + } else if(checkY > approxDestSizeY + approxDestY - 1) { + deltaY = checkY - (approxDestSizeY + approxDestY - 1); } - int var26 = var25 * var25 + var24 * var24; - if(var26 < var31 || var26 == var31 && class178.__fi_w[var22][var23] < var14) { - var31 = var26; - var14 = class178.__fi_w[var22][var23]; - var11 = var20; - var30 = var21; + int cost = deltaY * deltaY + deltaX * deltaX; + if(cost < lowestCost || cost == lowestCost && class178.distances[graphX][graphY] < lowestDistance) { + lowestCost = cost; + lowestDistance = class178.distances[graphX][graphY]; + endX = checkX; + endY = checkY; } } } } - if(var31 == Integer.MAX_VALUE) { + if(lowestCost == Integer.MAX_VALUE) { return -1; } } - if(var0 == var11 && var30 == var1) { + if(srcX == endX && endY == srcY) { return 0; - } else { + } else { // Inlined again after this I think var13 = 0; - class178.__fi_l[var13] = var11; - var31 = var13 + 1; - class178.__fi_e[var13] = var30; + class178.bufferX[var13] = endX; + lowestCost = var13 + 1; + class178.bufferY[var13] = endY; - for(var14 = var15 = class178.__fi_q[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class178.__fi_q[var11 - var9][var30 - var10]) { - if(var14 != var15) { - var15 = var14; - class178.__fi_l[var31] = var11; - class178.__fi_e[var31++] = var30; + for(lowestDistance = var15 = class178.directions[endX - graphBaseX][endY - graphBaseY]; srcX != endX || endY != srcY; lowestDistance = class178.directions[endX - graphBaseX][endY - graphBaseY]) { + if(lowestDistance != var15) { + var15 = lowestDistance; + class178.bufferX[lowestCost] = endX; + class178.bufferY[lowestCost++] = endY; } - if((var14 & 2) != 0) { - ++var11; - } else if((var14 & 8) != 0) { - --var11; + if((lowestDistance & 2) != 0) { + ++endX; + } else if((lowestDistance & 8) != 0) { + --endX; } - if((var14 & 1) != 0) { - ++var30; - } else if((var14 & 4) != 0) { - --var30; + if((lowestDistance & 1) != 0) { + ++endY; + } else if((lowestDistance & 4) != 0) { + --endY; } } - var33 = 0; + approxDestX = 0; - while(var31-- > 0) { - var6[var33] = class178.__fi_l[var31]; - var7[var33++] = class178.__fi_e[var31]; - if(var33 >= var6.length) { + while(lowestCost-- > 0) { + bufferX[approxDestX] = class178.bufferX[lowestCost]; + bufferY[approxDestX++] = class178.bufferY[lowestCost]; + if(approxDestX >= bufferX.length) { break; } } - return var33; + return approxDestX; } } diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NpcDefinition.java index 3a2e339a5b..244c978e2b 100644 --- a/runescape-client/src/main/java/NpcDefinition.java +++ b/runescape-client/src/main/java/NpcDefinition.java @@ -699,7 +699,7 @@ public class NpcDefinition extends DualNode { if(var1 == 0L) { var0 = 5; } else { - var0 = class72.method1778(var1, Login.Login_username); + var0 = LoginScreenAnimation.method1778(var1, Login.Login_username); } switch(var0) { diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/OwnWorldComparator.java index c5853cefcd..00cc8d8ca5 100644 --- a/runescape-client/src/main/java/OwnWorldComparator.java +++ b/runescape-client/src/main/java/OwnWorldComparator.java @@ -55,9 +55,9 @@ public class OwnWorldComparator implements Comparator { static int method1285(int var0, Script var1, boolean var2) { int var3; if(var0 == 5504) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if(!Client.isCameraLocked) { Client.cameraPitchTarget = var3; Client.minimapOrientation = var4; @@ -65,13 +65,13 @@ public class OwnWorldComparator implements Comparator { return 1; } else if(var0 == 5505) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.cameraPitchTarget; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget; return 1; } else if(var0 == 5506) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.minimapOrientation; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation; return 1; } else if(var0 == 5530) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var3 < 0) { var3 = 0; } @@ -79,7 +79,7 @@ public class OwnWorldComparator implements Comparator { Client.cameraFollowHeight = var3; return 1; } else if(var0 == 5531) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.cameraFollowHeight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 155afecb84..d242931c4b 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -328,7 +328,7 @@ public final class Player extends Actor { ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = WorldMapArea.friendSystem.__t_161(this.username)?TriBool.TriBool_true:TriBool.TriBool_false; + this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username)?TriBool.TriBool_true:TriBool.TriBool_false; } @ObfuscatedName("o") diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 93f6790cab..2cf176aa29 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -87,7 +87,7 @@ public enum PlayerType implements Enumerated { signature = "(II)V", garbageValue = "300731074" ) - static void method4547(int var0) { + static void clearItemContainer(int var0) { ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if(var1 != null) { for(int var2 = 0; var2 < var1.ids.length; ++var2) { diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index bde438c83e..1bdd13aad5 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -3428,22 +3428,22 @@ public class Rasterizer3D extends Rasterizer2D { } @ObfuscatedName("p") - static final int method3005(int var0, int var1, int var2, int var3) { + static final int rot3(int var0, int var1, int var2, int var3) { return var0 * var2 - var3 * var1 >> 16; } @ObfuscatedName("v") - static final int method3006(int var0, int var1, int var2, int var3) { + static final int rot4(int var0, int var1, int var2, int var3) { return var3 * var0 + var2 * var1 >> 16; } @ObfuscatedName("ag") - static final int method3007(int var0, int var1, int var2, int var3) { + static final int rot1(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } @ObfuscatedName("aq") - static final int method3008(int var0, int var1, int var2, int var3) { + static final int rot2(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } } diff --git a/runescape-client/src/main/java/class179.java b/runescape-client/src/main/java/RouteStrategy.java similarity index 87% rename from runescape-client/src/main/java/class179.java rename to runescape-client/src/main/java/RouteStrategy.java index 5b0bec30cc..7e8bfe3ebd 100644 --- a/runescape-client/src/main/java/class179.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,7 +4,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fe") -public abstract class class179 { +public abstract class RouteStrategy +{ @ObfuscatedName("l") @ObfuscatedGetter( intValue = -1237576843 @@ -18,22 +19,22 @@ public abstract class class179 { @ObfuscatedGetter( intValue = 123677543 ) - public int field2120; + public int approxDestinationX; @ObfuscatedName("f") @ObfuscatedGetter( intValue = -2126454535 ) - public int field2121; + public int approxDestinationY; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1566880917 ) - public int field2122; + public int approxDestinationSizeX; @ObfuscatedName("w") @ObfuscatedGetter( intValue = -2126101601 ) - public int field2123; + public int approxDestinationSizeY; @ObfuscatedName("m") @ObfuscatedSignature( @@ -69,7 +70,7 @@ public abstract class class179 { signature = "(Lir;II)Z", garbageValue = "-602741260" ) - static boolean method3643(AbstractIndexCache var0, int var1) { + static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) { byte[] var2 = var0.takeRecordFlat(var1); if(var2 == null) { return false; diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 664404b3ce..2ba2514916 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -115,49 +115,49 @@ public class ScriptEvent extends Node { static int method1185(int var0, Script var1, boolean var2) { Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; if(var0 == 1600) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollX; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX; return 1; } else if(var0 == 1601) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollY; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY; return 1; } else if(var0 == 1602) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; return 1; } else if(var0 == 1603) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollWidth; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; } else if(var0 == 1604) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.scrollHeight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; } else if(var0 == 1605) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelZoom; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; } else if(var0 == 1606) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelAngleX; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; } else if(var0 == 1607) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelAngleZ; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; } else if(var0 == 1608) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.modelAngleY; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; } else if(var0 == 1609) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.transparency; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency; return 1; } else if(var0 == 1610) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__af; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af; return 1; } else if(var0 == 1611) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color; return 1; } else if(var0 == 1612) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2; return 1; } else if(var0 == 1613) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal(); return 1; } else if(var0 == 1614) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0; return 1; } else { return 2; @@ -171,44 +171,44 @@ public class ScriptEvent extends Node { ) static int method1187(int var0, Script var1, boolean var2) { if(var0 == 3300) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.cycle; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle; return 1; } else { int var3; int var4; if(var0 == 3301) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class83.method2027(var3, var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4); return 1; } else if(var0 == 3302) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4); return 1; } else if(var0 == 3303) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class1.method18(var3, var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4); return 1; } else if(var0 == 3304) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class231.method4523(var3).size; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size; return 1; } else if(var0 == 3305) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; return 1; } else if(var0 == 3306) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.levels[var3]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3]; return 1; } else if(var0 == 3307) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.experience[var3]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3]; return 1; } else { int var5; @@ -216,82 +216,82 @@ public class ScriptEvent extends Node { var3 = SoundSystem.plane; var4 = (Canvas.localPlayer.x >> 7) + class50.baseX; var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); return 1; } else if(var0 == 3309) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; return 1; } else if(var0 == 3310) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 >> 28; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28; return 1; } else if(var0 == 3311) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 & 16383; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & 16383; return 1; } else if(var0 == 3312) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.isMembersWorld?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld?1:0; return 1; } else if(var0 == 3313) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class83.method2027(var3, var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4); return 1; } else if(var0 == 3314) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4); return 1; } else if(var0 == 3315) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class1.method18(var3, var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4); return 1; } else if(var0 == 3316) { if(Client.rights >= 2) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.rights; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 3317) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.rebootTimer; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer; return 1; } else if(var0 == 3318) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.worldId; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId; return 1; } else if(var0 == 3321) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.runEnergy; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy; return 1; } else if(var0 == 3322) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.weight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight; return 1; } else if(var0 == 3323) { if(Client.__client_mn) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 3324) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.worldProperties; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties; return 1; } else if(var0 == 3325) { - class179.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; + RouteStrategy.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; var3 += var4 << 14; var3 += var5 << 28; var3 += var6; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 145828bef3..fcfe23f2ec 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -23,7 +23,7 @@ public class SecureRandomCallable implements Callable { garbageValue = "64" ) static class27 method1145(byte[] var0) { - return var0 == null?new class27():new class27(class27.method438(var0).pixels); + return var0 == null?new class27():new class27(class27.convertJpgToSprite(var0).pixels); } @ObfuscatedName("m") diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 3f526b4e34..d9cf7aab24 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -15,8 +15,8 @@ public class SecureRandomFuture { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__cn_bu") - static IndexedSprite __cn_bu; + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; @ObfuscatedName("dy") @ObfuscatedSignature( signature = "Lit;" diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index ec2fe9dc64..27740a02bf 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -634,7 +634,7 @@ public class ServerPacket { signature = "(I)Llq;", garbageValue = "2048918805" ) - static IndexedSprite method3663() { + static IndexedSprite createIndexedSprite() { IndexedSprite var0 = new IndexedSprite(); var0.width = class328.indexedSpriteWidth; var0.height = class328.indexedSpriteHeight; diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index a416d44c18..5a94baf1d4 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -382,8 +382,8 @@ public final class Sprite extends Rasterizer2D { } @ObfuscatedName("t") - @Export("__t_507") - public void __t_507(int var1, int var2, int var3, int var4) { + @Export("drawAtTransOverlay") + public void drawAtTransOverlay(int var1, int var2, int var3, int var4) { if(var3 == 256) { this.drawAt2(var1, var2); } else { diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index e621c81af8..2fba5062e2 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -130,7 +130,7 @@ public class SpriteIds { garbageValue = "195396240" ) public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) { - if(!SpriteMask.method4392(var0, var2, var3)) { + if(!SpriteMask.loadSprite(var0, var2, var3)) { return null; } else { byte[] var5 = var1.takeRecord(var2, var3); diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 856c8ea133..f6e81e2c1b 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -95,7 +95,7 @@ public class SpriteMask extends DualNode { signature = "(Lir;IIB)Z", garbageValue = "1" ) - public static boolean method4392(AbstractIndexCache var0, int var1, int var2) { + public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) { byte[] var3 = var0.takeRecord(var1, var2); if(var3 == null) { return false; diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 57bbe957ab..21848a13cd 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -111,15 +111,15 @@ public class StructDefinition extends DualNode { Widget var3; if(var0 >= 2000) { var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var3 = Huffman.getWidget(var4); } else { var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; } if(var0 == 1100) { - class179.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if(var3.scrollX > var3.scrollWidth - var3.width) { var3.scrollX = var3.scrollWidth - var3.width; } @@ -128,7 +128,7 @@ public class StructDefinition extends DualNode { var3.scrollX = 0; } - var3.scrollY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + var3.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if(var3.scrollY > var3.scrollHeight - var3.height) { var3.scrollY = var3.scrollHeight - var3.height; } @@ -140,52 +140,52 @@ public class StructDefinition extends DualNode { class22.method295(var3); return 1; } else if(var0 == 1101) { - var3.color = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1102) { - var3.fill = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var3.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var3); return 1; } else if(var0 == 1103) { - var3.transparency = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1104) { - var3.lineWid = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1105) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1106) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1107) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var3.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var3); return 1; } else if(var0 == 1108) { var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1109) { - class179.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 5]; + RouteStrategy.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5]; class22.method295(var3); return 1; } else { int var8; if(var0 == 1110) { - var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var8 != var3.sequenceId) { var3.sequenceId = var8; var3.modelFrame = 0; @@ -195,7 +195,7 @@ public class StructDefinition extends DualNode { return 1; } else if(var0 == 1111) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var3.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var3); return 1; } else if(var0 == 1112) { @@ -207,40 +207,40 @@ public class StructDefinition extends DualNode { return 1; } else if(var0 == 1113) { - var3.fontId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1114) { - class179.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; + RouteStrategy.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; class22.method295(var3); return 1; } else if(var0 == 1115) { - var3.textShadowed = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var3.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var3); return 1; } else if(var0 == 1116) { - var3.outline = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1117) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1118) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var3.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var3); return 1; } else if(var0 == 1119) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var3.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; class22.method295(var3); return 1; } else if(var0 == 1120) { - class179.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; class22.method295(var3); if(var4 != -1 && var3.type == 0) { class39.revalidateWidgetScroll(Widget.widgets[var4 >> 16], var3, false); @@ -253,19 +253,19 @@ public class StructDefinition extends DualNode { class22.method295(var3); return 1; } else if(var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1123) { - var3.color2 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1124) { - var3.__af = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.__af = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class22.method295(var3); return 1; } else if(var0 == 1125) { - var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; RectangleMode var6 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var8); if(var6 != null) { var3.rectangleMode = var6; @@ -276,11 +276,11 @@ public class StructDefinition extends DualNode { } else { boolean var5; if(var0 == 1126) { - var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var3.__ba = var5; return 1; } else if(var0 == 1127) { - var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; var3.__bv = var5; return 1; } else { diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 07bb12eef5..ace01a418a 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -321,135 +321,135 @@ public class TextureProvider implements TextureLoader { int var3; int var4; if(var0 == 4000) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 + var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var4; return 1; } else if(var0 == 4001) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 - var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 - var4; return 1; } else if(var0 == 4002) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4 * var3; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 * var3; return 1; } else if(var0 == 4003) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 / var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 / var4; return 1; } else if(var0 == 4004) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); return 1; } else if(var0 == 4005) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); return 1; } else if(var0 == 4006) { - class179.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + RouteStrategy.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; + int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); return 1; } else if(var0 == 4007) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; return 1; } else if(var0 == 4008) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 | 1 << var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | 1 << var4; return 1; } else if(var0 == 4009) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); return 1; } else if(var0 == 4010) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0?1:0; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0?1:0; return 1; } else if(var0 == 4011) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 % var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 % var4; return 1; } else if(var0 == 4012) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if(var3 == 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); } return 1; } else if(var0 == 4013) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if(var3 == 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else { switch(var4) { case 0: - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; break; case 1: - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; break; case 2: - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); break; case 3: - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); break; case 4: - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); break; default: - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); } return 1; } } else if(var0 == 4014) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 & var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & var4; return 1; } else if(var0 == 4015) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3 | var4; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | var4; return 1; } else if(var0 == 4018) { - class179.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); + RouteStrategy.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); return 1; } else { return 2; diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index f4bff62ad3..267f110068 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -199,14 +199,14 @@ public final class Tile extends Node { } if(var0.isFollower && Client.followerOpsLowPriority) { - Tiles.method1106("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); } if(Client.isItemSelected == 1) { - Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3); } else if(Client.isSpellSelected) { if((FloorDecoration.selectedSpellFlags & 2) == 2) { - Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3); } } else { int var10 = var0.isFollower && Client.followerOpsLowPriority?2000:0; @@ -235,7 +235,7 @@ public final class Tile extends Node { var8 = var10 + 13; } - Tiles.method1106(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3); + Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3); } } } @@ -270,14 +270,14 @@ public final class Tile extends Node { var8 = var12 + 13; } - Tiles.method1106(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3); + Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3); } } } } if(!var0.isFollower || !Client.followerOpsLowPriority) { - Tiles.method1106("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3); } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index cd80b832f6..4800cf2d76 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -93,7 +93,7 @@ public final class Tiles { signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", garbageValue = "-1525245246" ) - public static final void method1106(String var0, String var1, int var2, int var3, int var4, int var5) { + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { class16.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java index 5043399310..2d67699986 100644 --- a/runescape-client/src/main/java/TotalQuantityComparator.java +++ b/runescape-client/src/main/java/TotalQuantityComparator.java @@ -164,10 +164,10 @@ final class TotalQuantityComparator implements Comparator { int var10; if(Client.isItemSelected == 1) { - Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3); } else if(Client.isSpellSelected) { if((FloorDecoration.selectedSpellFlags & 8) == 8) { - Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3); } } else { for(var10 = 7; var10 >= 0; --var10) { @@ -195,7 +195,7 @@ final class TotalQuantityComparator implements Comparator { boolean var12 = false; var7 = Client.playerMenuOpcodes[var10] + var11; - Tiles.method1106(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var7, var1, var2, var3); + Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var7, var1, var2, var3); } } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 9244a34c4f..c911d6c9be 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -11,8 +11,8 @@ public class UrlRequest { @ObfuscatedSignature( signature = "[Llq;" ) - @Export("__ey_bx") - static IndexedSprite[] __ey_bx; + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; @ObfuscatedName("m") @Export("url") final URL url; diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 7384424adb..54977070b0 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -60,32 +60,32 @@ public class UserComparator4 implements Comparator { ) static int method3335(int var0, Script var1, boolean var2) { if(var0 == 5306) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822(); return 1; } else { int var3; if(var0 == 5307) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var3 == 1 || var3 == 2) { GroundItem.method2095(var3); } return 1; } else if(var0 == 5308) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode; return 1; } else if(var0 != 5309) { if(var0 == 5310) { - --class179.Interpreter_intStackSize; + --RouteStrategy.Interpreter_intStackSize; return 1; } else { return 2; } } else { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var3 == 1 || var3 == 2) { ReflectionCheck.clientPreferences.windowMode = var3; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); } return 1; diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 561e9e45aa..dc1f5654ff 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -62,7 +62,7 @@ public class UserComparator9 extends AbstractUserComparator { signature = "(I)[Lln;", garbageValue = "-1724028611" ) - public static Sprite[] method3344() { + public static Sprite[] createSpriteArray() { Sprite[] var0 = new Sprite[class328.indexedSpriteCount]; for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) { diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 190036bd6c..30871f2254 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -54,9 +54,9 @@ public class Username implements Comparable { return this.cleanName == null?(var1.cleanName == null?0:1):(var1.cleanName == null?-1:this.cleanName.compareTo(var1.cleanName)); } - @Export("__equals_466") + @Export("equals") @ObfuscatedName("equals") - public boolean __equals_466(Object var1) { + public boolean equals(Object var1) { if(var1 instanceof Username) { Username var2 = (Username)var1; if (this.cleanName == null) diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index aa107f00f7..14b5f1d557 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -17,14 +17,14 @@ public class VarcInt extends DualNode { @ObfuscatedSignature( signature = "Ler;" ) - @Export("__iw_f") - static EvictingDualNodeHashTable __iw_f; + @Export("cachedVarcInts") + static EvictingDualNodeHashTable cachedVarcInts; @ObfuscatedName("q") @Export("persist") public boolean persist; static { - __iw_f = new EvictingDualNodeHashTable(64); + cachedVarcInts = new EvictingDualNodeHashTable(64); } VarcInt() { @@ -76,7 +76,7 @@ public class VarcInt extends DualNode { signature = "(CI)Z", garbageValue = "1367119425" ) - public static boolean method4807(char var0) { + public static boolean isAlphaNumeric(char var0) { return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index c9a3e7e62e..8efa66c2e2 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -39,7 +39,7 @@ public class Varcs { int var2; for(var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = AbstractByteArrayCopier.method4021(var2); + VarcInt var3 = AbstractByteArrayCopier.getVarcInt(var2); this.intsPersistence[var2] = var3.persist; } @@ -219,7 +219,7 @@ public class Varcs { ++var12; } - var32.writeByte(var9.field17); + var32.writeByte(var9.id); Class var34 = var8.getClass(); class3[] var15 = class3.method34(); int var16 = 0; diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 44e172eeb8..9e064f5004 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -20,8 +20,8 @@ public class Varps { @ObfuscatedGetter( intValue = 120772859 ) - @Export("__hv_h") - static int __hv_h; + @Export("loginBoxCenter") + static int loginBoxCenter; static { Varps_masks = new int[32]; diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 96659bd75e..bcd9172342 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -67,10 +67,10 @@ public class VertexNormal { } else if(var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; } else { - if(class179.__fe_e != null) { + if(RouteStrategy.__fe_e != null) { for(int var1 = 0; var1 < ByteArrayPool.__gi_g.length; ++var1) { - if(var0.length == ByteArrayPool.__gi_g[var1] && WorldMapSection2.__ah_l[var1] < class179.__fe_e[var1].length) { - class179.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0; + if(var0.length == ByteArrayPool.__gi_g[var1] && WorldMapSection2.__ah_l[var1] < RouteStrategy.__fe_e[var1].length) { + RouteStrategy.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0; return; } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 5bd207bddf..67bde74f63 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -84,24 +84,24 @@ public class ViewportMouse { garbageValue = "2128573585" ) static int method2983(int var0, Script var1, boolean var2) { - Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if(var0 == 2500) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.x; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; } else if(var0 == 2501) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.y; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; } else if(var0 == 2502) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.width; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; } else if(var0 == 2503) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.height; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; } else if(var0 == 2504) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.isHidden?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0; return 1; } else if(var0 == 2505) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.parentId; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 9035ee1dac..f34c1ef220 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -20,11 +20,11 @@ public class World { @Export("__bt_g") static int __bt_g; @ObfuscatedName("l") - @Export("__bt_l") - static int[] __bt_l; + @Export("sortOption2") + static int[] sortOption2; @ObfuscatedName("e") - @Export("__bt_e") - static int[] __bt_e; + @Export("sortOption1") + static int[] sortOption1; @ObfuscatedName("d") @ObfuscatedGetter( intValue = -144265493 @@ -65,8 +65,8 @@ public class World { static { worldsCount = 0; __bt_g = 0; - __bt_l = new int[]{1, 1, 1, 1}; - __bt_e = new int[]{0, 1, 2, 3}; + sortOption2 = new int[]{1, 1, 1, 1}; + sortOption1 = new int[]{0, 1, 2, 3}; } @ObfuscatedName("e") @@ -74,8 +74,8 @@ public class World { signature = "(I)Z", garbageValue = "-1059414592" ) - @Export("__e_144") - boolean __e_144() { + @Export("isMembersOnly") + boolean isMembersOnly() { return (1 & this.properties) != 0; } @@ -94,8 +94,8 @@ public class World { signature = "(I)Z", garbageValue = "-354931924" ) - @Export("__d_146") - boolean __d_146() { + @Export("isPvp") + boolean isPvp() { return (4 & this.properties) != 0; } @@ -114,9 +114,9 @@ public class World { signature = "(B)Z", garbageValue = "-1" ) - @Export("__z_148") - boolean __z_148() { - return (536870912 & this.properties) != 0; + @Export("isDeadman") + boolean isDeadman() { + return (0x20000000 & this.properties) != 0; // 1 << 29 } @ObfuscatedName("j") @@ -124,9 +124,9 @@ public class World { signature = "(I)Z", garbageValue = "2033779841" ) - @Export("__j_149") - boolean __j_149() { - return (33554432 & this.properties) != 0; + @Export("isBeta") + boolean isBeta() { + return (0x2000000 & this.properties) != 0; // 1 << 25 } @ObfuscatedName("f") diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/WorldComparator.java index e1c685e25d..77538cc0e7 100644 --- a/runescape-client/src/main/java/WorldComparator.java +++ b/runescape-client/src/main/java/WorldComparator.java @@ -49,15 +49,15 @@ final class WorldComparator implements Comparator { ) static int method68(int var0, Script var1, boolean var2) { if(var0 == 3200) { - class179.Interpreter_intStackSize -= 3; - Ignored.queueSoundEffect(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]); + RouteStrategy.Interpreter_intStackSize -= 3; + Ignored.queueSoundEffect(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]); return 1; } else if(var0 == 3201) { - AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; } else if(var0 == 3202) { - class179.Interpreter_intStackSize -= 2; - HealthBar.method1994(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 2; + HealthBar.method1994(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; } else { return 2; diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 618e8a698e..abff754e79 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -1301,7 +1301,7 @@ public class WorldMap { for(int var14 = this.__bs.length - 1; var14 >= 0; --var14) { if(var12.strings[var14] != null) { - Tiles.method1106(var12.strings[var14], var12.string1, this.__bs[var14], var11.__m_15(), var11.coord1.packed(), var11.coord2.packed()); + Tiles.insertMenuItemNoShift(var12.strings[var14], var12.string1, this.__bs[var14], var11.__m_15(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index fbec90b7d0..96db746df5 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -133,7 +133,7 @@ public class WorldMapAreaData extends WorldMapArea { Widget var4; if(var0 >= 2000) { var0 -= 1000; - var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var3 = false; } else { var4 = var2?WorldMapIcon1.__t_i:class12.__n_n; @@ -141,7 +141,7 @@ public class WorldMapAreaData extends WorldMapArea { int var11; if(var0 == 1300) { - var11 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] - 1; + var11 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; if(var11 >= 0 && var11 <= 9) { var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); return 1; @@ -152,19 +152,19 @@ public class WorldMapAreaData extends WorldMapArea { } else { int var6; if(var0 == 1301) { - class179.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var4.parent = class204.getWidgetChild(var11, var6); return 1; } else if(var0 == 1302) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var4.isScrollBar = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 1303) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4.dragZoneSize = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; } else if(var0 == 1304) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4.dragThreshold = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; } else if(var0 == 1305) { var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; @@ -176,7 +176,7 @@ public class WorldMapAreaData extends WorldMapArea { var4.actions = null; return 1; } else if(var0 == 1308) { - var4.__fz = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var4.__fz = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { int var7; @@ -184,17 +184,17 @@ public class WorldMapAreaData extends WorldMapArea { if(var0 != 1350) { byte var5; if(var0 == 1351) { - class179.Interpreter_intStackSize -= 2; + RouteStrategy.Interpreter_intStackSize -= 2; var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]}; BufferedSink.method3595(var4, var5, var9, var10); return 1; } else if(var0 == 1352) { - class179.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; + RouteStrategy.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; if(var11 >= 0 && var11 <= 9) { Varcs.method2168(var4, var11, var6, var7); return 1; @@ -203,13 +203,13 @@ public class WorldMapAreaData extends WorldMapArea { } } else if(var0 == 1353) { var5 = 10; - var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Varcs.method2168(var4, var5, var6, var7); return 1; } else if(var0 == 1354) { - --class179.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] - 1; + --RouteStrategy.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1; if(var11 >= 0 && var11 <= 9) { WorldMapSection3.method345(var4, var11); return 1; @@ -227,9 +227,9 @@ public class WorldMapAreaData extends WorldMapArea { byte[] var8 = null; var9 = null; if(var3) { - class179.Interpreter_intStackSize -= 10; + RouteStrategy.Interpreter_intStackSize -= 10; - for(var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize] >= 0; var7 += 2) { + for(var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) { ; } @@ -238,17 +238,17 @@ public class WorldMapAreaData extends WorldMapArea { var9 = new byte[var7 / 2]; for(var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class179.Interpreter_intStackSize + 1]; + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1]; } } } else { - class179.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]}; + RouteStrategy.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]}; } - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] - 1; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1; if(var7 >= 0 && var7 <= 9) { BufferedSink.method3595(var4, var7, var8, var9); return 1; diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 8a0dfcdb3d..705477fe2c 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -70,16 +70,16 @@ public class WorldMapCacheName { if(var0 != null && var1 != null) { ByteArrayPool.__gi_g = var0; WorldMapSection2.__ah_l = new int[var0.length]; - class179.__fe_e = new byte[var0.length][][]; + RouteStrategy.__fe_e = new byte[var0.length][][]; for(int var2 = 0; var2 < ByteArrayPool.__gi_g.length; ++var2) { - class179.__fe_e[var2] = new byte[var1[var2]][]; + RouteStrategy.__fe_e[var2] = new byte[var1[var2]][]; } } else { ByteArrayPool.__gi_g = null; WorldMapSection2.__ah_l = null; - class179.__fe_e = null; + RouteStrategy.__fe_e = null; } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index e264324840..258935c48c 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -11,8 +11,8 @@ public class WorldMapEvent { @ObfuscatedSignature( signature = "[Llq;" ) - @Export("__ap_w") - static IndexedSprite[] __ap_w; + @Export("runesSprite") + static IndexedSprite[] runesSprite; @ObfuscatedName("m") @ObfuscatedGetter( intValue = 264384233 @@ -57,7 +57,7 @@ public class WorldMapEvent { ) static final void method781(int var0, int var1, int var2, int var3) { if(Client.isItemSelected == 0 && !Client.isSpellSelected) { - Tiles.method1106("Walk here", "", 23, 0, var0 - var2, var1 - var3); + Tiles.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); } long var4 = -1L; @@ -98,10 +98,10 @@ public class WorldMapEvent { } if(Client.isItemSelected == 1) { - Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 1, var19, var15, var17); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 1, var19, var15, var17); } else if(Client.isSpellSelected) { if((FloorDecoration.selectedSpellFlags & 4) == 4) { - Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 2, var19, var15, var17); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 2, var19, var15, var17); } } else { String[] var29 = var20.actions; @@ -129,12 +129,12 @@ public class WorldMapEvent { var23 = 1001; } - Tiles.method1106(var29[var30], BufferedFile.colorStartTag(65535) + var20.name, var23, var19, var15, var17); + Tiles.insertMenuItemNoShift(var29[var30], BufferedFile.colorStartTag(65535) + var20.name, var23, var19, var15, var17); } } } - Tiles.method1106("Examine", BufferedFile.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var17); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var17); } } @@ -209,10 +209,10 @@ public class WorldMapEvent { for(GroundItem var39 = (GroundItem)var35.first(); var39 != null; var39 = (GroundItem)var35.next()) { ItemDefinition var37 = Skills.getItemDefinition(var39.id); if(Client.isItemSelected == 1) { - Tiles.method1106("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var17); + Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var17); } else if(Client.isSpellSelected) { if((FloorDecoration.selectedSpellFlags & 1) == 1) { - Tiles.method1106(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var17); + Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var17); } } else { String[] var31 = var37.groundActions; @@ -240,13 +240,13 @@ public class WorldMapEvent { var25 = 22; } - Tiles.method1106(var31[var32], BufferedFile.colorStartTag(16748608) + var37.name, var25, var39.id, var15, var17); + Tiles.insertMenuItemNoShift(var31[var32], BufferedFile.colorStartTag(16748608) + var37.name, var25, var39.id, var15, var17); } else if(var32 == 2) { - Tiles.method1106("Take", BufferedFile.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var17); + Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var17); } } - Tiles.method1106("Examine", BufferedFile.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var17); + Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var17); } } } diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java index 46ab9b277f..5a6b13156c 100644 --- a/runescape-client/src/main/java/WorldMapIcon2.java +++ b/runescape-client/src/main/java/WorldMapIcon2.java @@ -180,12 +180,12 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon { if(var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { if(var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { int var9 = var0.transformedSize(); - Client.field895.field2120 = var1; - Client.field895.field2121 = var2; - Client.field895.field2122 = 1; - Client.field895.field2123 = 1; + Client.field895.approxDestinationX = var1; + Client.field895.approxDestinationY = var2; + Client.field895.approxDestinationSizeX = 1; + Client.field895.approxDestinationSizeY = 1; class65 var10 = Client.field895; - int var11 = NetSocket.method3571(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.__client_tp, Client.__client_th); + int var11 = NetSocket.calculateRoute(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.__client_tp, Client.__client_th); if(var11 >= 1) { for(int var12 = 0; var12 < var11 - 1; ++var12) { var0.__a_131(Client.__client_tp[var12], Client.__client_th[var12], var3); diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index f73b839a03..01bb187020 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -169,7 +169,7 @@ public class WorldMapLabel { signature = "(I)[Llq;", garbageValue = "-1374541046" ) - public static IndexedSprite[] method444() { + public static IndexedSprite[] createIndexedSpriteArray() { IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount]; for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) { @@ -215,7 +215,7 @@ public class WorldMapLabel { return var4 - var5; } else { - return var2 == 2?var0.location - var1.location:(var2 == 3?(var0.activity.equals("-")?(var1.activity.equals("-")?0:(var3?-1:1)):(var1.activity.equals("-")?(var3?1:-1):var0.activity.compareTo(var1.activity))):(var2 == 4?(var0.__a_147()?(var1.__a_147()?0:1):(var1.__a_147()?-1:0)):(var2 == 5?(var0.__x_145()?(var1.__x_145()?0:1):(var1.__x_145()?-1:0)):(var2 == 6?(var0.__d_146()?(var1.__d_146()?0:1):(var1.__d_146()?-1:0)):(var2 == 7?(var0.__e_144()?(var1.__e_144()?0:1):(var1.__e_144()?-1:0)):var0.id - var1.id))))); + return var2 == 2?var0.location - var1.location:(var2 == 3?(var0.activity.equals("-")?(var1.activity.equals("-")?0:(var3?-1:1)):(var1.activity.equals("-")?(var3?1:-1):var0.activity.compareTo(var1.activity))):(var2 == 4?(var0.__a_147()?(var1.__a_147()?0:1):(var1.__a_147()?-1:0)):(var2 == 5?(var0.__x_145()?(var1.__x_145()?0:1):(var1.__x_145()?-1:0)):(var2 == 6?(var0.isPvp()?(var1.isPvp()?0:1):(var1.isPvp()?-1:0)):(var2 == 7?(var0.isMembersOnly()?(var1.isMembersOnly()?0:1):(var1.isMembersOnly()?-1:0)):var0.id - var1.id))))); } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 2b0e9d12e1..cab85b879f 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -171,7 +171,7 @@ public final class WorldMapManager { System.nanoTime(); if(var1.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) { byte[] var20 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2); - this.overviewSprite = class27.method438(var20); + this.overviewSprite = class27.convertJpgToSprite(var20); } System.nanoTime(); diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 161d5fa665..12258d07ae 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -1073,7 +1073,7 @@ public class WorldMapRegion { ) static final void method567(Widget var0, int var1, int var2) { if(Client.minimapState == 0 || Client.minimapState == 3) { - if(!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4)) { + if(!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { SpriteMask var3 = var0.getSpriteMask(true); if(var3 == null) { return; diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 1d42429f3e..da7aa7b568 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -209,7 +209,7 @@ public class WorldMapSection0 implements WorldMapSection { signature = "(I)V", garbageValue = "-2102591569" ) - static void method247() { + static void savePreferences() { AccessFile var0 = null; try { @@ -261,7 +261,7 @@ public class WorldMapSection0 implements WorldMapSection { Client.__client_hh = false; int var7; - if(MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_currentButton == 4) { + if(MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { if(var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { var0.scrollY -= 4; class22.method295(var0); diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 6cab7970dc..5e531807a7 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -292,7 +292,7 @@ public class WorldMapSection1 implements WorldMapSection { class196.varcs.clearTransient(); Client.followerIndex = -1; if(Client.rootWidgetGroup != -1) { - AbstractByteArrayCopier.method4023(Client.rootWidgetGroup); + AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup); } for(WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) { diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 759a22446e..63347180aa 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -165,100 +165,100 @@ public class WorldMapSection2 implements WorldMapSection { signature = "(IILfe;Lfy;I)Z", garbageValue = "-2025028346" ) - static final boolean method593(int var0, int var1, class179 var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; + static final boolean method593(int srcX, int srcY, RouteStrategy strategy, CollisionMap collisionMap) { + int var4 = srcX; + int var5 = srcY; byte var6 = 64; byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class178.__fi_q[var6][var7] = 99; - class178.__fi_w[var6][var7] = 0; + int graphBaseX = srcX - var6; + int graphBaseY = srcY - var7; + class178.directions[var6][var7] = 99; + class178.distances[var6][var7] = 0; byte var10 = 0; int var11 = 0; - class178.__fi_l[var10] = var0; + class178.bufferX[var10] = srcX; byte var10001 = var10; int var18 = var10 + 1; - class178.__fi_e[var10001] = var1; - int[][] var12 = var3.flags; + class178.bufferY[var10001] = srcY; + int[][] var12 = collisionMap.flags; while(var18 != var11) { - var4 = class178.__fi_l[var11]; - var5 = class178.__fi_e[var11]; + var4 = class178.bufferX[var11]; + var5 = class178.bufferY[var11]; var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if(var2.vmethod3644(2, var4, var5, var3)) { + int var16 = var4 - graphBaseX; + int var17 = var5 - graphBaseY; + int var13 = var4 - collisionMap.xInset; + int var14 = var5 - collisionMap.yInset; + if(strategy.vmethod3644(2, var4, var5, collisionMap)) { WidgetGroupParent.__bx_o = var4; UrlRequester.__eo_u = var5; return true; } - int var15 = class178.__fi_w[var16][var17] + 1; - if(var16 > 0 && class178.__fi_q[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { - class178.__fi_l[var18] = var4 - 1; - class178.__fi_e[var18] = var5; + int var15 = class178.distances[var16][var17] + 1; + if(var16 > 0 && class178.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class178.bufferX[var18] = var4 - 1; + class178.bufferY[var18] = var5; var18 = var18 + 1 & 4095; - class178.__fi_q[var16 - 1][var17] = 2; - class178.__fi_w[var16 - 1][var17] = var15; + class178.directions[var16 - 1][var17] = 2; + class178.distances[var16 - 1][var17] = var15; } - if(var16 < 126 && class178.__fi_q[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { - class178.__fi_l[var18] = var4 + 1; - class178.__fi_e[var18] = var5; + if(var16 < 126 && class178.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class178.bufferX[var18] = var4 + 1; + class178.bufferY[var18] = var5; var18 = var18 + 1 & 4095; - class178.__fi_q[var16 + 1][var17] = 8; - class178.__fi_w[var16 + 1][var17] = var15; + class178.directions[var16 + 1][var17] = 8; + class178.distances[var16 + 1][var17] = var15; } - if(var17 > 0 && class178.__fi_q[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { - class178.__fi_l[var18] = var4; - class178.__fi_e[var18] = var5 - 1; + if(var17 > 0 && class178.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class178.bufferX[var18] = var4; + class178.bufferY[var18] = var5 - 1; var18 = var18 + 1 & 4095; - class178.__fi_q[var16][var17 - 1] = 1; - class178.__fi_w[var16][var17 - 1] = var15; + class178.directions[var16][var17 - 1] = 1; + class178.distances[var16][var17 - 1] = var15; } - if(var17 < 126 && class178.__fi_q[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { - class178.__fi_l[var18] = var4; - class178.__fi_e[var18] = var5 + 1; + if(var17 < 126 && class178.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class178.bufferX[var18] = var4; + class178.bufferY[var18] = var5 + 1; var18 = var18 + 1 & 4095; - class178.__fi_q[var16][var17 + 1] = 4; - class178.__fi_w[var16][var17 + 1] = var15; + class178.directions[var16][var17 + 1] = 4; + class178.distances[var16][var17 + 1] = var15; } - if(var16 > 0 && var17 > 0 && class178.__fi_q[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { - class178.__fi_l[var18] = var4 - 1; - class178.__fi_e[var18] = var5 - 1; + if(var16 > 0 && var17 > 0 && class178.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) { + class178.bufferX[var18] = var4 - 1; + class178.bufferY[var18] = var5 - 1; var18 = var18 + 1 & 4095; - class178.__fi_q[var16 - 1][var17 - 1] = 3; - class178.__fi_w[var16 - 1][var17 - 1] = var15; + class178.directions[var16 - 1][var17 - 1] = 3; + class178.distances[var16 - 1][var17 - 1] = var15; } - if(var16 < 126 && var17 > 0 && class178.__fi_q[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) { - class178.__fi_l[var18] = var4 + 1; - class178.__fi_e[var18] = var5 - 1; + if(var16 < 126 && var17 > 0 && class178.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) { + class178.bufferX[var18] = var4 + 1; + class178.bufferY[var18] = var5 - 1; var18 = var18 + 1 & 4095; - class178.__fi_q[var16 + 1][var17 - 1] = 9; - class178.__fi_w[var16 + 1][var17 - 1] = var15; + class178.directions[var16 + 1][var17 - 1] = 9; + class178.distances[var16 + 1][var17 - 1] = var15; } - if(var16 > 0 && var17 < 126 && class178.__fi_q[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) { - class178.__fi_l[var18] = var4 - 1; - class178.__fi_e[var18] = var5 + 1; + if(var16 > 0 && var17 < 126 && class178.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) { + class178.bufferX[var18] = var4 - 1; + class178.bufferY[var18] = var5 + 1; var18 = var18 + 1 & 4095; - class178.__fi_q[var16 - 1][var17 + 1] = 6; - class178.__fi_w[var16 - 1][var17 + 1] = var15; + class178.directions[var16 - 1][var17 + 1] = 6; + class178.distances[var16 - 1][var17 + 1] = var15; } - if(var16 < 126 && var17 < 126 && class178.__fi_q[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) { - class178.__fi_l[var18] = var4 + 1; - class178.__fi_e[var18] = var5 + 1; + if(var16 < 126 && var17 < 126 && class178.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) { + class178.bufferX[var18] = var4 + 1; + class178.bufferY[var18] = var5 + 1; var18 = var18 + 1 & 4095; - class178.__fi_q[var16 + 1][var17 + 1] = 12; - class178.__fi_w[var16 + 1][var17 + 1] = var15; + class178.directions[var16 + 1][var17 + 1] = 12; + class178.distances[var16 + 1][var17 + 1] = var15; } } @@ -280,7 +280,7 @@ public class WorldMapSection2 implements WorldMapSection { for(int var6 = 0; var6 < var2; ++var6) { Player var7 = Client.players[var3[var6]]; - if(var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.__equals_466(var5)) { + if(var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) { PacketBufferNode var8; if(var0 == 1) { var8 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher); diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 4c5e3bc70d..1a2ecc9c35 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -36,8 +36,8 @@ public enum WorldMapSectionType implements Enumerated { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__h_e") - static IndexedSprite __h_e; + @Export("logoSprite") + static IndexedSprite logoSprite; @ObfuscatedName("n") @Export("__h_n") static int[] __h_n; @@ -104,22 +104,22 @@ public enum WorldMapSectionType implements Enumerated { static int method253(int var0, Script var1, boolean var2) { Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; if(var0 == 1500) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.x; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x; return 1; } else if(var0 == 1501) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.y; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y; return 1; } else if(var0 == 1502) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.width; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width; return 1; } else if(var0 == 1503) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.height; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height; return 1; } else if(var0 == 1504) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.isHidden?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0; return 1; } else if(var0 == 1505) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.parentId; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 289c3ea18f..9a5afd50a3 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -81,18 +81,18 @@ final class class1 implements class0 { Widget var4; if(var0 >= 2000) { var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = Huffman.getWidget(var3); } else { var4 = var2?WorldMapIcon1.__t_i:class12.__n_n; } if(var0 == 1000) { - class179.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; + RouteStrategy.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; class22.method295(var4); TextureProvider.client.alignWidget(var4); if(var3 != -1 && var4.type == 0) { @@ -101,11 +101,11 @@ final class class1 implements class0 { return 1; } else if(var0 == 1001) { - class179.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; + RouteStrategy.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; class22.method295(var4); TextureProvider.client.alignWidget(var4); if(var3 != -1 && var4.type == 0) { @@ -114,7 +114,7 @@ final class class1 implements class0 { return 1; } else if(var0 == 1003) { - boolean var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(var5 != var4.isHidden) { var4.isHidden = var5; class22.method295(var4); @@ -122,10 +122,10 @@ final class class1 implements class0 { return 1; } else if(var0 == 1005) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 1006) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { return 2; @@ -140,16 +140,16 @@ final class class1 implements class0 { static int method16(int var0, Script var1, boolean var2) { int var3; if(var0 == 4200) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var3).name; return 1; } else { int var4; ItemDefinition var5; if(var0 == 4201) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var5 = Skills.getItemDefinition(var3); if(var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; @@ -159,9 +159,9 @@ final class class1 implements class0 { return 1; } else if(var0 == 4202) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var5 = Skills.getItemDefinition(var3); if(var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; @@ -171,64 +171,64 @@ final class class1 implements class0 { return 1; } else if(var0 == 4203) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price; return 1; } else if(var0 == 4204) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1?1:0; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1?1:0; return 1; } else { ItemDefinition var6; if(var0 == 4205) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if(var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.note; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; } else if(var0 == 4206) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if(var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.note; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; } else if(var0 == 4207) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly?1:0; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly?1:0; return 1; } else if(var0 == 4208) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if(var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.placeholder; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; } else if(var0 == 4209) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = Skills.getItemDefinition(var3); if(var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.placeholder; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3; } return 1; } else if(var0 == 4210) { String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; class50.method900(var7, var4 == 1); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WorldMapSection0.__y_sn; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.__y_sn; return 1; } else if(var0 != 4211) { if(var0 == 4212) { @@ -239,9 +239,9 @@ final class class1 implements class0 { } } else { if(AttackOption.__cj_sp != null && class231.__hb_sg < WorldMapSection0.__y_sn) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = AttackOption.__cj_sp[++class231.__hb_sg - 1] & '\uffff'; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.__cj_sp[++class231.__hb_sg - 1] & '\uffff'; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } return 1; diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index a8a3033982..48df6ff7e3 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -85,7 +85,7 @@ final class class11 implements Comparator { Widget var3; if(var0 >= 2000) { var0 -= 1000; - var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; } @@ -93,9 +93,9 @@ final class class11 implements Comparator { String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; int[] var5 = null; if(var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var6 > 0) { - for(var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]) { + for(var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) { ; } } @@ -110,11 +110,11 @@ final class class11 implements Comparator { if(var4.charAt(var7 - 1) == 's') { var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } } - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var7 != -1) { var8[0] = new Integer(var7); } else { @@ -196,30 +196,30 @@ final class class11 implements Comparator { static int method146(int var0, Script var1, boolean var2) { Widget var3; if(var0 == 2700) { - var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.itemId; + var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId; return 1; } else if(var0 == 2701) { - var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if(var3.itemId != -1) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.itemQuantity; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 2702) { - int var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var5); if(var4 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 2706) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.rootWidgetGroup; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup; return 1; } else { return 2; @@ -252,8 +252,8 @@ final class class11 implements Comparator { garbageValue = "-1292134247" ) static final void method148(int var0, int var1, int var2, int var3, int var4) { - class32.scrollBarSprites[0].__q_496(var0, var1); - class32.scrollBarSprites[1].__q_496(var0, var3 + var1 - 16); + class32.scrollBarSprites[0].drawAt(var0, var1); + class32.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.__client_hx); int var5 = var3 * (var3 - 32) / var4; if(var5 < 8) { diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 67e7d98362..4b67531628 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -18,8 +18,8 @@ public class class13 { @ObfuscatedGetter( intValue = -1810047523 ) - @Export("__i_af") - static int __i_af; + @Export("otpInt") + static int otpInt; @ObfuscatedName("f") @ObfuscatedSignature( diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java index 6ef8c64f1f..5bb42bfc02 100644 --- a/runescape-client/src/main/java/class15.java +++ b/runescape-client/src/main/java/class15.java @@ -121,9 +121,9 @@ public class class15 extends class21 { garbageValue = "2139921057" ) static int method182(int var0, Script var1, boolean var2) { - Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); if(var0 == 2800) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; } else if(var0 != 2801) { if(var0 == 2802) { @@ -138,7 +138,7 @@ public class class15 extends class21 { return 2; } } else { - int var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; --var4; if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index c9eeee21fa..7557082153 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -14,7 +14,7 @@ public class class16 { @ObfuscatedSignature( signature = "Lbp;" ) - static class72 field85; + static LoginScreenAnimation loginScreenRunesAnimation; @ObfuscatedName("dv") @ObfuscatedSignature( signature = "Lit;" @@ -62,7 +62,7 @@ public class class16 { static int method188(int var0, Script var1, boolean var2) { Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; if(var0 == 1800) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3)); return 1; } else if(var0 != 1801) { if(var0 == 1802) { @@ -77,7 +77,7 @@ public class class16 { return 2; } } else { - int var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; --var4; if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java index 6a3f422952..a5fe73d5bc 100644 --- a/runescape-client/src/main/java/class168.java +++ b/runescape-client/src/main/java/class168.java @@ -37,8 +37,8 @@ public class class168 { @ObfuscatedGetter( intValue = 1181569415 ) - @Export("__fs_au") - static int __fs_au; + @Export("optionButtonSpriteSubWidth") + static int optionButtonSpriteSubWidth; static { randomDat = null; diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index b05c100bf3..fb214f2738 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -331,10 +331,10 @@ public class class171 { if(class192.mapSceneSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.mapScenes; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var27 = null; } else { - var27 = WorldMapLabel.method444(); + var27 = WorldMapLabel.createIndexedSpriteArray(); } class192.mapSceneSprites = var27; @@ -346,10 +346,10 @@ public class class171 { if(class15.headIconPkSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.headIconsPk; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var37 = null; } else { - var37 = UserComparator9.method3344(); + var37 = UserComparator9.createSpriteArray(); } class15.headIconPkSprites = var37; @@ -360,10 +360,10 @@ public class class171 { if(ClientPreferences.headIconPrayerSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.headIconsPrayer; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var37 = null; } else { - var37 = UserComparator9.method3344(); + var37 = UserComparator9.createSpriteArray(); } ClientPreferences.headIconPrayerSprites = var37; @@ -374,10 +374,10 @@ public class class171 { if(Player.headIconHintSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.headIconsHint; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var37 = null; } else { - var37 = UserComparator9.method3344(); + var37 = UserComparator9.createSpriteArray(); } Player.headIconHintSprites = var37; @@ -388,10 +388,10 @@ public class class171 { if(class16.mapMarkerSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.mapMarkers; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var37 = null; } else { - var37 = UserComparator9.method3344(); + var37 = UserComparator9.createSpriteArray(); } class16.mapMarkerSprites = var37; @@ -402,10 +402,10 @@ public class class171 { if(KeyHandler.crossSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.crosses; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var37 = null; } else { - var37 = UserComparator9.method3344(); + var37 = UserComparator9.createSpriteArray(); } KeyHandler.crossSprites = var37; @@ -416,10 +416,10 @@ public class class171 { if(class39.mapDotSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.mapDots; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var37 = null; } else { - var37 = UserComparator9.method3344(); + var37 = UserComparator9.createSpriteArray(); } class39.mapDotSprites = var37; @@ -430,10 +430,10 @@ public class class171 { if(class32.scrollBarSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.scrollBars; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var27 = null; } else { - var27 = WorldMapLabel.method444(); + var27 = WorldMapLabel.createIndexedSpriteArray(); } class32.scrollBarSprites = var27; @@ -444,10 +444,10 @@ public class class171 { if(WorldMapSectionType.modIconSprites == null) { var2 = WorldMapSection3.indexCache8; var28 = class211.spriteIds.modIcons; - if(!SpriteMask.method4392(var2, var28, 0)) { + if(!SpriteMask.loadSprite(var2, var28, 0)) { var27 = null; } else { - var27 = WorldMapLabel.method444(); + var27 = WorldMapLabel.createIndexedSpriteArray(); } WorldMapSectionType.modIconSprites = var27; diff --git a/runescape-client/src/main/java/class178.java b/runescape-client/src/main/java/class178.java index 39a0c68d25..1079c412b8 100644 --- a/runescape-client/src/main/java/class178.java +++ b/runescape-client/src/main/java/class178.java @@ -4,22 +4,22 @@ import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("fi") public class class178 { @ObfuscatedName("q") - @Export("__fi_q") - static int[][] __fi_q; + @Export("directions") + static int[][] directions; @ObfuscatedName("w") - @Export("__fi_w") - static int[][] __fi_w; + @Export("distances") + static int[][] distances; @ObfuscatedName("l") - @Export("__fi_l") - static int[] __fi_l; + @Export("bufferX") + static int[] bufferX; @ObfuscatedName("e") - @Export("__fi_e") - static int[] __fi_e; + @Export("bufferY") + static int[] bufferY; static { - __fi_q = new int[128][128]; - __fi_w = new int[128][128]; - __fi_l = new int[4096]; - __fi_e = new int[4096]; + directions = new int[128][128]; + distances = new int[128][128]; + bufferX = new int[4096]; + bufferY = new int[4096]; } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 9b9c0e10ea..7c697769f4 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -66,52 +66,52 @@ final class class2 implements class0 { Login.loginIndex = var3; Rasterizer2D.Rasterizer2D_clear(); byte[] var4 = var0.takeRecordByNames("title.jpg", ""); - Login.__cu_g = class27.method438(var4); - Fonts.__kz_l = Login.__cu_g.copy(); - if((Client.worldProperties & 536870912) != 0) { - WorldMapSectionType.__h_e = MenuAction.method2025(var1, "logo_deadman_mode", ""); + Login.leftTitleSprite = class27.convertJpgToSprite(var4); + Fonts.rightTitleSprite = Login.leftTitleSprite.copy(); + if((Client.worldProperties & 0x20000000) != 0) { + WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo_deadman_mode", ""); } else { - WorldMapSectionType.__h_e = MenuAction.method2025(var1, "logo", ""); + WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo", ""); } - Login.__cu_o = MenuAction.method2025(var1, "titlebox", ""); - IndexCacheLoader.__bd_u = MenuAction.method2025(var1, "titlebutton", ""); + Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", ""); + IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", ""); int var6 = var1.getArchiveId("runes"); int var7 = var1.getRecordId(var6, ""); IndexedSprite[] var8; - if(!SpriteMask.method4392(var1, var6, var7)) { + if(!SpriteMask.loadSprite(var1, var6, var7)) { var8 = null; } else { - var8 = WorldMapLabel.method444(); + var8 = WorldMapLabel.createIndexedSpriteArray(); } - WorldMapEvent.__ap_w = var8; + WorldMapEvent.runesSprite = var8; var7 = var1.getArchiveId("title_mute"); int var10 = var1.getRecordId(var7, ""); IndexedSprite[] var9; - if(!SpriteMask.method4392(var1, var7, var10)) { + if(!SpriteMask.loadSprite(var1, var7, var10)) { var9 = null; } else { - var9 = WorldMapLabel.method444(); + var9 = WorldMapLabel.createIndexedSpriteArray(); } - KeyHandler.__an_x = var9; - Login.__cu_d = MenuAction.method2025(var1, "options_radio_buttons,0", ""); - GraphicsObject.__bw_k = MenuAction.method2025(var1, "options_radio_buttons,4", ""); - class308.__kw_n = MenuAction.method2025(var1, "options_radio_buttons,2", ""); - KeyHandler.__an_i = MenuAction.method2025(var1, "options_radio_buttons,6", ""); - class168.__fs_au = Login.__cu_d.subWidth; - GroundItemPile.__dr_ao = Login.__cu_d.subHeight; - class16.field85 = new class72(WorldMapEvent.__ap_w); + KeyHandler.title_muteSprite = var9; + Login.options_buttons_0Sprite = MenuAction.loadIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + GraphicsObject.options_buttons_4Sprite = MenuAction.loadIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + class308.options_buttons_2Sprite = MenuAction.loadIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + KeyHandler.options_buttons_6Sprite = MenuAction.loadIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class168.optionButtonSpriteSubWidth = Login.options_buttons_0Sprite.subWidth; + GroundItemPile.optionButtonSpriteSubHeight = Login.options_buttons_0Sprite.subHeight; + class16.loginScreenRunesAnimation = new LoginScreenAnimation(WorldMapEvent.runesSprite); if(var2) { Login.Login_username = ""; Login.Login_password = ""; } - class13.__i_af = 0; + class13.otpInt = 0; Login.otp = ""; Login.__cu_ba = true; - Login.__cu_bk = false; + Login.worldSelectOpen = false; if(!ReflectionCheck.clientPreferences.titleMusicDisabled) { Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false); } else { @@ -120,12 +120,12 @@ final class class2 implements class0 { UserComparator9.method3343(false); Login.__cu_f = true; - Login.__cu_q = (SoundCache.canvasWidth - 765) / 2; - Login.__cu_y = Login.__cu_q + 202; - Varps.__hv_h = Login.__cu_y + 180; - Login.__cu_g.drawAt(Login.__cu_q, 0); - Fonts.__kz_l.drawAt(Login.__cu_q + 382, 0); - WorldMapSectionType.__h_e.__q_496(Login.__cu_q + 382 - WorldMapSectionType.__h_e.subWidth / 2, 18); + Login.xPadding = (SoundCache.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Varps.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18); } } @@ -138,10 +138,10 @@ final class class2 implements class0 { int var3 = var0.getArchiveId(var1); int var4 = var0.getRecordId(var3, var2); Sprite[] var5; - if(!SpriteMask.method4392(var0, var3, var4)) { + if(!SpriteMask.loadSprite(var0, var3, var4)) { var5 = null; } else { - var5 = UserComparator9.method3344(); + var5 = UserComparator9.createSpriteArray(); } return var5; diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java index 14dd76547b..8840cdf5b5 100644 --- a/runescape-client/src/main/java/class211.java +++ b/runescape-client/src/main/java/class211.java @@ -49,7 +49,7 @@ public class class211 { int var4; if(var0 == 4100) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; return 1; } else { @@ -62,7 +62,7 @@ public class class211 { return 1; } else if(var0 == 4102) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.method4001(var4, true); return 1; } else if(var0 == 4103) { @@ -73,7 +73,7 @@ public class class211 { int var6; int var10; if(var0 == 4104) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; long var11 = ((long)var10 + 11745L) * 86400000L; Interpreter.Interpreter_calendar.setTime(new Date(var11)); var6 = Interpreter.Interpreter_calendar.get(5); @@ -83,12 +83,12 @@ public class class211 { return 1; } else if(var0 != 4105) { if(var0 == 4106) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); return 1; } else if(var0 == 4107) { Interpreter.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = WallDecoration.method3256(AttackOption.method2033(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Client.language)); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WallDecoration.method3256(AttackOption.method2033(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Client.language)); return 1; } else { int var5; @@ -96,27 +96,27 @@ public class class211 { Font var14; if(var0 == 4108) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class179.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0); var14 = new Font(var13); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); return 1; } else if(var0 == 4109) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class179.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0); var14 = new Font(var13); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); return 1; } else if(var0 == 4110) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1) { + if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; } else { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; @@ -129,39 +129,39 @@ public class class211 { return 1; } else if(var0 == 4112) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4; return 1; } else if(var0 == 4113) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var10)?1:0; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var10)?1:0; return 1; } else if(var0 == 4114) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = VarcInt.method4807((char)var10)?1:0; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var10)?1:0; return 1; } else if(var0 == 4115) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var10)?1:0; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var10)?1:0; return 1; } else if(var0 == 4116) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class159.method3394((char)var10)?1:0; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var10)?1:0; return 1; } else if(var0 == 4117) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; if(var3 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.length(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.length(); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } return 1; } else if(var0 == 4118) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class179.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); return 1; } else if(var0 == 4119) { @@ -184,15 +184,15 @@ public class class211 { return 1; } else if(var0 == 4120) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.indexOf(var4); + var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var4); return 1; } else if(var0 == 4121) { Interpreter.Interpreter_stringStackSize -= 2; var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); return 1; } else if(var0 == 4122) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java index c7b24610fd..a3db606284 100644 --- a/runescape-client/src/main/java/class229.java +++ b/runescape-client/src/main/java/class229.java @@ -38,51 +38,51 @@ public class class229 { ) static int method4513(int var0, Script var1, boolean var2) { if(var0 == 6200) { - class179.Interpreter_intStackSize -= 2; - Client.__client_rw = (short)class161.method3395(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]); + RouteStrategy.Interpreter_intStackSize -= 2; + Client.__client_rw = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]); if(Client.__client_rw <= 0) { Client.__client_rw = 256; } - Client.__client_rm = (short)class161.method3395(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + Client.__client_rm = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); if(Client.__client_rm <= 0) { Client.__client_rm = 256; } return 1; } else if(var0 == 6201) { - class179.Interpreter_intStackSize -= 2; - Client.__client_re = (short)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; + RouteStrategy.Interpreter_intStackSize -= 2; + Client.__client_re = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if(Client.__client_re <= 0) { Client.__client_re = 256; } - Client.__client_rb = (short)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + Client.__client_rb = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if(Client.__client_rb <= 0) { Client.__client_rb = 320; } return 1; } else if(var0 == 6202) { - class179.Interpreter_intStackSize -= 4; - Client.__client_rv = (short)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; + RouteStrategy.Interpreter_intStackSize -= 4; + Client.__client_rv = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; if(Client.__client_rv <= 0) { Client.__client_rv = 1; } - Client.__client_ri = (short)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + Client.__client_ri = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; if(Client.__client_ri <= 0) { Client.__client_ri = 32767; } else if(Client.__client_ri < Client.__client_rv) { Client.__client_ri = Client.__client_rv; } - Client.__client_rs = (short)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; + Client.__client_rs = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; if(Client.__client_rs <= 0) { Client.__client_rs = 1; } - Client.__client_rp = (short)Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3]; + Client.__client_rp = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3]; if(Client.__client_rp <= 0) { Client.__client_rp = 32767; } else if(Client.__client_rp < Client.__client_rs) { @@ -93,21 +93,21 @@ public class class229 { } else if(var0 == 6203) { if(Client.viewportWidget != null) { FontName.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.viewportHeight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportHeight; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } return 1; } else if(var0 == 6204) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_re; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_rb; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_re; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_rb; return 1; } else if(var0 == 6205) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rw); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rm); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rw); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rm); return 1; } else { return 2; diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java index 1c72b1dcbf..aa5ea9e654 100644 --- a/runescape-client/src/main/java/class238.java +++ b/runescape-client/src/main/java/class238.java @@ -268,12 +268,12 @@ public final class class238 { } boolean var34 = false; - if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_currentButton == 4) && var33) { + if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { var34 = true; } var21 = false; - if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { + if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { var21 = true; } diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java index 272be7ca32..4e6b7a3c66 100644 --- a/runescape-client/src/main/java/class248.java +++ b/runescape-client/src/main/java/class248.java @@ -193,71 +193,71 @@ public class class248 { static int method4741(int var0, Script var1, boolean var2) { int var3; if(var0 == 3903) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); return 1; } else if(var0 == 3904) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; return 1; } else if(var0 == 3905) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; return 1; } else if(var0 == 3906) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; return 1; } else if(var0 == 3907) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; return 1; } else if(var0 == 3908) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; return 1; } else { int var12; if(var0 == 3910) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 0?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 0?1:0; return 1; } else if(var0 == 3911) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 2?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 2?1:0; return 1; } else if(var0 == 3912) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 5?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 5?1:0; return 1; } else if(var0 == 3913) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var12 == 1?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 1?1:0; return 1; } else { boolean var13; if(var0 == 3914) { - var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_w, var13); } return 1; } else if(var0 == 3915) { - var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_q, var13); } return 1; } else if(var0 == 3916) { - class179.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1; + RouteStrategy.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; if(FloorDecoration.grandExchangeEvents != null) { Client.__client_sj.__m = var4; FloorDecoration.grandExchangeEvents.sort(Client.__client_sj, var13); @@ -265,41 +265,41 @@ public class class248 { return 1; } else if(var0 == 3917) { - var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_f, var13); } return 1; } else if(var0 == 3918) { - var13 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(FloorDecoration.grandExchangeEvents != null) { FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_o, var13); } return 1; } else if(var0 == 3919) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null?0:FloorDecoration.grandExchangeEvents.events.size(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null?0:FloorDecoration.grandExchangeEvents.events.size(); return 1; } else { GrandExchangeEvent var11; if(var0 == 3920) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.world; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.world; return 1; } else if(var0 == 3921) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__m_3(); return 1; } else if(var0 == 3922) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__f_4(); return 1; } else if(var0 == 3923) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); long var5 = class203.currentTimeMs() - class15.__z_si - var11.__f; int var7 = (int)(var5 / 3600000L); @@ -309,19 +309,19 @@ public class class248 { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; return 1; } else if(var0 == 3924) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; return 1; } else if(var0 == 3925) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; return 1; } else if(var0 == 3926) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; return 1; } else { return 2; diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java index 7acd856783..b752bea56b 100644 --- a/runescape-client/src/main/java/class27.java +++ b/runescape-client/src/main/java/class27.java @@ -49,7 +49,7 @@ public final class class27 { signature = "([BI)Lln;", garbageValue = "-143338910" ) - public static final Sprite method438(byte[] var0) { + public static final Sprite convertJpgToSprite(byte[] var0) { BufferedImage var1 = null; try { diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 826ab81db7..65dabeb01f 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -35,7 +35,7 @@ public class class3 implements Enumerated { @ObfuscatedGetter( intValue = -393250053 ) - public final int field17; + public final int id; @ObfuscatedName("u") public final Class field18; @ObfuscatedName("g") @@ -55,7 +55,7 @@ public class class3 implements Enumerated { ) class3(int var1, int var2, Class var3, class0 var4) { this.field13 = var1; - this.field17 = var2; + this.id = var2; this.field18 = var3; this.field19 = var4; } @@ -66,7 +66,7 @@ public class class3 implements Enumerated { garbageValue = "83" ) public int rsOrdinal() { - return this.field17; + return this.id; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index a6511f8f8c..04ce1a6141 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -34,8 +34,8 @@ public class class30 { @ObfuscatedSignature( signature = "[Lln;" ) - @Export("__ar_bd") - static Sprite[] __ar_bd; + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; @ObfuscatedName("q") @ObfuscatedGetter( intValue = -1474464623 diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java index bd4b8675ff..61d093b669 100644 --- a/runescape-client/src/main/java/class308.java +++ b/runescape-client/src/main/java/class308.java @@ -8,8 +8,8 @@ public final class class308 { @ObfuscatedSignature( signature = "Llq;" ) - @Export("__kw_n") - static IndexedSprite __kw_n; + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; @ObfuscatedName("gn") @Export("regions") static int[] regions; diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index 58fb9b20d4..ac2e2a8f2f 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -37,11 +37,11 @@ public class class31 { ) @Export("changeWorld") static void changeWorld(World var0) { - if(var0.__e_144() != Client.isMembersWorld) { - Client.isMembersWorld = var0.__e_144(); - boolean var1 = var0.__e_144(); + if(var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + boolean var1 = var0.isMembersOnly(); if(var1 != class30.inMembersWorld) { - class72.method1780(); + LoginScreenAnimation.method1780(); class30.inMembersWorld = var1; } } @@ -61,25 +61,25 @@ public class class31 { ) static int method573(int var0, Script var1, boolean var2) { if(var0 == 6500) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds()?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds()?1:0; return 1; } else { World var3; if(var0 == 6501) { var3 = class190.method3672(); if(var3 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.population; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } @@ -87,18 +87,18 @@ public class class31 { } else if(var0 == 6502) { var3 = Fonts.method5647(); if(var3 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.population; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } @@ -108,7 +108,7 @@ public class class31 { int var5; int var7; if(var0 == 6506) { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var4 = null; for(var5 = 0; var5 < World.worldsCount; ++var5) { @@ -119,90 +119,90 @@ public class class31 { } if(var4 != null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.population; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } return 1; } else if(var0 == 6507) { - class179.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 3] == 1; + RouteStrategy.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1; WorldMapSectionType.method248(var7, var10, var5, var6); return 1; } else if(var0 != 6511) { if(var0 == 6512) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else { int var8; ParamKeyDefinition var9; if(var0 == 6513) { - class179.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var9 = class229.getParamKeyDefinition(var8); if(var9.isString()) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getStringParam(var8, var9.keyString); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt); } return 1; } else if(var0 == 6514) { - class179.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var9 = class229.getParamKeyDefinition(var8); if(var9.isString()) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var7).getStringParam(var8, var9.keyString); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt); } return 1; } else if(var0 == 6515) { - class179.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var9 = class229.getParamKeyDefinition(var8); if(var9.isString()) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var7).getStringParam(var8, var9.keyString); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt); } return 1; } else if(var0 == 6516) { - class179.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var9 = class229.getParamKeyDefinition(var8); if(var9.isString()) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var7).getStringParam(var8, var9.keyString); } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt); } return 1; } else if(var0 == 6518) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.__client_bl?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_bl?1:0; return 1; } else if(var0 == 6519) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.clientType & 3; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3; return 1; } else if(var0 == 6520) { return 1; @@ -210,41 +210,41 @@ public class class31 { return 1; } else if(var0 == 6522) { --Interpreter.Interpreter_stringStackSize; - --class179.Interpreter_intStackSize; + --RouteStrategy.Interpreter_intStackSize; return 1; } else if(var0 == 6523) { --Interpreter.Interpreter_stringStackSize; - --class179.Interpreter_intStackSize; + --RouteStrategy.Interpreter_intStackSize; return 1; } else if(var0 == 6524) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; return 1; } else if(var0 == 6525) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; } else if(var0 == 6526) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1; return 1; } else { return 2; } } } else { - var7 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; if(var7 >= 0 && var7 < World.worldsCount) { var4 = ItemContainer.worlds[var7]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.population; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index d43fd91322..a5b80e69af 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -23,7 +23,7 @@ public class class32 { Widget var3; if(var0 >= 2000) { var0 -= 1000; - var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); } else { var3 = var2?WorldMapIcon1.__t_i:class12.__n_n; } @@ -32,7 +32,7 @@ public class class32 { if(var0 != 1200 && var0 != 1205 && var0 != 1212) { if(var0 == 1201) { var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; } else if(var0 == 1202) { var3.modelType = 3; @@ -42,9 +42,9 @@ public class class32 { return 2; } } else { - class179.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; var3.itemId = var4; var3.itemQuantity = var5; ItemDefinition var6 = Skills.getItemDefinition(var4); diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index 7b7f01256e..b73ed654bb 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -22,6 +22,6 @@ public class class322 { ) @Export("readSprite") public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) { - return !SpriteMask.method4392(var0, var1, var2)?null:class258.method4900(); + return !SpriteMask.loadSprite(var0, var1, var2)?null:class258.method4900(); } } diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index d9e1f40ec8..98926a8e6f 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -278,8 +278,8 @@ public class class39 extends class21 { if(Client.viewportTempX > -1) { var21 = var2 + Client.viewportTempX - (var15 >> 1); var22 = var3 + Client.viewportTempY - var87; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 16711680); + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00); + Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000); } var87 += 2; @@ -367,7 +367,7 @@ public class class39 extends class21 { continue; } - var95 = class72.getHitSplatDefinition(var0.hitSplatTypes[var80]); + var95 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var80]); var98 = var95.__i; if(var95 != null && var95.transforms != null) { var95 = var95.transform(); @@ -383,7 +383,7 @@ public class class39 extends class21 { var15 = var0.hitSplatTypes2[var80]; HitSplatDefinition var81 = null; if(var15 >= 0) { - var81 = class72.getHitSplatDefinition(var15); + var81 = LoginScreenAnimation.getHitSplatDefinition(var15); if(var81 != null && var81.transforms != null) { var81 = var81.transform(); } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index a52dce6aa4..325b6bbf36 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -68,8 +68,8 @@ final class class4 implements class0 { WorldMapIcon1.method219(0, "", var3); return 1; } else if(var0 == 3101) { - class179.Interpreter_intStackSize -= 2; - class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 2; + class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); return 1; } else if(var0 == 3103) { if(!Interpreter.__bv_t) { @@ -110,48 +110,48 @@ final class class4 implements class0 { String var7; int var15; if(var0 == 3107) { - var15 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; WorldMapSection2.method583(var15, var7); return 1; } else if(var0 == 3108) { - class179.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 2]; + RouteStrategy.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]; Widget var13 = Huffman.getWidget(var9); Players.clickWidget(var13, var15, var10); return 1; } else if(var0 == 3109) { - class179.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; Widget var11 = var2?WorldMapIcon1.__t_i:class12.__n_n; Players.clickWidget(var11, var15, var10); return 1; } else if(var0 == 3110) { - AbstractRasterProvider.__lp_ca = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 3111) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0; return 1; } else if(var0 == 3112) { - ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; - WorldMapSection0.method247(); + ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; + WorldMapSection0.savePreferences(); return 1; } else if(var0 == 3113) { var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; WorldMapCacheName.method635(var3, var4, false); return 1; } else if(var0 == 3115) { - var15 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var14 = Interpreter.method1915(ClientPacket.__gs_as, Client.packetWriter.isaacCipher); var14.packetBuffer.writeShort(var15); Client.packetWriter.__q_167(var14); return 1; } else if(var0 == 3116) { - var15 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; Interpreter.Interpreter_stringStackSize -= 2; var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; @@ -169,16 +169,16 @@ final class class4 implements class0 { return 1; } } else if(var0 == 3117) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 3118) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 3119) { - Client.renderSelf = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 3120) { - if(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1) { + if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { Client.__client_ke |= 1; } else { Client.__client_ke &= -2; @@ -186,7 +186,7 @@ final class class4 implements class0 { return 1; } else if(var0 == 3121) { - if(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1) { + if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { Client.__client_ke |= 2; } else { Client.__client_ke &= -3; @@ -194,7 +194,7 @@ final class class4 implements class0 { return 1; } else if(var0 == 3122) { - if(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1) { + if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { Client.__client_ke |= 4; } else { Client.__client_ke &= -5; @@ -202,7 +202,7 @@ final class class4 implements class0 { return 1; } else if(var0 == 3123) { - if(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1) { + if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) { Client.__client_ke |= 8; } else { Client.__client_ke &= -9; @@ -213,47 +213,47 @@ final class class4 implements class0 { Client.__client_ke = 0; return 1; } else if(var0 == 3125) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 3126) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; return 1; } else if(var0 == 3127) { - WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1); + WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1); return 1; } else if(var0 == 3128) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class206.method4028()?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028()?1:0; return 1; } else if(var0 == 3129) { - class179.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - Client.__client_in = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]; + RouteStrategy.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + Client.__client_in = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]; return 1; } else if(var0 == 3130) { - class179.Interpreter_intStackSize -= 2; + RouteStrategy.Interpreter_intStackSize -= 2; return 1; } else if(var0 == 3131) { - --class179.Interpreter_intStackSize; + --RouteStrategy.Interpreter_intStackSize; return 1; } else if(var0 == 3132) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = SoundCache.canvasWidth; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Huffman.canvasHeight; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight; return 1; } else if(var0 == 3133) { - --class179.Interpreter_intStackSize; + --RouteStrategy.Interpreter_intStackSize; return 1; } else if(var0 == 3134) { return 1; } else if(var0 == 3135) { - class179.Interpreter_intStackSize -= 2; + RouteStrategy.Interpreter_intStackSize -= 2; return 1; } else if(var0 == 3136) { Client.__client_mf = 3; - Client.__client_ms = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; } else if(var0 == 3137) { Client.__client_mf = 2; - Client.__client_ms = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; return 1; } else if(var0 == 3138) { Client.__client_mf = 0; @@ -268,57 +268,57 @@ final class class4 implements class0 { } else { boolean var8; if(var0 == 3141) { - var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; ReflectionCheck.clientPreferences.hideUsername = var8; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); return 1; } else if(var0 == 3142) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0; return 1; } else if(var0 == 3143) { - var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; Client.Login_isUsernameRemembered = var8; if(!var8) { ReflectionCheck.clientPreferences.rememberedUsername = ""; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); } return 1; } else if(var0 == 3144) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered?1:0; return 1; } else if(var0 == 3145) { return 1; } else if(var0 == 3146) { - var8 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; if(var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) { ReflectionCheck.clientPreferences.titleMusicDisabled = !var8; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); } return 1; } else if(var0 == 3147) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled?0:1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled?0:1; return 1; } else if(var0 == 3148) { return 1; } else if(var0 == 3149) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else if(var0 == 3150) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else if(var0 == 3151) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else if(var0 == 3152) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else if(var0 == 3153) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; return 1; } else if(var0 == 3154) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101(); return 1; } else { return 2; diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java index 3f50d0a947..7f70234cea 100644 --- a/runescape-client/src/main/java/class54.java +++ b/runescape-client/src/main/java/class54.java @@ -39,96 +39,96 @@ public final class class54 { static void method1092(GameShell var0) { int var3; int var15; - if(Login.__cu_bk) { + if(Login.worldSelectOpen) { while(true) { if(!Decimator.method2490()) { - if(MouseHandler.MouseHandler_lastButton != 1 && (AbstractRasterProvider.__lp_ca || MouseHandler.MouseHandler_lastButton != 4)) { + if(MouseHandler.MouseHandler_lastButton != 1 && (AbstractRasterProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) { break; } - int var1 = Login.__cu_q + 280; + int var1 = Login.xPadding + 280; if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(0, 0); + Interpreter.changeWorldSelectSorting(0, 0); break; } if(MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(0, 1); + Interpreter.changeWorldSelectSorting(0, 1); break; } - int var2 = Login.__cu_q + 390; + int var2 = Login.xPadding + 390; if(MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(1, 0); + Interpreter.changeWorldSelectSorting(1, 0); break; } if(MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(1, 1); + Interpreter.changeWorldSelectSorting(1, 1); break; } - var3 = Login.__cu_q + 500; + var3 = Login.xPadding + 500; if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(2, 0); + Interpreter.changeWorldSelectSorting(2, 0); break; } if(MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(2, 1); + Interpreter.changeWorldSelectSorting(2, 1); break; } - var15 = Login.__cu_q + 610; + var15 = Login.xPadding + 610; if(MouseHandler.MouseHandler_lastPressedX >= var15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(3, 0); + Interpreter.changeWorldSelectSorting(3, 0); break; } if(MouseHandler.MouseHandler_lastPressedX >= var15 + 15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Interpreter.method1975(3, 1); + Interpreter.changeWorldSelectSorting(3, 1); break; } - if(MouseHandler.MouseHandler_lastPressedX >= Login.__cu_q + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.__cu_q + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - FontName.method5636(); + if(MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { + FontName.closeWorldSelect(); break; } - if(Login.__cu_bl != -1) { - World var13 = ItemContainer.worlds[Login.__cu_bl]; + if(Login.hoveredWorldIndex != -1) { + World var13 = ItemContainer.worlds[Login.hoveredWorldIndex]; class31.changeWorld(var13); - FontName.method5636(); + FontName.closeWorldSelect(); } else { - if(Login.__cu_br > 0 && SecureRandomFuture.__cn_bu != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.__cn_bu.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) { - --Login.__cu_br; + if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) { + --Login.worldSelectPage; } - if(Login.__cu_br < Login.__cu_bj && NetSocket.__fb_bm != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.__fb_bm.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) { - ++Login.__cu_br; + if(Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; } } break; } if(IndexStoreAction.__ik_cn == 13) { - FontName.method5636(); + FontName.closeWorldSelect(); break; } if(IndexStoreAction.__ik_cn == 96) { - if(Login.__cu_br > 0 && SecureRandomFuture.__cn_bu != null) { - --Login.__cu_br; + if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) { + --Login.worldSelectPage; } - } else if(IndexStoreAction.__ik_cn == 97 && Login.__cu_br < Login.__cu_bj && NetSocket.__fb_bm != null) { - ++Login.__cu_br; + } else if(IndexStoreAction.__ik_cn == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) { + ++Login.worldSelectPage; } } } else { - if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.__cu_q + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); if(!ReflectionCheck.clientPreferences.titleMusicDisabled) { class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false); } else { @@ -153,16 +153,16 @@ public final class class54 { if(Client.gameState == 10 || Client.gameState == 11) { if(Client.language == 0) { - if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.__lp_ca && MouseHandler.MouseHandler_lastButton == 4) { - var3 = Login.__cu_q + 5; + if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var3 = Login.xPadding + 5; short var4 = 463; byte var5 = 100; byte var6 = 35; if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) { if(ClientParameter.loadWorlds()) { - Login.__cu_bk = true; - Login.__cu_br = 0; - Login.__cu_bj = 0; + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; } return; @@ -170,9 +170,9 @@ public final class class54 { } if(FriendLoginUpdate.__kn_x != null && ClientParameter.loadWorlds()) { - Login.__cu_bk = true; - Login.__cu_br = 0; - Login.__cu_bj = 0; + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; } } @@ -184,7 +184,7 @@ public final class class54 { var16 = MouseHandler.MouseHandler_y; } - if(!AbstractRasterProvider.__lp_ca && var3 == 4) { + if(!AbstractRasterProvider.mouseCam && var3 == 4) { var3 = 1; } @@ -199,15 +199,15 @@ public final class class54 { } } - var7 = Varps.__hv_h - 80; + var7 = Varps.loginBoxCenter - 80; var8 = 291; if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); } - var7 = Varps.__hv_h + 80; + var7 = Varps.loginBoxCenter + 80; if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20 || var17) { - if((Client.worldProperties & 33554432) != 0) { + if((Client.worldProperties & 0x2000000) != 0) { Login.Login_response0 = ""; Login.Login_response1 = "This is a Beta world."; Login.Login_response2 = "Your normal account will not be affected."; @@ -274,7 +274,7 @@ public final class class54 { } } - var7 = Varps.__hv_h - 80; + var7 = Varps.loginBoxCenter - 80; var8 = 321; if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { Login.Login_username = Login.Login_username.trim(); @@ -294,30 +294,30 @@ public final class class54 { return; } - var7 = Login.__cu_y + 180 + 80; + var7 = Login.loginBoxX + 180 + 80; if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; - class13.__i_af = 0; + class13.otpInt = 0; Login.otp = ""; Login.__cu_ba = true; } - var7 = Varps.__hv_h + -117; + var7 = Varps.loginBoxCenter + -117; var8 = 277; - Login.__cu_aa = var15 >= var7 && var15 < var7 + class168.__fs_au && var16 >= var8 && var16 < var8 + GroundItemPile.__dr_ao; + Login.__cu_aa = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight; if(var3 == 1 && Login.__cu_aa) { Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; if(!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) { ReflectionCheck.clientPreferences.rememberedUsername = null; - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); } } - var7 = Varps.__hv_h + 24; + var7 = Varps.loginBoxCenter + 24; var8 = 277; - Login.__cu_ax = var15 >= var7 && var15 < var7 + class168.__fs_au && var16 >= var8 && var16 < var8 + GroundItemPile.__dr_ao; + Login.__cu_ax = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight; if(var3 == 1 && Login.__cu_ax) { ReflectionCheck.clientPreferences.hideUsername = !ReflectionCheck.clientPreferences.hideUsername; if(!ReflectionCheck.clientPreferences.hideUsername) { @@ -326,7 +326,7 @@ public final class class54 { class196.method3740(); } - WorldMapSection0.method247(); + WorldMapSection0.savePreferences(); } while(true) { @@ -344,7 +344,7 @@ public final class class54 { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; - class13.__i_af = 0; + class13.otpInt = 0; Login.otp = ""; Login.__cu_ba = true; } else if(Login.currentLoginField == 0) { @@ -395,13 +395,13 @@ public final class class54 { return; } } else if(Login.loginIndex == 3) { - var18 = Login.__cu_y + 180; + var18 = Login.loginBoxX + 180; var20 = 276; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { MouseHandler.method1084(false); } - var18 = Login.__cu_y + 180; + var18 = Login.loginBoxX + 180; var20 = 326; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); @@ -411,7 +411,7 @@ public final class class54 { } else { int var22; if(Login.loginIndex == 4) { - var18 = Login.__cu_y + 180 - 80; + var18 = Login.loginBoxX + 180 - 80; var20 = 321; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { Login.otp.trim(); @@ -420,7 +420,7 @@ public final class class54 { return; } - class13.__i_af = Integer.parseInt(Login.otp); + class13.otpInt = Integer.parseInt(Login.otp); Login.otp = ""; class15.method184(true); method1089("", "Connecting to server...", ""); @@ -428,20 +428,20 @@ public final class class54 { return; } - if(var3 == 1 && var15 >= Login.__cu_y + 180 - 9 && var15 <= Login.__cu_y + 180 + 130 && var16 >= 263 && var16 <= 296) { + if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 9 && var15 <= Login.loginBoxX + 180 + 130 && var16 >= 263 && var16 <= 296) { Login.__cu_ba = !Login.__cu_ba; } - if(var3 == 1 && var15 >= Login.__cu_y + 180 - 34 && var15 <= Login.__cu_y + 34 + 180 && var16 >= 351 && var16 <= 363) { + if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 34 && var15 <= Login.loginBoxX + 34 + 180 && var16 >= 351 && var16 <= 363) { WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); } - var18 = Login.__cu_y + 180 + 80; + var18 = Login.loginBoxX + 180 + 80; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; - class13.__i_af = 0; + class13.otpInt = 0; Login.otp = ""; } @@ -459,7 +459,7 @@ public final class class54 { Login.loginIndex = 0; Login.Login_username = ""; Login.Login_password = ""; - class13.__i_af = 0; + class13.otpInt = 0; Login.otp = ""; } else { if(IndexStoreAction.__ik_cn == 85 && Login.otp.length() > 0) { @@ -473,7 +473,7 @@ public final class class54 { return; } - class13.__i_af = Integer.parseInt(Login.otp); + class13.otpInt = Integer.parseInt(Login.otp); Login.otp = ""; class15.method184(true); method1089("", "Connecting to server...", ""); @@ -487,14 +487,14 @@ public final class class54 { } } } else if(Login.loginIndex == 5) { - var18 = Login.__cu_y + 180 - 80; + var18 = Login.loginBoxX + 180 - 80; var20 = 321; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { NpcDefinition.method5162(); return; } - var18 = Login.__cu_y + 180 + 80; + var18 = Login.loginBoxX + 180 + 80; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { MouseHandler.method1084(true); } @@ -550,7 +550,7 @@ public final class class54 { MouseHandler.method1084(true); } } else if(Login.loginIndex == 7) { - var18 = Login.__cu_y + 180 - 80; + var18 = Login.loginBoxX + 180 - 80; var20 = 321; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false); @@ -559,12 +559,12 @@ public final class class54 { return; } - var18 = Login.__cu_y + 180 + 80; + var18 = Login.loginBoxX + 180 + 80; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { MouseHandler.method1084(true); } } else if(Login.loginIndex == 8) { - var18 = Login.__cu_y + 180 - 80; + var18 = Login.loginBoxX + 180 - 80; var20 = 321; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false); @@ -573,7 +573,7 @@ public final class class54 { return; } - var18 = Login.__cu_y + 180 + 80; + var18 = Login.loginBoxX + 180 + 80; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { MouseHandler.method1084(true); } @@ -590,7 +590,7 @@ public final class class54 { MouseHandler.method1084(false); } - var7 = Login.__cu_y + 180; + var7 = Login.loginBoxX + 180; var8 = 276; if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { WorldMapCacheName.method635(var14, true, false); @@ -599,7 +599,7 @@ public final class class54 { return; } - var7 = Login.__cu_y + 180; + var7 = Login.loginBoxX + 180; var8 = 326; if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) { MouseHandler.method1084(false); @@ -615,13 +615,13 @@ public final class class54 { } } - var18 = Varps.__hv_h - 80; + var18 = Varps.loginBoxCenter - 80; var20 = 321; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { MouseHandler.method1084(false); } - var18 = Varps.__hv_h + 80; + var18 = Varps.loginBoxCenter + 80; if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { Login.loginIndex = 0; } @@ -660,7 +660,7 @@ public final class class54 { } else { WorldMapArea var11; if(var0 == 6601) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; String var16 = ""; var11 = BufferedFile.worldMap().getMapArea(var3); if(var11 != null) { @@ -670,120 +670,120 @@ public final class class54 { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; return 1; } else if(var0 == 6602) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setCurrentMapAreaId(var3); return 1; } else if(var0 == 6603) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel(); return 1; } else if(var0 == 6604) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().setZoomLevel(var3); return 1; } else if(var0 == 6605) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded()?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded()?1:0; return 1; } else { TileLocation var15; if(var0 == 6606) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().setWorldMapPositionTarget(var15.x, var15.y); return 1; } else if(var0 == 6607) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().__aw_531(var15.x, var15.y); return 1; } else if(var0 == 6608) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().__al_532(var15.plane, var15.x, var15.y); return 1; } else if(var0 == 6609) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); BufferedFile.worldMap().__ab_533(var15.plane, var15.x, var15.y); return 1; } else if(var0 == 6610) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ae_534(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__at_535(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ae_534(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__at_535(); return 1; } else { WorldMapArea var13; if(var0 == 6611) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var13 = BufferedFile.worldMap().getMapArea(var3); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.origin().packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.origin().packed(); } return 1; } else if(var0 == 6612) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var13 = BufferedFile.worldMap().getMapArea(var3); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var13.maxX() - var13.minX() + 1) * 64; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = (var13.maxY() - var13.minY() + 1) * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var13.maxX() - var13.minX() + 1) * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var13.maxY() - var13.minY() + 1) * 64; } return 1; } else if(var0 == 6613) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var13 = BufferedFile.worldMap().getMapArea(var3); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.minX() * 64; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.minY() * 64; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.maxX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.maxY() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.minX() * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.minY() * 64; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.maxX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.maxY() * 64 + 64 - 1; } return 1; } else if(var0 == 6614) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var13 = BufferedFile.worldMap().getMapArea(var3); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.zoom(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.zoom(); } return 1; } else if(var0 == 6615) { var15 = BufferedFile.worldMap().__ad_536(); if(var15 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var15.y; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.y; } return 1; } else if(var0 == 6616) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId(); return 1; } else if(var0 == 6617) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var13 = BufferedFile.worldMap().getCurrentMapArea(); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; return 1; } else { int[] var14 = var13.position(var15.plane, var15.x, var15.y); if(var14 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var14[1]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[1]; } return 1; @@ -791,18 +791,18 @@ public final class class54 { } else { TileLocation var7; if(var0 == 6618) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var13 = BufferedFile.worldMap().getCurrentMapArea(); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; return 1; } else { var7 = var13.coord(var15.x, var15.y); if(var7 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var7.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed(); } return 1; @@ -810,51 +810,51 @@ public final class class54 { } else { TileLocation var12; if(var0 == 6619) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); TotalQuantityComparator.method96(var3, var12, false); return 1; } else if(var0 == 6620) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); TotalQuantityComparator.method96(var3, var12, true); return 1; } else if(var0 == 6621) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); var11 = BufferedFile.worldMap().getMapArea(var3); if(var11 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0; return 1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y)?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y)?1:0; return 1; } } else if(var0 == 6622) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ap_537(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__as_538(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ap_537(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__as_538(); return 1; } else if(var0 == 6623) { - var15 = new TileLocation(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); var13 = BufferedFile.worldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); if(var13 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var13.id(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.id(); } return 1; } else if(var0 == 6624) { - BufferedFile.worldMap().__am_539(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + BufferedFile.worldMap().__am_539(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; } else if(var0 == 6625) { BufferedFile.worldMap().__an_540(); return 1; } else if(var0 == 6626) { - BufferedFile.worldMap().__az_541(Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]); + BufferedFile.worldMap().__az_541(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]); return 1; } else if(var0 == 6627) { BufferedFile.worldMap().__au_542(); @@ -862,58 +862,58 @@ public final class class54 { } else { boolean var10; if(var0 == 6628) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; BufferedFile.worldMap().perpetualFlash(var10); return 1; } else if(var0 == 6629) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashElement(var3); return 1; } else if(var0 == 6630) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; BufferedFile.worldMap().flashCategory(var3); return 1; } else if(var0 == 6631) { BufferedFile.worldMap().stopCurrentFlashes(); return 1; } else if(var0 == 6632) { - var10 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize] == 1; + var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1; BufferedFile.worldMap().setElementsEnabled(var10); return 1; } else { boolean var4; if(var0 == 6633) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; BufferedFile.worldMap().disableElement(var3, var4); return 1; } else if(var0 == 6634) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1] == 1; + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1; BufferedFile.worldMap().disableCategory(var3, var4); return 1; } else if(var0 == 6635) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled()?1:0; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled()?1:0; return 1; } else if(var0 == 6636) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3)?1:0; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3)?1:0; return 1; } else if(var0 == 6637) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3)?1:0; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3)?1:0; return 1; } else if(var0 == 6638) { - class179.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize]; - var12 = new TileLocation(Interpreter.Interpreter_intStack[class179.Interpreter_intStackSize + 1]); + RouteStrategy.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]; + var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]); var7 = BufferedFile.worldMap().__bc_545(var3, var12); if(var7 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var7.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed(); } return 1; @@ -922,29 +922,29 @@ public final class class54 { if(var0 == 6639) { var8 = BufferedFile.worldMap().iconStart(); if(var8 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.__m_15(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.coord2.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed(); } return 1; } else if(var0 == 6640) { var8 = BufferedFile.worldMap().iconNext(); if(var8 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.__m_15(); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var8.coord2.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed(); } return 1; } else { WorldMapElement var6; if(var0 == 6693) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = ViewportMouse.getWorldMapElement(var3); if(var6.__l == null) { Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; @@ -954,38 +954,38 @@ public final class class54 { return 1; } else if(var0 == 6694) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = ViewportMouse.getWorldMapElement(var3); - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.textSize; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.textSize; return 1; } else if(var0 == 6695) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = ViewportMouse.getWorldMapElement(var3); if(var6 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.category; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.category; } return 1; } else if(var0 == 6696) { - var3 = Interpreter.Interpreter_intStack[--class179.Interpreter_intStackSize]; + var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; var6 = ViewportMouse.getWorldMapElement(var3); if(var6 == null) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1; } else { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var6.sprite1; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.sprite1; } return 1; } else if(var0 == 6697) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class15.worldMapEvent.mapElement; + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.mapElement; return 1; } else if(var0 == 6698) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord1.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord1.packed(); return 1; } else if(var0 == 6699) { - Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord2.packed(); + Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord2.packed(); return 1; } else { return 2; @@ -1158,7 +1158,7 @@ public final class class54 { } } - if(MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.__lp_ca) { + if(MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.mouseCam) { var0 = MouseHandler.MouseHandler_y - Client.__client_ht; Client.__client_hu = var0 * 2; Client.__client_ht = var0 != -1 && var0 != 1?(MouseHandler.MouseHandler_y + Client.__client_ht) / 2:MouseHandler.MouseHandler_y; diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index d42b1a1296..9f33160c98 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -3,7 +3,8 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("bl") -public class class65 extends class179 { +public class class65 extends RouteStrategy +{ @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lcz;" @@ -23,7 +24,7 @@ public class class65 extends class179 { garbageValue = "-519225044" ) protected boolean vmethod3644(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.field2120 && var3 == super.field2121; + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } @ObfuscatedName("fi") @@ -31,131 +32,131 @@ public class class65 extends class179 { signature = "(Lbz;II)V", garbageValue = "406386718" ) - static final void method1232(Actor var0, int var1) { - if(var0.__bw > Client.cycle) { - SpriteIds.method5828(var0); + static final void method1232(Actor actor, int var1) { + if(actor.__bw > Client.cycle) { + SpriteIds.method5828(actor); } else { int var2; int var3; int var4; int var5; int var7; - if(var0.__cr >= Client.cycle) { - if(var0.__cr == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(var0.sequence).frameLengths[var0.sequenceFrame]) { - var2 = var0.__cr - var0.__bw; - var3 = Client.cycle - var0.__bw; - var4 = var0.__bf * 128 + var0.size * 64; - var5 = var0.__be * 128 + var0.size * 64; - int var6 = var0.__bh * 128 + var0.size * 64; - var7 = var0.__bv * 128 + var0.size * 64; - var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; - var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2; + if(actor.__cr >= Client.cycle) { + if(actor.__cr == Client.cycle || actor.sequence == -1 || actor.sequenceDelay != 0 || actor.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(actor.sequence).frameLengths[actor.sequenceFrame]) { + var2 = actor.__cr - actor.__bw; + var3 = Client.cycle - actor.__bw; + var4 = actor.__bf * 128 + actor.size * 64; + var5 = actor.__be * 128 + actor.size * 64; + int var6 = actor.__bh * 128 + actor.size * 64; + var7 = actor.__bv * 128 + actor.size * 64; + actor.x = (var3 * var6 + var4 * (var2 - var3)) / var2; + actor.y = (var3 * var7 + var5 * (var2 - var3)) / var2; } - var0.__cq = 0; - var0.orientation = var0.__cv; - var0.__ac = var0.orientation; + actor.__cq = 0; + actor.orientation = actor.__cv; + actor.__ac = actor.orientation; } else { - var0.movementSequence = var0.idleSequence; - if(var0.pathLength == 0) { - var0.__cq = 0; + actor.movementSequence = actor.idleSequence; + if(actor.pathLength == 0) { + actor.__cq = 0; } else { label310: { - if(var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(var0.sequence); - if(var0.__ch > 0 && var11.__j == 0) { - ++var0.__cq; + if(actor.sequence != -1 && actor.sequenceDelay == 0) { + SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(actor.sequence); + if(actor.__ch > 0 && var11.__j == 0) { + ++actor.__cq; break label310; } - if(var0.__ch <= 0 && var11.__s == 0) { - ++var0.__cq; + if(actor.__ch <= 0 && var11.__s == 0) { + ++actor.__cq; break label310; } } - var2 = var0.x; - var3 = var0.y; - var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * 64; - var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.size * 64; + var2 = actor.x; + var3 = actor.y; + var4 = actor.pathX[actor.pathLength - 1] * 128 + actor.size * 64; + var5 = actor.pathY[actor.pathLength - 1] * 128 + actor.size * 64; if(var2 < var4) { if(var3 < var5) { - var0.orientation = 1280; + actor.orientation = 1280; } else if(var3 > var5) { - var0.orientation = 1792; + actor.orientation = 1792; } else { - var0.orientation = 1536; + actor.orientation = 1536; } } else if(var2 > var4) { if(var3 < var5) { - var0.orientation = 768; + actor.orientation = 768; } else if(var3 > var5) { - var0.orientation = 256; + actor.orientation = 256; } else { - var0.orientation = 512; + actor.orientation = 512; } } else if(var3 < var5) { - var0.orientation = 1024; + actor.orientation = 1024; } else if(var3 > var5) { - var0.orientation = 0; + actor.orientation = 0; } - byte var12 = var0.pathTraversed[var0.pathLength - 1]; + byte var12 = actor.pathTraversed[actor.pathLength - 1]; if(var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - var7 = var0.orientation - var0.__ac & 2047; + var7 = actor.orientation - actor.__ac & 2047; if(var7 > 1024) { var7 -= 2048; } - int var8 = var0.walkTurnSequence; + int var8 = actor.walkTurnSequence; if(var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; + var8 = actor.walkSequence; } else if(var7 >= 256 && var7 < 768) { - var8 = var0.walkTurnRightSequence; + var8 = actor.walkTurnRightSequence; } else if(var7 >= -768 && var7 <= -256) { - var8 = var0.walkTurnLeftSequence; + var8 = actor.walkTurnLeftSequence; } if(var8 == -1) { - var8 = var0.walkSequence; + var8 = actor.walkSequence; } - var0.movementSequence = var8; + actor.movementSequence = var8; int var9 = 4; boolean var10 = true; - if(var0 instanceof Npc) { - var10 = ((Npc)var0).definition.isClickable; + if(actor instanceof Npc) { + var10 = ((Npc)actor).definition.isClickable; } if(var10) { - if(var0.__ac != var0.orientation && var0.targetIndex == -1 && var0.__cj != 0) { + if(actor.__ac != actor.orientation && actor.targetIndex == -1 && actor.__cj != 0) { var9 = 2; } - if(var0.pathLength > 2) { + if(actor.pathLength > 2) { var9 = 6; } - if(var0.pathLength > 3) { + if(actor.pathLength > 3) { var9 = 8; } - if(var0.__cq > 0 && var0.pathLength > 1) { + if(actor.__cq > 0 && actor.pathLength > 1) { var9 = 8; - --var0.__cq; + --actor.__cq; } } else { - if(var0.pathLength > 1) { + if(actor.pathLength > 1) { var9 = 6; } - if(var0.pathLength > 2) { + if(actor.pathLength > 2) { var9 = 8; } - if(var0.__cq > 0 && var0.pathLength > 1) { + if(actor.__cq > 0 && actor.pathLength > 1) { var9 = 8; - --var0.__cq; + --actor.__cq; } } @@ -163,48 +164,48 @@ public class class65 extends class179 { var9 <<= 1; } - if(var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; + if(var9 >= 8 && actor.movementSequence == actor.walkSequence && actor.runSequence != -1) { + actor.movementSequence = actor.runSequence; } if(var2 != var4 || var5 != var3) { if(var2 < var4) { - var0.x += var9; - if(var0.x > var4) { - var0.x = var4; + actor.x += var9; + if(actor.x > var4) { + actor.x = var4; } } else if(var2 > var4) { - var0.x -= var9; - if(var0.x < var4) { - var0.x = var4; + actor.x -= var9; + if(actor.x < var4) { + actor.x = var4; } } if(var3 < var5) { - var0.y += var9; - if(var0.y > var5) { - var0.y = var5; + actor.y += var9; + if(actor.y > var5) { + actor.y = var5; } } else if(var3 > var5) { - var0.y -= var9; - if(var0.y < var5) { - var0.y = var5; + actor.y -= var9; + if(actor.y < var5) { + actor.y = var5; } } } - if(var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if(var0.__ch > 0) { - --var0.__ch; + if(var4 == actor.x && var5 == actor.y) { + --actor.pathLength; + if(actor.__ch > 0) { + --actor.__ch; } } } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if(var0.__ch > 0) { - --var0.__ch; + actor.x = var4; + actor.y = var5; + --actor.pathLength; + if(actor.__ch > 0) { + --actor.__ch; } } } @@ -212,27 +213,27 @@ public class class65 extends class179 { } } - if(var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.__bw = 0; - var0.__cr = 0; - var0.x = var0.pathX[0] * 128 + var0.size * 64; - var0.y = var0.pathY[0] * 128 + var0.size * 64; - var0.__bb_143(); + if(actor.x < 128 || actor.y < 128 || actor.x >= 13184 || actor.y >= 13184) { + actor.sequence = -1; + actor.spotAnimation = -1; + actor.__bw = 0; + actor.__cr = 0; + actor.x = actor.pathX[0] * 128 + actor.size * 64; + actor.y = actor.pathY[0] * 128 + actor.size * 64; + actor.__bb_143(); } - if(Canvas.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.__bw = 0; - var0.__cr = 0; - var0.x = var0.pathX[0] * 128 + var0.size * 64; - var0.y = var0.pathY[0] * 128 + var0.size * 64; - var0.__bb_143(); + if(Canvas.localPlayer == actor && (actor.x < 1536 || actor.y < 1536 || actor.x >= 11776 || actor.y >= 11776)) { + actor.sequence = -1; + actor.spotAnimation = -1; + actor.__bw = 0; + actor.__cr = 0; + actor.x = actor.pathX[0] * 128 + actor.size * 64; + actor.y = actor.pathY[0] * 128 + actor.size * 64; + actor.__bb_143(); } - IndexStoreAction.method4553(var0); - ChatChannel.method2225(var0); + IndexStoreAction.method4553(actor); + ChatChannel.method2225(actor); } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index 61022cc1b2..49d74e779f 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -24,21 +24,21 @@ public class class80 { ) static void method2015() { if(Login.__cu_f) { - Login.__cu_o = null; - IndexCacheLoader.__bd_u = null; - WorldMapEvent.__ap_w = null; - Login.__cu_g = null; - Fonts.__kz_l = null; - WorldMapSectionType.__h_e = null; - KeyHandler.__an_x = null; - Login.__cu_d = null; - class308.__kw_n = null; - class30.__ar_bd = null; - Frames.__en_bc = null; - AttackOption.__cj_bo = null; - UrlRequest.__ey_bx = null; + Login.titleboxSprite = null; + IndexCacheLoader.titlebuttonSprite = null; + WorldMapEvent.runesSprite = null; + Login.leftTitleSprite = null; + Fonts.rightTitleSprite = null; + WorldMapSectionType.logoSprite = null; + KeyHandler.title_muteSprite = null; + Login.options_buttons_0Sprite = null; + class308.options_buttons_2Sprite = null; + class30.worldSelectBackSprites = null; + Frames.worldSelectFlagSprites = null; + AttackOption.worldSelectArrows = null; + UrlRequest.worldSelectStars = null; class277.__jn_by = null; - class16.field85.method1762(); + class16.loginScreenRunesAnimation.method1762(); AbstractSocket.method3488(2); UserComparator9.method3343(true); Login.__cu_f = false; diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 21b18571bd..c112879d60 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -60,6 +60,6 @@ public class class83 { garbageValue = "1413048059" ) public static IndexedSprite method2028(AbstractIndexCache var0, int var1) { - return !class179.method3643(var0, var1)?null:ServerPacket.method3663(); + return !RouteStrategy.loadSpriteFlat(var0, var1)?null:ServerPacket.createIndexedSprite(); } } diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java index 043142871d..2e7e07fc24 100644 --- a/runescape-client/src/main/java/class98.java +++ b/runescape-client/src/main/java/class98.java @@ -219,7 +219,7 @@ public class class98 { @ObfuscatedName("m") static int method2310(int var0, int var1) { int var2; - for(var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class179.method3642(var2, var1) > var0; --var2) { + for(var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; RouteStrategy.method3642(var2, var1) > var0; --var2) { ; }